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>

diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index 1c9a5130bf5323d388dc34f7db74cd93689c0136..44cc8f63d07b93aab3edfa1a59ccfcec2e02d232 100644 (file)
--- 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)\r
                     # Get a list of PCI IDs\r
                     Overrides.PciDeviceId = ""\r
-                    while (self.__GetNextHexNumber()):\r
-                        Overrides.PciDeviceId = "{} {}".format(Overrides.PciDeviceId, self.__Token)\r
+                    while (self._GetNextHexNumber()):\r
+                        Overrides.PciDeviceId = "{} {}".format(Overrides.PciDeviceId, self._Token)\r
                     if not Overrides.PciDeviceId:\r
                         raise Warning.Expected("one or more Hex device ids", self.FileName, self.CurrentLineNumber)\r
                     continue\r