BaseTools: Fix merge in FDF parser for OptionROM override

[mirror_edk2.git] / BaseTools / Source / Python / GenFds / FdfParser.py

diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index bf6e0bd2286c85bdad04476187a57042fcb8b2c0..44cc8f63d07b93aab3edfa1a59ccfcec2e02d232 100644 (file)
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -4394,10 +4394,12 @@ class FdfParser:
                 if self._IsKeyword("PCI_DEVICE_ID"):\r
                     if not self._IsToken(TAB_EQUAL_SPLIT):\r
                         raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
-                    if not self._GetNextHexNumber():\r
-                        raise Warning.Expected("Hex device id", self.FileName, self.CurrentLineNumber)\r
-\r
-                    Overrides.PciDeviceId = self._Token\r
+                    # Get a list of PCI IDs\r
+                    Overrides.PciDeviceId = ""\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
 \r
                 if self._IsKeyword("PCI_REVISION"):\r