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

2018-10-25 Thread Zhu, Yonghong
Reviewed-by: Yonghong Zhu  

Best Regards,
Zhu Yonghong


-Original Message-
From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Tomas 
Pilar (tpilar)
Sent: Wednesday, October 24, 2018 7:43 PM
To: edk2-devel@lists.01.org
Subject: [edk2] [PATCH v2] BaseTools: Allow multiple PciDeviceId in Fdf 
OptionROM override

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Tomas Pilar 
---
 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

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel


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

2018-10-24 Thread Tomas Pilar (tpilar)
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Tomas Pilar 
---
 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

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel