CorebootPayloadPkg: Fix build failure due to Tftp/Dp library removal

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Maurice Ma <maurice.ma@intel.com>
Cc: Prince Agyeman <prince.agyeman@intel.com>
Reviewed-by: Benjamin You <benjamin.you@intel.com>

diff --git a/CorebootPayloadPkg/CorebootPayloadPkg.fdf b/CorebootPayloadPkg/CorebootPayloadPkg.fdf
index 303e6268421e65d12ccfa7ce279f42e206c1306a..7994f0c949288846feb763d383c30657d1871f24 100644 (file)
--- a/CorebootPayloadPkg/CorebootPayloadPkg.fdf
+++ b/CorebootPayloadPkg/CorebootPayloadPkg.fdf
@@ -3,7 +3,7 @@
 #\r
 # Provides drivers and definitions to create uefi payload for coreboot.\r
 #\r
 #\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
 # 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


@@ -180,6 +180,8 @@ INF QuarkSocPkg/QuarkSouthCluster/Usb/Ohci/Dxe/OhciDxe.inf
 # Shell\r
 #\r
 !if $(SHELL_TYPE) == BUILD_SHELL\r
 # Shell\r
 #\r
 !if $(SHELL_TYPE) == BUILD_SHELL\r

+INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf\r
+INF ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf\r

 INF ShellPkg/Application/Shell/Shell.inf\r
 !endif\r
 \r
 INF ShellPkg/Application/Shell/Shell.inf\r
 !endif\r
 \r

diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
index cdfcb75b5934325b1c6e7207fbf507275a8b5aee..ace1bc0a3726ce0dd3d8c0c5e00ebb469512c983 100644 (file)
--- a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
+++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
@@ -3,7 +3,7 @@
 #\r
 # Provides drivers and definitions to create uefi payload for coreboot.\r
 #\r
 #\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
 # 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


@@ -515,11 +515,6 @@
 \r
 !if $(SHELL_TYPE) == BUILD_SHELL\r
 \r
 \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
   #\r
   # Shell Lib\r
   #\r


@@ -527,9 +522,27 @@
   BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf\r
   DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf\r
   FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf\r
   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.IA32]\r
 \r
 [Components.IA32]\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
   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
 \r
     #------------------------------\r
     #  Basic commands\r


@@ -549,14 +562,6 @@
 \r
     <LibraryClasses>\r
       NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf\r
 \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
 \r
     #------------------------------\r
     #  Support libraries\r


@@ -565,13 +570,10 @@
     <LibraryClasses>\r
       DebugLib|MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf\r
       DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf\r
     <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
       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
       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
       SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf\r
   }\r
 \r

diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
index 6b16af63ba8945fbbf3389f6eec9eccff82e6f02..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
 #\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
 # 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


@@ -516,11 +516,6 @@
 \r
 !if $(SHELL_TYPE) == BUILD_SHELL\r
 \r
 \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
   #\r
   # Shell Lib\r
   #\r


@@ -528,9 +523,27 @@
   BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf\r
   DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf\r
   FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf\r
   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
 \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
   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
 \r
     #------------------------------\r
     #  Basic commands\r


@@ -550,14 +563,6 @@
 \r
     <LibraryClasses>\r
       NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf\r
 \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
 \r
     #------------------------------\r
     #  Support libraries\r


@@ -566,13 +571,10 @@
     <LibraryClasses>\r
       DebugLib|MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf\r
       DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf\r
     <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
       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
       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
       SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf\r
   }\r
 \r