ShellPkg/for: Fix potential null pointer deference

[mirror_edk2.git] / ShellPkg / ShellPkg.dsc

diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc
index a87428ad6f764f51a1af59b7ec5a518e831cb435..29f537641285c65c1ee6976ba2c78feddc0fae56 100644 (file)
--- a/ShellPkg/ShellPkg.dsc
+++ b/ShellPkg/ShellPkg.dsc
@@ -1,7 +1,7 @@
 ##  @file\r
 # Shell Package\r
 #\r
-# Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #\r
 #    This program and the accompanying materials\r
 #    are licensed and made available under the terms and conditions of the BSD License\r
@@ -16,7 +16,7 @@
 [Defines]\r
   PLATFORM_NAME                  = Shell\r
   PLATFORM_GUID                  = E1DC9BF8-7013-4c99-9437-795DAA45F3BD\r
-  PLATFORM_VERSION               = 1.0\r
+  PLATFORM_VERSION               = 1.02\r
   DSC_SPECIFICATION              = 0x00010006\r
   OUTPUT_DIRECTORY               = Build/Shell\r
   SUPPORTED_ARCHITECTURES        = IA32|IPF|X64|EBC|ARM|AARCH64\r
@@ -25,6 +25,7 @@
 \r
 [LibraryClasses.common]\r
   UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf\r
+  UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf\r
   UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf\r
   DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLibOptionalDevicePathProtocol.inf\r
 !if $(TARGET) == RELEASE\r
@@ -79,7 +80,6 @@
 \r
 [PcdsFixedAtBuild]\r
   gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xFF\r
-  gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE\r
   gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|16000\r
 !ifdef $(NO_SHELL_PROFILES)\r
   gEfiShellPkgTokenSpaceGuid.PcdShellProfileMask|0x00\r
@@ -103,15 +103,10 @@
   ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf\r
   ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf\r
   ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf\r
-  ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.inf\r
-\r
-  ShellPkg/Library/UefiDpLib/UefiDpLib.inf {\r
-    <LibraryClasses>\r
-      PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf\r
-      DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf\r
-  }\r
 \r
   ShellPkg/Application/Shell/Shell.inf {\r
+    <PcdsFixedAtBuild>\r
+      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE\r
     <LibraryClasses>\r
       NULL|ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf\r
       NULL|ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf\r
@@ -122,14 +117,24 @@
       NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf\r
       NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf\r
       NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf\r
-!ifdef $(INCLUDE_DP)\r
-      NULL|ShellPkg/Library/UefiDpLib/UefiDpLib.inf\r
-!endif #$(INCLUDE_DP)\r
-!ifdef $(INCLUDE_TFTP_COMMAND)\r
-      NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.inf\r
-!endif #$(INCLUDE_TFTP_COMMAND)\r
 !endif #$(NO_SHELL_PROFILES)\r
   }\r
 \r
+  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {\r
+    <PcdsFixedAtBuild>\r
+      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE\r
+  }\r
+  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpApp.inf\r
+  ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf {\r
+    <PcdsFixedAtBuild>\r
+      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE\r
+    <LibraryClasses>\r
+      PerformanceLib|MdeModulePkg/Library/DxeSmmPerformanceLib/DxeSmmPerformanceLib.inf\r
+  }\r
+  ShellPkg/DynamicCommand/DpDynamicCommand/DpApp.inf {\r
+    <LibraryClasses>\r
+      PerformanceLib|MdeModulePkg/Library/DxeSmmPerformanceLib/DxeSmmPerformanceLib.inf\r
+  }\r
+\r
 [BuildOptions]\r
   *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES\r