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...@intel.com>
Cc: Prince Agyeman <prince.agye...@intel.com>
Cc: Benjamin You <benjamin....@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Dandan Bi <dandan...@intel.com>
---
CorebootPayloadPkg/CorebootPayloadPkg.fdf | 18 ------------------
CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc | 9 ---------
.../CorebootPayloadPkgIa32X64.dsc | 9 ---------
3 files changed, 36 deletions(-)
diff --git a/CorebootPayloadPkg/CorebootPayloadPkg.fdf
b/CorebootPayloadPkg/CorebootPayloadPkg.fdf
index 0c24f96a15..d399ad8eb8 100644
--- a/CorebootPayloadPkg/CorebootPayloadPkg.fdf
+++ b/CorebootPayloadPkg/CorebootPayloadPkg.fdf
@@ -177,31 +177,13 @@ INF
MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
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
-
-!if $(SHELL_TYPE) == MIN_BIN
-!if $(ARCH) == IA32
-INF RuleOverride = BINARY USE = IA32 ShellBinPkg/MinUefiShell/MinUefiShell.inf
-!else
-INF RuleOverride = BINARY USE = X64 ShellBinPkg/MinUefiShell/MinUefiShell.inf
-!endif
-!endif
-
-!if $(SHELL_TYPE) == UEFI_BIN
-!if $(ARCH) == IA32
-INF RuleOverride = BINARY USE = IA32 ShellBinPkg/UefiShell/UefiShell.inf
-!else
-INF RuleOverride = BINARY USE = X64 ShellBinPkg/UefiShell/UefiShell.inf
-!endif
-!endif
FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
SECTION RAW = MdeModulePkg/Logo/Logo.bmp
}
diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
index 98d6073866..c53b53b2f7 100644
--- a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
+++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
@@ -80,15 +80,10 @@
#
# Chipset options
#
DEFINE USE_HPET_TIMER = FALSE
- #
- # Shell options: [BUILD_SHELL, MIN_BIN, NONE, UEFI]
- #
- DEFINE SHELL_TYPE = UEFI_BIN
-
[BuildOptions]
*_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES
GCC:*_UNIXGCC_*_CC_FLAGS = -DMDEPKG_NDEBUG
GCC:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG
INTEL:RELEASE_*_*_CC_FLAGS = /D MDEPKG_NDEBUG
@@ -520,12 +515,10 @@
#------------------------------
# Build the shell
#------------------------------
-!if $(SHELL_TYPE) == BUILD_SHELL
-
#
# Shell Lib
#
[LibraryClasses]
BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf
@@ -583,7 +576,5 @@
PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
}
-
-!endif
diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
index 608a288c42..3ecc0d0039 100644
--- a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
+++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
@@ -80,15 +80,10 @@
#
# Chipset options
#
DEFINE USE_HPET_TIMER = FALSE
- #
- # Shell options: [BUILD_SHELL, MIN_BIN, NONE, UEFI]
- #
- DEFINE SHELL_TYPE = UEFI_BIN
-
[BuildOptions]
*_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES
GCC:*_UNIXGCC_*_CC_FLAGS = -DMDEPKG_NDEBUG
GCC:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG
INTEL:RELEASE_*_*_CC_FLAGS = /D MDEPKG_NDEBUG
@@ -521,12 +516,10 @@
#------------------------------
# Build the shell
#------------------------------
-!if $(SHELL_TYPE) == BUILD_SHELL
-
#
# Shell Lib
#
[LibraryClasses]
BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf
@@ -584,7 +577,5 @@
PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
}
-
-!endif
--
2.18.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#38777): https://edk2.groups.io/g/devel/message/38777
Mute This Topic: https://groups.io/mt/31016083/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
