public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Tomas Pilar (tpilar)" <tpilar@solarflare.com>
To: "edk2-devel@lists.01.org" <edk2-devel@lists.01.org>
Subject: [PATCH] BaseTools: Allow multiple PciDeviceId in Fdf OptionROM override
Date: Tue, 2 Oct 2018 15:46:25 +0100	[thread overview]
Message-ID: <436c51f1-3ca0-9efa-c79d-b12f46be10ff@solarflare.com> (raw)

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

diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index 63687e98bb..a65f2cfd2d 100644
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -4469,10 +4469,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 += " " + 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.1



             reply	other threads:[~2018-10-02 14:46 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-02 14:46 Tomas Pilar (tpilar) [this message]
2018-10-02 14:52 ` [PATCH] BaseTools: Allow multiple PciDeviceId in Fdf OptionROM override Laszlo Ersek
2018-10-08  1:41 ` Gao, Liming
2018-10-08 15:00   ` Carsey, Jaben
2018-10-12  5:53     ` Zhu, Yonghong
2018-10-24 10:15       ` Tomas Pilar (tpilar)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=436c51f1-3ca0-9efa-c79d-b12f46be10ff@solarflare.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox