CorebootPayloadPkg: Remove EdkShellBinPkg in FDF

Remove EdkShellBinPkg in CorebootPayloadPkg.fdf.
https://bugzilla.tianocore.org/show_bug.cgi?id=1108

v3:Remove FULL_BIN and change SHELL_TYPE from FULL_BIN
to UEFI_BIN.

Cc: Maurice Ma <maurice.ma@intel.com>
Cc: Prince Agyeman <prince.agyeman@intel.com>
Cc: Benjamin You <benjamin.you@intel.com>
Change-Id: I4db7068a3a1f68a1f6303079b73dc548c9feb2e3
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
Reviewed-by: Benjamin You <benjamin.you@intel.com>

diff --git a/CorebootPayloadPkg/CorebootPayloadPkg.fdf b/CorebootPayloadPkg/CorebootPayloadPkg.fdf
index 7994f0c949288846feb763d383c30657d1871f24..741a5c232ed8e5d66520a32516d536d6bda0fdfc 100644 (file)
--- a/CorebootPayloadPkg/CorebootPayloadPkg.fdf
+++ b/CorebootPayloadPkg/CorebootPayloadPkg.fdf
@@ -185,14 +185,6 @@ INF ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf
 INF ShellPkg/Application/Shell/Shell.inf\r
 !endif\r
 \r
-!if $(SHELL_TYPE) == FULL_BIN\r
-!if $(ARCH) == IA32\r
-INF  RuleOverride = BINARY USE = IA32 EdkShellBinPkg/FullShell/FullShell.inf\r
-!else\r
-INF  RuleOverride = BINARY USE = X64 EdkShellBinPkg/FullShell/FullShell.inf\r
-!endif\r
-!endif\r
-\r
 !if $(SHELL_TYPE) == MIN_BIN\r
 !if $(ARCH) == IA32\r
 INF  RuleOverride = BINARY USE = IA32 ShellBinPkg/MinUefiShell/MinUefiShell.inf\r

diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
index 7d5052be9301df42395ca4b893d014efd2ea7815..467d4fcdb4223fb8dd33cb564914b6c7f5927950 100644 (file)
--- a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
+++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
@@ -83,9 +83,9 @@
   DEFINE USE_HPET_TIMER                   = FALSE\r
 \r
   #\r
-  # Shell options: [BUILD_SHELL, FULL_BIN, MIN_BIN, NONE, UEFI]\r
+  # Shell options: [BUILD_SHELL, MIN_BIN, NONE, UEFI]\r
   #\r
-  DEFINE SHELL_TYPE              = FULL_BIN\r
+  DEFINE SHELL_TYPE              = UEFI_BIN\r
 \r
 [BuildOptions]\r
   *_*_*_CC_FLAGS                 = -D DISABLE_NEW_DEPRECATED_INTERFACES\r
@@ -327,13 +327,8 @@
   #\r
   # Set the proper Shell file GUID\r
   #\r
-  !if $(SHELL_TYPE) == FULL_BIN\r
-  # c57ad6b7-0515-40a8-9d21-551652854e37\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0xB7, 0xD6, 0x7A, 0xC5, 0x15, 0x05, 0xA8, 0x40, 0x9D, 0x21, 0x55, 0x16, 0x52, 0x85, 0x4E, 0x37 }\r
-  !else\r
   # 7C04A583-9E3E-4f1c-AD65-E05268D0B4D1\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1c, 0x4f, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }\r
-  !endif\r
 \r
 ################################################################################\r
 #\r

diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
index 0484e941cce7c7b2076cf4e6176882ebc7e8d5af..673bd26c7973b3aa826d46ccffbc3c37a3f7041a 100644 (file)
--- a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
+++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
@@ -83,9 +83,9 @@
   DEFINE USE_HPET_TIMER                   = FALSE\r
 \r
   #\r
-  # Shell options: [BUILD_SHELL, FULL_BIN, MIN_BIN, NONE, UEFI]\r
+  # Shell options: [BUILD_SHELL, MIN_BIN, NONE, UEFI]\r
   #\r
-  DEFINE SHELL_TYPE              = FULL_BIN\r
+  DEFINE SHELL_TYPE              = UEFI_BIN\r
 \r
 [BuildOptions]\r
   *_*_*_CC_FLAGS                 = -D DISABLE_NEW_DEPRECATED_INTERFACES\r
@@ -328,13 +328,8 @@
   #\r
   # Set the proper Shell file GUID\r
   #\r
-  !if $(SHELL_TYPE) == FULL_BIN\r
-  # c57ad6b7-0515-40a8-9d21-551652854e37\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0xB7, 0xD6, 0x7A, 0xC5, 0x15, 0x05, 0xA8, 0x40, 0x9D, 0x21, 0x55, 0x16, 0x52, 0x85, 0x4E, 0x37 }\r
-  !else\r
   # 7C04A583-9E3E-4f1c-AD65-E05268D0B4D1\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1c, 0x4f, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }\r
-  !endif\r
 \r
 ################################################################################\r
 #\r