BaseTools/BinToPcd: Fix Python 2.7.x compatibility issue

[mirror_edk2.git] / CorebootPayloadPkg / CorebootPayloadPkgIa32X64.dsc

diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
index c35f261d67beadce105ca2606efd2782546240ad..c3fe099e5fec1739537f3d8e23e0da0bd1115889 100644 (file)
--- a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
+++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
@@ -3,7 +3,7 @@
 #\r
 # Provides drivers and definitions to create uefi payload for coreboot.\r
 #\r
-# Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2014 - 2017, 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
@@ -89,8 +89,6 @@
 \r
 [BuildOptions]\r
   *_*_*_CC_FLAGS                 = -D DISABLE_NEW_DEPRECATED_INTERFACES\r
-  GCC:DEBUG_*_*_CC_FLAGS         = -Og -flto\r
-  GCC:DEBUG_*_*_DLINK_FLAGS      = -flto\r
   GCC:*_UNIXGCC_*_CC_FLAGS       = -DMDEPKG_NDEBUG\r
   GCC:RELEASE_*_*_CC_FLAGS       = -DMDEPKG_NDEBUG\r
   INTEL:RELEASE_*_*_CC_FLAGS     = /D MDEPKG_NDEBUG\r
@@ -241,6 +239,9 @@
   MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf\r
   ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf\r
   ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf\r
+!if $(SOURCE_DEBUG_ENABLE)\r
+  DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf\r
+!endif\r
   CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf\r
   MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf\r
 \r
@@ -518,11 +519,6 @@
 \r
 !if $(SHELL_TYPE) == BUILD_SHELL\r
 \r
-[PcdsFixedAtBuild]\r
-  ## This flag is used to control initialization of the shell library\r
-  #  This should be FALSE for compiling the shell application itself only.\r
-  gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE\r
-\r
   #\r
   # Shell Lib\r
   #\r
@@ -530,9 +526,27 @@
   BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf\r
   DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf\r
   FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf\r
+  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf\r
+  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf\r
 \r
 [Components.X64]\r
+  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {\r
+    <PcdsFixedAtBuild>\r
+      ## This flag is used to control initialization of the shell library\r
+      #  This should be FALSE for compiling the dynamic command.\r
+      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE\r
+  }\r
+  ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf {\r
+    <PcdsFixedAtBuild>\r
+      ## This flag is used to control initialization of the shell library\r
+      #  This should be FALSE for compiling the dynamic command.\r
+      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE\r
+  }\r
   ShellPkg/Application/Shell/Shell.inf {\r
+    <PcdsFixedAtBuild>\r
+      ## This flag is used to control initialization of the shell library\r
+      #  This should be FALSE for compiling the shell application itself only.\r
+      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE\r
 \r
     #------------------------------\r
     #  Basic commands\r
@@ -552,14 +566,6 @@
 \r
     <LibraryClasses>\r
       NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf\r
-      NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.inf\r
-\r
-    #------------------------------\r
-    #  Performance command\r
-    #------------------------------\r
-\r
-    <LibraryClasses>\r
-      NULL|ShellPkg/Library/UefiDpLib/UefiDpLib.inf\r
 \r
     #------------------------------\r
     #  Support libraries\r
@@ -568,13 +574,10 @@
     <LibraryClasses>\r
       DebugLib|MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf\r
       DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf\r
-      FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf\r
       HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf\r
-      NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf\r
       PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf\r
       ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf\r
       ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf\r
-      ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf\r
       SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf\r
   }\r
 \r