From f157f97301cc2c573977e624f859db93442ff2d5 Mon Sep 17 00:00:00 2001 From: Tomas Pilar Date: Wed, 24 Oct 2018 19:42:36 +0800 Subject: BaseTools: Allow multiple PciDeviceId in Fdf OptionROM override Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Tomas Pilar Reviewed-by: Yonghong Zhu --- BaseTools/Source/Python/GenFds/FdfParser.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'BaseTools/Source/Python/GenFds/FdfParser.py') 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"): -- cgit v1.2.3