tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Dandan Bi 2019-04-02 13:50:22 +08:00 committed by Liming Gao
parent 2e21e8c4b8
commit 87fcc6e863
3 changed files with 0 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
CorebootPayloadPkg/CorebootPayloadPkg.fdf
View File

@ -173,27 +173,9 @@ INF QuarkSocPkg/QuarkSouthCluster/Usb/Ohci/Dxe/OhciDxe.inf
# #
# Shell # Shell
# #
!if $(SHELL_TYPE) == BUILD_SHELL
INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
INF ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf INF ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf
INF ShellPkg/Application/Shell/Shell.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) { FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
SECTION RAW = MdeModulePkg/Logo/Logo.bmp SECTION RAW = MdeModulePkg/Logo/Logo.bmp

9
CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
View File

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

9
CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
View File

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