ShellPkg/for: Fix potential null pointer deference

[mirror_edk2.git] / CorebootPayloadPkg / CorebootPayloadPkgIa32X64.dsc

diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
index c06cccbf889a64dabdd9b691a4c58b4104779a98..2492142b972d1496d49a27df47ebb178f9c8d105 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
@@ -88,9 +88,7 @@
   DEFINE SHELL_TYPE              = FULL_BIN\r
 \r
 [BuildOptions]\r
-  *_*_*_CC_FLAGS                 = /D DISABLE_NEW_DEPRECATED_INTERFACES\r
-  GCC:DEBUG_*_*_CC_FLAGS         = -Og -flto\r
-  GCC:DEBUG_*_*_DLINK_FLAGS      = -flto\r
+  *_*_*_CC_FLAGS                 = -D DISABLE_NEW_DEPRECATED_INTERFACES\r
   GCC:*_UNIXGCC_*_CC_FLAGS       = -DMDEPKG_NDEBUG\r
   GCC:RELEASE_*_*_CC_FLAGS       = -DMDEPKG_NDEBUG\r
   INTEL:RELEASE_*_*_CC_FLAGS     = /D MDEPKG_NDEBUG\r
@@ -131,8 +129,13 @@
   PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf\r
   CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf\r
   IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf\r
+!if $(PCIE_BASE) == 0\r
+  PciLib|MdePkg/Library/BasePciLibCf8/BasePciLibCf8.inf\r
+  PciCf8Lib|MdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.inf\r
+!else\r
   PciLib|MdePkg/Library/BasePciLibPciExpress/BasePciLibPciExpress.inf\r
   PciExpressLib|MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf\r
+!endif\r
   PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf\r
   PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf\r
   PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf\r
@@ -513,11 +516,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
@@ -525,9 +523,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
@@ -547,14 +563,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
@@ -563,13 +571,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