rename XXXDflt to XXXDefault (expand for better readability)

[mirror_edk2.git] / IntelFspPkg / Tools / GenCfgOpt.py

diff --git a/IntelFspPkg/Tools/GenCfgOpt.py b/IntelFspPkg/Tools/GenCfgOpt.py
index 555099bbd29c4c4b26057fe73231842e78e9a309..7e59801879ca555dbe0efca777adb39feb285c7d 100644 (file)
--- a/IntelFspPkg/Tools/GenCfgOpt.py
+++ b/IntelFspPkg/Tools/GenCfgOpt.py
@@ -1,6 +1,6 @@
 ## @ GenCfgOpt.py\r
 #\r
-# Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2014 - 2015, Intel Corporation. All rights reserved.<BR>\r
 # This program and the accompanying materials are licensed and made available under\r
 # the terms and conditions of the BSD License that accompanies this distribution.\r
 # The full text of the license may be found at\r
@@ -254,9 +254,10 @@ EndList
                                     ElifStack[-1] = ElifStack[-1] + 1\r
                             else:\r
                                 if len(DscLine) > 0 and DscLine[0] == '!':\r
-                                    self.Error = "Invalid DscLine '%s'" % DscLine\r
-                                    Error = 3\r
-                                    break;\r
+                                    #\r
+                                    # Current it can only handle build switch.\r
+                                    # It does not support INF file in included dsc.\r
+                                    #\r
                                 else:\r
                                     if reduce(lambda x,y: x and y, IfStack):\r
                                         Handle = True\r
@@ -618,8 +619,8 @@ EndList
                 ImageRev = struct.unpack('<I', BinFd.read(0x04))\r
                 BinFd.close()\r
 \r
-                HeaderFd.write("#define VPD_IMAGE_ID    0x%016X        /* '%s' */\n" % (ImageId[0], IdStr))\r
-                HeaderFd.write("#define VPD_IMAGE_REV   0x%08X \n\n" % ImageRev[0])\r
+                HeaderFd.write("#define FSP_IMAGE_ID    0x%016X        /* '%s' */\n" % (ImageId[0], IdStr))\r
+                HeaderFd.write("#define FSP_IMAGE_REV   0x%08X \n\n" % ImageRev[0])\r
 \r
             HeaderFd.write("typedef struct _" + Region[0]  + "PD_DATA_REGION {\n")\r
             NextOffset  = 0\r