[PATCH v2] BaseTools: Allow multiple PciDeviceId in Fdf OptionROM override

["Tomas Pilar (tpilar)" <tpilar@solarflare.com>]

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Tomas Pilar <tpilar@solarflare.com>
---
 BaseTools/Source/Python/GenFds/FdfParser.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index 63687e98bb..8f53fbeb55 100644
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -1,3 +1,4 @@
+
 ## @file
 # parse FDF file
 #
@@ -4469,10 +4470,15 @@ class FdfParser:
                 if self.__IsKeyword( "PCI_DEVICE_ID"):
                     if not self.__IsToken( "="):
                         raise Warning("expected '='", 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"):
-- 
2.17.2