This patch is going to:

[mirror_edk2.git] / BaseTools / Source / Python / UPT / Parser / InfBinarySectionParser.py

diff --git a/BaseTools/Source/Python/UPT/Parser/InfBinarySectionParser.py b/BaseTools/Source/Python/UPT/Parser/InfBinarySectionParser.py
index 36142cf84a02e19f5bfa3aeddf43aa11a830f087..f1d6943cbfff72c9892beab55de13e9d1a596f2b 100644 (file)
--- a/BaseTools/Source/Python/UPT/Parser/InfBinarySectionParser.py
+++ b/BaseTools/Source/Python/UPT/Parser/InfBinarySectionParser.py
@@ -1,7 +1,7 @@
 ## @file\r
 # This file contained the parser for [Binaries] sections in INF file \r
 #\r
-# Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>\r
 #\r
 # This program and the accompanying materials are licensed and made available \r
 # under the terms and conditions of the BSD License which accompanies this \r
@@ -178,9 +178,15 @@ class InfBinarySectionParser(InfParserSectionRoot):
                                           CurrentLineObj))\r
             else:\r
                 if len(ValueList) == 2:\r
-                    TokenList = GetSplitValueList(ValueList[1], \r
-                                                  DT.TAB_VALUE_SPLIT, \r
-                                                  4)\r
+                    if ValueList[0].strip() == 'SUBTYPE_GUID':\r
+                        TokenList = GetSplitValueList(ValueList[1], \r
+                                                      DT.TAB_VALUE_SPLIT, \r
+                                                      5)\r
+                    else:\r
+                        TokenList = GetSplitValueList(ValueList[1], \r
+                              DT.TAB_VALUE_SPLIT, \r
+                              4)\r
+                        \r
                     NewValueList = []\r
                     NewValueList.append(ValueList[0])\r
                     for Item in TokenList:\r
@@ -188,6 +194,15 @@ class InfBinarySectionParser(InfParserSectionRoot):
                     ComBinaryList.append((NewValueList, \r
                                           LineComment, \r
                                           CurrentLineObj))\r
+                elif len(ValueList) == 1:\r
+                    NewValueList = []\r
+                    NewValueList.append(ValueList[0])\r
+                    ComBinaryList.append((NewValueList, \r
+                                          LineComment, \r
+                                          CurrentLineObj))\r
+                    \r
+                    \r
+                \r
             \r
             ValueList = []\r
             LineComment = None\r