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

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>
This commit is contained in:
shenglei 2018-11-05 11:08:07 +08:00 committed by Benjamin You
parent c95f600e93
commit 806c28ef50
3 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CorebootPayloadPkg/CorebootPayloadPkg.fdf
View File

@ -185,14 +185,6 @@ INF ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf
INF ShellPkg/Application/Shell/Shell.inf INF ShellPkg/Application/Shell/Shell.inf
!endif !endif
!if $(SHELL_TYPE) == FULL_BIN
!if $(ARCH) == IA32
INF RuleOverride = BINARY USE = IA32 EdkShellBinPkg/FullShell/FullShell.inf
!else
INF RuleOverride = BINARY USE = X64 EdkShellBinPkg/FullShell/FullShell.inf
!endif
!endif
!if $(SHELL_TYPE) == MIN_BIN !if $(SHELL_TYPE) == MIN_BIN
!if $(ARCH) == IA32 !if $(ARCH) == IA32
INF RuleOverride = BINARY USE = IA32 ShellBinPkg/MinUefiShell/MinUefiShell.inf INF RuleOverride = BINARY USE = IA32 ShellBinPkg/MinUefiShell/MinUefiShell.inf

9
CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
View File

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

9
CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
View File

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