summaryrefslogtreecommitdiffstats
path: root/BaseTools
diff options
context:
space:
mode:
authorMichael Kinney <michael.d.kinney@intel.com>2016-10-07 14:07:03 -0700
committerMichael Kinney <michael.d.kinney@intel.com>2016-10-12 10:36:03 -0700
commitdd170333f6444a4256e75356a8f0758a40bfb77d (patch)
treef186cbfce5446e868ebc57c2b808c7341ff95f25 /BaseTools
parenta7ea752e59bbbf69c6d8a72ee6a8b7a0f77cca7c (diff)
downloadedk2-dd170333f6444a4256e75356a8f0758a40bfb77d.tar.gz
edk2-dd170333f6444a4256e75356a8f0758a40bfb77d.tar.bz2
edk2-dd170333f6444a4256e75356a8f0758a40bfb77d.zip
BaseTools/GenFds: Support FDF sections in any order
https://bugzilla.tianocore.org/show_bug.cgi?id=141 This patch updates EDK II FDF parser in GenFds to allow sections to be placed in any order in the FDF file. Cc: Kelly Steele <kelly.steele@intel.com> Cc: Yonghong Zhu <yonghong.zhu@intel.com> Cc: Liming Gao <liming.gao@intel.com> Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Michael Kinney <michael.d.kinney@intel.com> Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
Diffstat (limited to 'BaseTools')
-rw-r--r--BaseTools/Source/Python/GenFds/FdfParser.py23
1 files changed, 4 insertions, 19 deletions
diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index 33b40c727c..5489df59a6 100644
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -1385,25 +1385,10 @@ class FdfParser:
try:
self.Preprocess()
- while self.__GetFd():
- pass
-
- while self.__GetFv():
- pass
-
- while self.__GetFmp():
- pass
-
- while self.__GetCapsule():
- pass
-
- while self.__GetVtf():
- pass
-
- while self.__GetRule():
- pass
-
- while self.__GetOptionRom():
+ #
+ # Keep processing sections of the FDF until no new sections or a syntax error is found
+ #
+ while self.__GetFd() or self.__GetFv() or self.__GetFmp() or self.__GetCapsule() or self.__GetVtf() or self.__GetRule() or self.__GetOptionRom():
pass
except Warning, X: