From: Tomas Pilar <tpilar@solarflare.com>
Date: Wed, 24 Oct 2018 11:42:36 +0000 (+0800)
Subject: BaseTools: Allow multiple PciDeviceId in Fdf OptionROM override
X-Git-Tag: edk2-stable201903~697
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=f157f97301cc2c573977e624f859db93442ff2d5

BaseTools: Allow multiple PciDeviceId in Fdf OptionROM override

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 bf6e0bd228..1c9a5130bf 100644
--- 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"):
                     if not self._IsToken(TAB_EQUAL_SPLIT):
                         raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)
-                    if not self._GetNextHexNumber():
-                        raise Warning.Expected("Hex device id", self.FileName, self.CurrentLineNumber)
-
-                    Overrides.PciDeviceId = self._Token
+                    # Get a list of PCI IDs
+                    Overrides.PciDeviceId = ""
+                    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
 
                 if self._IsKeyword("PCI_REVISION"):