diff options
| author | zwei4 <david.wei@intel.com> | 2018-03-22 16:59:34 +0800 |
|---|---|---|
| committer | zwei4 <david.wei@intel.com> | 2018-03-22 17:03:14 +0800 |
| commit | 371a39fc2d034c3e20e965c6d68a3dc678f11c18 (patch) | |
| tree | c6f642af346066dfec28824cb766e924340d7ade | |
| parent | 191c87cbb5ae6a93d9d7c1b874d93849dea77675 (diff) | |
| download | edk2-platforms-371a39fc2d034c3e20e965c6d68a3dc678f11c18.tar.xz | |
Change BDS module.
Change from BDS of IntelFrameworkModulePkg to BDS of MdeModulePkg.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: zwei4 <david.wei@intel.com>
4 files changed, 16 insertions, 7 deletions
diff --git a/Platform/BroxtonPlatformPkg/Common/Library/PlatformBootManagerLib/PlatformBootManager.c b/Platform/BroxtonPlatformPkg/Common/Library/PlatformBootManagerLib/PlatformBootManager.c index 3dffe72636..7c7a98e2b9 100644 --- a/Platform/BroxtonPlatformPkg/Common/Library/PlatformBootManagerLib/PlatformBootManager.c +++ b/Platform/BroxtonPlatformPkg/Common/Library/PlatformBootManagerLib/PlatformBootManager.c @@ -35,7 +35,6 @@ #include <Guid/TpmInstance.h>
#include <Guid/PttPTPInstanceGuid.h>
-#pragma optimize("g", off)
#define TIMEOUT_COMMAND 100000
#define BIOS_COLOR_CODING_BAR_HEIGHT 40
@@ -635,8 +634,6 @@ UpdateDevicePath ( return Return;
}
-#pragma optimize("g", off)
-
/**
Check if current BootCurrent variable is internal shell boot option.
@@ -1047,6 +1044,6 @@ PlatformBootManagerAfterConsole ( }
if (IsNeedSortBootOption()) {
- EfiBootManagerSortLoadOptionVariable (LoadOptionTypeBoot, CompareBootOption);
+ EfiBootManagerSortLoadOptionVariable (LoadOptionTypeBoot, (SORT_COMPARE)CompareBootOption);
}
}
diff --git a/Platform/BroxtonPlatformPkg/PlatformDsc/Components.dsc b/Platform/BroxtonPlatformPkg/PlatformDsc/Components.dsc index 3135d4dc69..c6313cdd5d 100644 --- a/Platform/BroxtonPlatformPkg/PlatformDsc/Components.dsc +++ b/Platform/BroxtonPlatformPkg/PlatformDsc/Components.dsc @@ -107,7 +107,7 @@ GCC:*_*_*_CC_FLAGS = -D MDEPKG_NDEBUG
}
- IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf {
+ MdeModulePkg/Universal/BdsDxe/BdsDxe.inf {
<LibraryClasses>
OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
@@ -116,6 +116,13 @@ NULL|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.inf
NULL|$(PLATFORM_PACKAGE_COMMON)/Library/Tpm2DeviceLibPtp/Tpm2InstanceLibPtt.inf
}
+ MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf
+ MdeModulePkg/Application/UiApp/UiApp.inf {
+ <LibraryClasses>
+ NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf
+ NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf
+ NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf
+ }
$(PLATFORM_PACKAGE_COMMON)/SampleCode/IntelFsp2WrapperPkg/FspNotifyDxe/FspNotifyDxe.inf
diff --git a/Platform/BroxtonPlatformPkg/PlatformDsc/LibraryClasses.dsc b/Platform/BroxtonPlatformPkg/PlatformDsc/LibraryClasses.dsc index a4bc20973d..2320d2f9c6 100644 --- a/Platform/BroxtonPlatformPkg/PlatformDsc/LibraryClasses.dsc +++ b/Platform/BroxtonPlatformPkg/PlatformDsc/LibraryClasses.dsc @@ -272,3 +272,6 @@ BltLib|$(PLATFORM_PACKAGE_COMMON)/Library/FrameBufferBltLib/FrameBufferBltLib.inf
+ UefiBootManagerLib | MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
+ PlatformBootManagerLib | Platform/BroxtonPlatformPkg/Common/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
+ BootLogoLib | MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf
\ No newline at end of file diff --git a/Platform/BroxtonPlatformPkg/PlatformPkg.fdf b/Platform/BroxtonPlatformPkg/PlatformPkg.fdf index 9af77d5901..80184c0526 100644 --- a/Platform/BroxtonPlatformPkg/PlatformPkg.fdf +++ b/Platform/BroxtonPlatformPkg/PlatformPkg.fdf @@ -527,7 +527,9 @@ APRIORI DXE { INF UefiCpuPkg/CpuDxe/CpuDxe.inf
INF UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf
- INF IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf
+ INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
+ INF MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf
+ INF MdeModulePkg/Application/UiApp/UiApp.inf
!if $(TOOL_CHAIN_TAG) != GCC5
INF $(PLATFORM_PACKAGE_COMMON)/SampleCode/IntelFsp2WrapperPkg/FspNotifyDxe/FspNotifyDxe.inf
@@ -752,7 +754,7 @@ APRIORI DXE { #
# UEFI Shell
#
- FILE APPLICATION = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile) {
+ FILE APPLICATION = 7C04A583-9E3E-4f1c-AD65-E05268D0B4D1 {
SECTION PE32 = ShellBinPkg/UefiShell/$(IA32_X64_LC)/Shell.efi
}
|