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>

3 files changed, 41 insertions, 35 deletions

diff --git a/CorebootPayloadPkg/CorebootPayloadPkg.fdf b/CorebootPayloadPkg/CorebootPayloadPkg.fdf
index 303e626842..7994f0c949 100644
--- a/CorebootPayloadPkg/CorebootPayloadPkg.fdf
+++ b/CorebootPayloadPkg/CorebootPayloadPkg.fdf
@@ -3,7 +3,7 @@
 #

 # Provides drivers and definitions to create uefi payload for coreboot.

 #

-# Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>

 # This program and the accompanying materials are licensed and made available under

 # the terms and conditions of the BSD License that accompanies this distribution.

 # The full text of the license may be found at

@@ -180,6 +180,8 @@ INF QuarkSocPkg/QuarkSouthCluster/Usb/Ohci/Dxe/OhciDxe.inf
 # Shell

 #

 !if $(SHELL_TYPE) == BUILD_SHELL

+INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf

+INF ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf

 INF ShellPkg/Application/Shell/Shell.inf

 !endif

 

diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
index cdfcb75b59..ace1bc0a37 100644
--- a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
+++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
@@ -3,7 +3,7 @@
 #

 # Provides drivers and definitions to create uefi payload for coreboot.

 #

-# Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>

 # This program and the accompanying materials are licensed and made available under

 # the terms and conditions of the BSD License that accompanies this distribution.

 # The full text of the license may be found at

@@ -515,11 +515,6 @@
 

 !if $(SHELL_TYPE) == BUILD_SHELL

 

-[PcdsFixedAtBuild]

-  ## This flag is used to control initialization of the shell library

-  #  This should be FALSE for compiling the shell application itself only.

-  gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

-

   #

   # Shell Lib

   #

@@ -527,9 +522,27 @@
   BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf

   DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf

   FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf

+  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf

+  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf

 

 [Components.IA32]

+  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {

+    <PcdsFixedAtBuild>

+      ## This flag is used to control initialization of the shell library

+      #  This should be FALSE for compiling the dynamic command.

+      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

+  }

+  ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf {

+    <PcdsFixedAtBuild>

+      ## This flag is used to control initialization of the shell library

+      #  This should be FALSE for compiling the dynamic command.

+      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

+  }

   ShellPkg/Application/Shell/Shell.inf {

+    <PcdsFixedAtBuild>

+      ## This flag is used to control initialization of the shell library

+      #  This should be FALSE for compiling the shell application itself only.

+      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

 

     #------------------------------

     #  Basic commands

@@ -549,14 +562,6 @@
 

     <LibraryClasses>

       NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf

-      NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.inf

-

-    #------------------------------

-    #  Performance command

-    #------------------------------

-

-    <LibraryClasses>

-      NULL|ShellPkg/Library/UefiDpLib/UefiDpLib.inf

 

     #------------------------------

     #  Support libraries

@@ -565,13 +570,10 @@
     <LibraryClasses>

       DebugLib|MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf

       DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf

-      FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf

       HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf

-      NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf

       PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf

       ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf

       ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf

-      ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf

       SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf

   }

 

diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
index 6b16af63ba..2492142b97 100644
--- a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
+++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
@@ -3,7 +3,7 @@
 #

 # Provides drivers and definitions to create uefi payload for coreboot.

 #

-# Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>

 # This program and the accompanying materials are licensed and made available under

 # the terms and conditions of the BSD License that accompanies this distribution.

 # The full text of the license may be found at

@@ -516,11 +516,6 @@
 

 !if $(SHELL_TYPE) == BUILD_SHELL

 

-[PcdsFixedAtBuild]

-  ## This flag is used to control initialization of the shell library

-  #  This should be FALSE for compiling the shell application itself only.

-  gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

-

   #

   # Shell Lib

   #

@@ -528,9 +523,27 @@
   BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf

   DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf

   FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf

+  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf

+  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf

 

 [Components.X64]

+  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {

+    <PcdsFixedAtBuild>

+      ## This flag is used to control initialization of the shell library

+      #  This should be FALSE for compiling the dynamic command.

+      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

+  }

+  ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf {

+    <PcdsFixedAtBuild>

+      ## This flag is used to control initialization of the shell library

+      #  This should be FALSE for compiling the dynamic command.

+      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

+  }

   ShellPkg/Application/Shell/Shell.inf {

+    <PcdsFixedAtBuild>

+      ## This flag is used to control initialization of the shell library

+      #  This should be FALSE for compiling the shell application itself only.

+      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

 

     #------------------------------

     #  Basic commands

@@ -550,14 +563,6 @@
 

     <LibraryClasses>

       NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf

-      NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.inf

-

-    #------------------------------

-    #  Performance command

-    #------------------------------

-

-    <LibraryClasses>

-      NULL|ShellPkg/Library/UefiDpLib/UefiDpLib.inf

 

     #------------------------------

     #  Support libraries

@@ -566,13 +571,10 @@
     <LibraryClasses>

       DebugLib|MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf

       DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf

-      FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf

       HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf

-      NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf

       PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf

       ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf

       ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf

-      ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf

       SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf

   }