diff options
| -rw-r--r-- | CorebootPayloadPkg/CorebootPayloadPkg.fdf | 8 | ||||
| -rw-r--r-- | CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc | 9 | ||||
| -rw-r--r-- | CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc | 9 |
3 files changed, 4 insertions, 22 deletions
diff --git a/CorebootPayloadPkg/CorebootPayloadPkg.fdf b/CorebootPayloadPkg/CorebootPayloadPkg.fdf index 7994f0c949..741a5c232e 100644 --- a/CorebootPayloadPkg/CorebootPayloadPkg.fdf +++ b/CorebootPayloadPkg/CorebootPayloadPkg.fdf @@ -185,14 +185,6 @@ INF ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf INF ShellPkg/Application/Shell/Shell.inf
!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 $(ARCH) == IA32
INF RuleOverride = BINARY USE = IA32 ShellBinPkg/MinUefiShell/MinUefiShell.inf
diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc index 7d5052be93..467d4fcdb4 100644 --- a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc +++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc @@ -83,9 +83,9 @@ 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]
*_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES
@@ -327,13 +327,8 @@ #
# 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
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1c, 0x4f, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }
- !endif
################################################################################
#
diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc index 0484e941cc..673bd26c79 100644 --- a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc +++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc @@ -83,9 +83,9 @@ 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]
*_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES
@@ -328,13 +328,8 @@ #
# 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
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1c, 0x4f, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }
- !endif
################################################################################
#
|