CorebootPayloadPkg: Remove the dependency of ShellBinPkg

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1675

In long term we will remove ShellBinPkg, so now we update
platform to use ShellPkg only.

Cc: Maurice Ma <maurice.ma@intel.com>
Cc: Prince Agyeman <prince.agyeman@intel.com>
Cc: Benjamin You <benjamin.you@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
Reviewed-by: Benjamin You <benjamin.you@intel.com>

diff --git a/CorebootPayloadPkg/CorebootPayloadPkg.fdf b/CorebootPayloadPkg/CorebootPayloadPkg.fdf
index 3ab1c70cc0b28c839c73c00679315fbbace82a6b..4e669ae887ef1677930e6c56913f72a2c6248646 100644 (file)
--- a/CorebootPayloadPkg/CorebootPayloadPkg.fdf
+++ b/CorebootPayloadPkg/CorebootPayloadPkg.fdf
@@ -173,27 +173,9 @@ INF QuarkSocPkg/QuarkSouthCluster/Usb/Ohci/Dxe/OhciDxe.inf
 #\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
-!if $(SHELL_TYPE) == MIN_BIN\r
-!if $(ARCH) == IA32\r
-INF  RuleOverride = BINARY USE = IA32 ShellBinPkg/MinUefiShell/MinUefiShell.inf\r
-!else\r
-INF  RuleOverride = BINARY USE = X64 ShellBinPkg/MinUefiShell/MinUefiShell.inf\r
-!endif\r
-!endif\r
-\r
-!if $(SHELL_TYPE) == UEFI_BIN\r
-!if $(ARCH) == IA32\r
-INF  RuleOverride = BINARY USE = IA32 ShellBinPkg/UefiShell/UefiShell.inf\r
-!else\r
-INF  RuleOverride = BINARY USE = X64 ShellBinPkg/UefiShell/UefiShell.inf\r
-!endif\r
-!endif\r
 \r
 FILE FREEFORM    = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {\r
   SECTION RAW = MdeModulePkg/Logo/Logo.bmp\r

diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
index d87c170807833412f18136191c2c84417bb7a87d..57a5508c95ff1e1dabbeff8a888d870f5c022d32 100644 (file)
--- a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
+++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
@@ -76,11 +76,6 @@
   #\r
   DEFINE USE_HPET_TIMER                   = FALSE\r
 \r
-  #\r
-  # Shell options: [BUILD_SHELL, MIN_BIN, NONE, UEFI]\r
-  #\r
-  DEFINE SHELL_TYPE              = UEFI_BIN\r
-\r
 [BuildOptions]\r
   *_*_*_CC_FLAGS                 = -D DISABLE_NEW_DEPRECATED_INTERFACES\r
   GCC:*_UNIXGCC_*_CC_FLAGS       = -DMDEPKG_NDEBUG\r
@@ -516,8 +511,6 @@
   #  Build the shell\r
   #------------------------------\r
 \r
-!if $(SHELL_TYPE) == BUILD_SHELL\r
-\r
   #\r
   # Shell Lib\r
   #\r
@@ -579,5 +572,3 @@
       ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf\r
       SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf\r
   }\r
-\r
-!endif\r

diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
index fcbd1f9a156d7de3be9caa32d664f65cf778dd5c..84f59e91191de6eb58e991631fae5c34ae079ac5 100644 (file)
--- a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
+++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
@@ -76,11 +76,6 @@
   #\r
   DEFINE USE_HPET_TIMER                   = FALSE\r
 \r
-  #\r
-  # Shell options: [BUILD_SHELL, MIN_BIN, NONE, UEFI]\r
-  #\r
-  DEFINE SHELL_TYPE              = UEFI_BIN\r
-\r
 [BuildOptions]\r
   *_*_*_CC_FLAGS                 = -D DISABLE_NEW_DEPRECATED_INTERFACES\r
   GCC:*_UNIXGCC_*_CC_FLAGS       = -DMDEPKG_NDEBUG\r
@@ -517,8 +512,6 @@
   #  Build the shell\r
   #------------------------------\r
 \r
-!if $(SHELL_TYPE) == BUILD_SHELL\r
-\r
   #\r
   # Shell Lib\r
   #\r
@@ -580,5 +573,3 @@
       ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf\r
       SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf\r
   }\r
-\r
-!endif\r