From 5b9639e697350c9e18e98ddb0119e8598b004a8f Mon Sep 17 00:00:00 2001
From: Tomas Pilar <tpilar@solarflare.com>
Date: Tue, 30 Oct 2018 00:52:53 +0800
Subject: [PATCH] BaseTools: Fix merge in FDF parser for OptionROM override

Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Tomas Pilar <tpilar@solarflare.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
---
 BaseTools/Source/Python/GenFds/FdfParser.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index 1c9a5130bf..44cc8f63d0 100644
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -4396,8 +4396,8 @@ class FdfParser:
                         raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)
                     # Get a list of PCI IDs
                     Overrides.PciDeviceId = ""
-                    while (self.__GetNextHexNumber()):
-                        Overrides.PciDeviceId = "{} {}".format(Overrides.PciDeviceId, self.__Token)
+                    while (self._GetNextHexNumber()):
+                        Overrides.PciDeviceId = "{} {}".format(Overrides.PciDeviceId, self._Token)
                     if not Overrides.PciDeviceId:
                         raise Warning.Expected("one or more Hex device ids", self.FileName, self.CurrentLineNumber)
                     continue