FW/PlatformBuildLab/Max: Fix the MinnowBaord X64 build with edk2-docker:1.1.0

Signed-off-by: Michał Żygowski <michal.zygowski@3mdeb.com>
This commit is contained in:
Michał Żygowski
2024-03-19 14:28:22 +01:00
parent 928a6306ac
commit c74eb5da1e
10 changed files with 118 additions and 107 deletions

View File

@@ -1,15 +1,24 @@
/** @file
Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials are licensed and made available under
the terms and conditions of the BSD License that accompanies this distribution.
The full text of the license may be found at
http://opensource.org/licenses/bsd-license.php.
This program and the accompanying materials are licensed and made available under
the terms and conditions of the BSD License that accompanies this distribution.
The full text of the license may be found at
http://opensource.org/licenses/bsd-license.php.
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
Module Name:
@@ -2570,15 +2579,11 @@ ShowProgressHotKey (
if (DebugAssertEnabled())
{
DEBUG ((EFI_D_INFO, "\n\nStart showing progress bar... Press any key to stop it, or press <F2> to enter setup page! ...Zzz....\n"));
}
else
{
gST->ConOut->SetAttribute(gST->ConOut, EFI_TEXT_ATTR (EFI_LIGHTGRAY, EFI_BLACK));
if (DebugAssertEnabled())
{
SerialPortWrite((UINT8 *)"\n\n>>>>Start boot option, Press <F2> to enter setup page(5 Sec)", 71);
}
SetMem (&Foreground, sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL), 0xff);
SetMem (&Background, sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL), 0x0);
@@ -2587,7 +2592,7 @@ ShowProgressHotKey (
//
// Clear the progress status bar first
//
#endif
TmpStr = L"Start boot option, Press <F2> to enter setup page.";
PlatformBdsShowProgress (Foreground, Background, TmpStr, Color, 0, 0);
TimeoutRemain = TimeoutDefault;

View File

@@ -47,7 +47,8 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_GUID *mLibTerminalType[] = {
&gEfiPcAnsiGuid,
&gEfiVT100Guid,
&gEfiVT100PlusGuid,
&gEfiVTUTF8Guid
&gEfiVTUTF8Guid,
&gEfiTtyTermGuid
};
//
@@ -651,7 +652,6 @@ BootCurrentIsInternalShell (
CHAR16 BootOptionName[16];
UINT8 *BootOption;
UINT8 *Ptr;
EFI_DEVICE_PATH_PROTOCOL *BootDevicePath;
BOOLEAN Result;
EFI_STATUS Status;
EFI_DEVICE_PATH_PROTOCOL *TempDevicePath;
@@ -659,7 +659,6 @@ BootCurrentIsInternalShell (
EFI_GUID *GuidPoint;
BootOption = NULL;
BootDevicePath = NULL;
Result = FALSE;
//
@@ -910,6 +909,7 @@ PlatformBootManagerBeforeConsole (
//
// Restoring default serial device path.
//
CopyGuid (&((VENDOR_DEVICE_PATH *)Next)->Guid, TerminalGuid);
EfiBootManagerUpdateConsoleVariable (ConIn, NULL, Instance);
EfiBootManagerUpdateConsoleVariable (ConOut, NULL, Instance);
}

View File

@@ -101,6 +101,7 @@
gEfiVT100Guid
gEfiVT100PlusGuid
gEfiPcAnsiGuid
gEfiTtyTermGuid
gEfiTpmDeviceInstanceTpm20DtpmGuid
gTpmDeviceInstanceTpm20PttPtpGuid
gEfiTcg2PhysicalPresenceGuid

View File

@@ -15,8 +15,6 @@
#include "PlatformBootManager.h"
BOOLEAN mContinueBoot = FALSE;
BOOLEAN mUiAppBoot = FALSE;
BOOLEAN mPxeBoot = FALSE;
BOOLEAN mAnyKeypressed = FALSE;
BOOLEAN mHotKeypressed = FALSE;
@@ -517,9 +515,6 @@ RegisterDefaultBootOption (
VOID
)
{
EFI_DEVICE_PATH_PROTOCOL *DevicePath;
EFI_LOADED_IMAGE_PROTOCOL *LoadedImage;
MEDIA_FW_VOL_FILEPATH_DEVICE_PATH FileNode;
UINT16 *ShellData;
UINT32 ShellDataSize;
@@ -540,18 +535,6 @@ RegisterDefaultBootOption (
if (mUiAppOptionNumber == LoadOptionNumberUnassigned) {
DEBUG ((DEBUG_ERROR, "UiAppOptionNumber (%d) should not be same to LoadOptionNumberUnassigned(%d).\n", mUiAppOptionNumber, LoadOptionNumberUnassigned));
}
//
// Boot Manager Menu.
//
EfiInitializeFwVolDevicepathNode (&FileNode, &mBootMenuFile);
gBS->HandleProtocol (
gImageHandle,
&gEfiLoadedImageProtocolGuid,
(VOID **) &LoadedImage
);
DevicePath = AppendDevicePathNode (DevicePathFromHandle (LoadedImage->DeviceHandle), (EFI_DEVICE_PATH_PROTOCOL *) &FileNode);
}
@@ -606,21 +589,16 @@ RegisterStaticHotkey (
EFI_INPUT_KEY Enter;
EFI_KEY_DATA F2;
EFI_KEY_DATA F7;
BOOLEAN EnterSetup;
EFI_STATUS Status;
EFI_BOOT_MANAGER_LOAD_OPTION BootOption;
EnterSetup = FALSE;
//
// [Enter]
//
mContinueBoot = !EnterSetup;
if (mContinueBoot) {
Enter.ScanCode = SCAN_NULL;
Enter.UnicodeChar = CHAR_CARRIAGE_RETURN;
EfiBootManagerRegisterContinueKeyOption (0, &Enter, NULL);
}
Enter.ScanCode = SCAN_NULL;
Enter.UnicodeChar = CHAR_CARRIAGE_RETURN;
EfiBootManagerRegisterContinueKeyOption (0, &Enter, NULL);
//
// [F2]/[F7].
@@ -640,8 +618,7 @@ RegisterStaticHotkey (
F2.Key.UnicodeChar = CHAR_NULL;
F2.KeyState.KeyShiftState = EFI_SHIFT_STATE_VALID;
F2.KeyState.KeyToggleState = 0;
mUiAppBoot = !EnterSetup;
RegisterBootOptionHotkey ((UINT16) mUiAppOptionNumber, &F2.Key, mUiAppBoot);
RegisterBootOptionHotkey ((UINT16) mUiAppOptionNumber, &F2.Key, TRUE);
}
UINT8

View File

@@ -856,7 +856,7 @@ READ_LOCK_STATUS = TRUE
!if $(CAPSULE_ENABLE)
[FV.CapsuleDispatchFv]
[FV.CAPSULEDISPATCHFV]
FvAlignment = 16
ERASE_POLARITY = 1
MEMORY_MAPPED = TRUE

View File

@@ -48,7 +48,7 @@ DEFINE USE_HPET_TIMER = FALSE
# Feature selection
#
DEFINE TPM_ENABLED = FALSE
DEFINE TPM_ENABLED = TRUE
DEFINE ACPI50_ENABLE = TRUE
DEFINE PERFORMANCE_ENABLE = FALSE
@@ -65,8 +65,8 @@ DEFINE VARIABLE_INFO_ENABLE = FALSE
DEFINE S3_ENABLE = TRUE
### Enable only if SOURCE_DEBUG_ENABLE = FALSE otherwise the flash space will overload.
### DEFINE CAPSULE_ENABLE = TRUE
DEFINE CAPSULE_ENABLE = FALSE
DEFINE CAPSULE_ENABLE = TRUE
# DEFINE CAPSULE_ENABLE = FALSE
DEFINE CAPSULE_RESET_ENABLE = TRUE
DEFINE GOP_DRIVER_ENABLE = TRUE

View File

@@ -1,7 +1,7 @@
#/** @file
# Platform description.
#
# Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR>
# Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials are licensed and made available under
# the terms and conditions of the BSD License that accompanies this distribution.
@@ -77,9 +77,15 @@
DEFINE PLATFORM_PCIEXPRESS_BASE = 0E0000000
DEFINE SEC_ENABLE = FALSE
DEFINE SEC_ENABLE = TRUE
!if $(TARGET) == RELEASE
DEFINE SEC_DEBUG_INFO_ENABLE = FALSE
DEFINE FTPM_ENABLE = FALSE
!endif
!if $(TARGET) == DEBUG
DEFINE SEC_DEBUG_INFO_ENABLE = TRUE
!endif
DEFINE FTPM_ENABLE = TRUE
DEFINE HTTP_BOOT_SUPPORT = TRUE
################################################################################
#
@@ -246,8 +252,8 @@
DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf
!else
DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.inf
!endif
PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
@@ -351,21 +357,21 @@
DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf
!else
DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.inf
!endif
LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.inf
HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf
!if $(SOURCE_DEBUG_ENABLE) == TRUE
PeCoffExtraActionLib|SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug/PeCoffExtraActionLibDebug.inf
DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibSerialPort/DebugCommunicationLibSerialPort.inf
SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf
DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib.inf
!else
!if $(SOURCE_DEBUG_ENABLE) == TRUE
PeCoffExtraActionLib|SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug/PeCoffExtraActionLibDebug.inf
DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibSerialPort/DebugCommunicationLibSerialPort.inf
SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf
DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib.inf
!else
PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf
DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf
!endif
!endif
!if $(MINNOW2_FSP_BUILD) == TRUE
PlatformFspLib|Vlv2TbltDevicePkg/Library/PlatformFspLib/PlatformFspLib.inf
@@ -435,9 +441,9 @@
SmmCpuPlatformHookLib|UefiCpuPkg/Library/SmmCpuPlatformHookLibNull/SmmCpuPlatformHookLibNull.inf
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
!if $(TARGET) != RELEASE
DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
!endif
!if $(TARGET) != RELEASE
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
!endif
!if $(SOURCE_DEBUG_ENABLE) == TRUE
DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgentLib.inf
@@ -459,7 +465,7 @@
PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
!if $(TARGET) != RELEASE
DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
!endif
!if $(SOURCE_DEBUG_ENABLE) == TRUE
@@ -645,6 +651,11 @@
!if $(HTTP_BOOT_SUPPORT) == TRUE
gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE
!endif
!if $(BUILD_NEW_SHELL) == TRUE
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }
!endif
!if $(MINNOW2_FSP_BUILD) == TRUE
# $(FLASH_REGION_VLVMICROCODE_BASE)
gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchAddress|0xFFC00000
@@ -725,6 +736,7 @@
!endif
gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmApSyncTimeout|1000
gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|4
[PcdsFixedAtBuild.X64]
gEfiMdeModulePkgTokenSpaceGuid.PcdSystemRebootAfterCapsuleProcessFlag|0x0001
@@ -909,8 +921,8 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdSystemRebootAfterCapsuleProcessFlag|0x0001
gEfiSecurityPkgTokenSpaceGuid.PcdTpmScrtmPolicy|1
!endif
gPlatformModuleTokenSpaceGuid.PcdRtcPowerFailure|FALSE
gPlatformModuleTokenSpaceGuid.PcdRtcPowerFailure|FALSE
[PcdsDynamicExDefault.common.DEFAULT]
gEfiVLVTokenSpaceGuid.PcdTCSmbaIoBaseAddress|0x1040
gEfiVLVTokenSpaceGuid.PcdEmmcManufacturerId|0
@@ -1014,8 +1026,8 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
<PcdsFixedAtBuild>
gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E
!endif
<LibraryClasses>
PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
<LibraryClasses>
PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
}
!endif
@@ -1040,7 +1052,8 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf
NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
}
HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf
}
!endif
$(PLATFORM_PACKAGE)/PlatformInitPei/PlatformInitPei.inf {
@@ -1048,7 +1061,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x803805c6
<LibraryClasses>
!if $(TARGET) != RELEASE
DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
!endif
PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
}
@@ -1095,7 +1108,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000046
<LibraryClasses>
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf
NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf
NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
}
@@ -1104,6 +1117,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.inf {
<LibraryClasses>
PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
Tpm2DeviceLib|Vlv2TbltDevicePkg/Library/Tpm2DeviceLibSeCPei/Tpm2DeviceLibSeC.inf
}
!endif
!if $(ACPI50_ENABLE) == TRUE
@@ -1153,11 +1167,11 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x27
<LibraryClasses>
!if $(TARGET) != RELEASE
DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
!endif
<BuildOptions>
<BuildOptions>
ICC:*_*_*_CC_FLAGS = -D MDEPKG_NDEBUG
GCC:RELEASE_*_*_CC_FLAGS = -D MDEPKG_NDEBUG
GCC:RELEASE_*_*_CC_FLAGS = -D MDEPKG_NDEBUG
}
MdeModulePkg/Universal/PCD/Dxe/Pcd.inf {
<LibraryClasses>
@@ -1170,7 +1184,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf {
<LibraryClasses>
!if $(TARGET) != RELEASE
DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
!endif
}
@@ -1283,7 +1297,13 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf
MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
$(PLATFORM_PACKAGE)/FvbRuntimeDxe/FvbRuntimeDxe.inf
$(PLATFORM_PACKAGE)/FvbRuntimeDxe/FvbRuntimeDxe.inf {
!if $(TARGET) == DEBUG
<LibraryClasses>
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.inf
!endif
}
$(PLATFORM_PACKAGE)/PlatformSetupDxe/PlatformSetupDxe.inf
@@ -1339,7 +1359,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
Vlv2TbltDevicePkg/VlvPlatformInitDxe/VlvPlatformInitDxe.inf{
<LibraryClasses>
!if $(TARGET) != RELEASE
DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
!endif
PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
}
@@ -1369,17 +1389,16 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
<LibraryClasses>
NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf
NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
Tpm2DeviceLib|Vlv2TbltDevicePkg/Library/Tpm2DeviceLibSeCDxe/Tpm2DeviceLibSeC.inf
}
SecurityPkg/Tcg/TrEEConfig/TrEEConfigDxe.inf {
<LibraryClasses>
Tpm2DeviceLib|Vlv2TbltDevicePkg/Library/Tpm2DeviceLibSeCDxe/Tpm2DeviceLibSeC.inf
}
$(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/FtpmSmm.inf
!endif
!if $(TPM_ENABLED) == TRUE
SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.inf {
<LibraryClasses>
PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
}
SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf {
<LibraryClasses>
PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
@@ -1403,14 +1422,14 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
$(PLATFORM_PACKAGE)/PlatformSmm/PlatformSmm.inf{
<LibraryClasses>
!if $(TARGET) != RELEASE
DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
!endif
PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
}
$(PLATFORM_PACKAGE)/PlatformInfoDxe/PlatformInfoDxe.inf
$(PLATFORM_PACKAGE)/PlatformCpuInfoDxe/PlatformCpuInfoDxe.inf
$(PLATFORM_PACKAGE)/PlatformDxe/PlatformDxe.inf
$(PLATFORM_PACKAGE)/PlatformRtcRuntimeDxe/PlatformRtcRuntimeDxe.inf
$(PLATFORM_PACKAGE)/PlatformRtcRuntimeDxe/PlatformRtcRuntimeDxe.inf
$(PLATFORM_PACKAGE)/PciPlatform/PciPlatform.inf
$(PLATFORM_PACKAGE)/SaveMemoryConfig/SaveMemoryConfig.inf
@@ -1427,8 +1446,8 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
# SMM
#
MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf
MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf
UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf {
MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf
UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf {
<PcdsFixedAtBuild>
gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000
}
@@ -1496,7 +1515,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
<LibraryClasses>
TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf
}
MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
!endif
#
@@ -1636,18 +1655,16 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
IntelFrameworkModulePkg/Universal/FirmwareVolume/FwVolDxe/FwVolDxe.inf
MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.inf
Vlv2TbltDevicePkg/Application/FirmwareUpdate/FirmwareUpdate.inf
Vlv2TbltDevicePkg/Application/SsdtUpdate/SsdtUpdate.inf
Vlv2TbltDevicePkg/Application/FirmwareUpdate/FirmwareUpdate.inf
Vlv2TbltDevicePkg/Application/SsdtUpdate/SsdtUpdate.inf
!if $(CAPSULE_ENABLE)
!if $(CAPSULE_ENABLE)
MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf
MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf {
<LibraryClasses>
PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
}
!endif
!if $(CAPSULE_ENABLE)
SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.inf {
<LibraryClasses>
FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthenticationLibRsa2048Sha256.inf

View File

@@ -1,7 +1,7 @@
#/** @file
# Platform description.
#
# Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR>
# Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials are licensed and made available under
# the terms and conditions of the BSD License that accompanies this distribution.
@@ -78,8 +78,14 @@
DEFINE PLATFORM_PCIEXPRESS_BASE = 0E0000000
DEFINE SEC_ENABLE = TRUE
!if $(TARGET) == RELEASE
DEFINE SEC_DEBUG_INFO_ENABLE = FALSE
!endif
!if $(TARGET) == DEBUG
DEFINE SEC_DEBUG_INFO_ENABLE = TRUE
!endif
DEFINE FTPM_ENABLE = TRUE
DEFINE HTTP_BOOT_SUPPORT = TRUE
################################################################################
#
@@ -736,6 +742,8 @@
!endif
gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmApSyncTimeout|1000
gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|4
[PcdsFixedAtBuild.X64]
gEfiMdeModulePkgTokenSpaceGuid.PcdSystemRebootAfterCapsuleProcessFlag|0x0001
@@ -922,8 +930,8 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdSystemRebootAfterCapsuleProcessFlag|0x0001
gEfiSecurityPkgTokenSpaceGuid.PcdTpmScrtmPolicy|1
!endif
gPlatformModuleTokenSpaceGuid.PcdRtcPowerFailure|FALSE
gPlatformModuleTokenSpaceGuid.PcdRtcPowerFailure|FALSE
[PcdsDynamicExDefault.common.DEFAULT]
gEfiVLVTokenSpaceGuid.PcdTCSmbaIoBaseAddress|0x1040
gEfiVLVTokenSpaceGuid.PcdEmmcManufacturerId|0
@@ -1022,8 +1030,8 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
<PcdsFixedAtBuild>
gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E
!endif
<LibraryClasses>
PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
<LibraryClasses>
PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
}
!endif
@@ -1048,6 +1056,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf
NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf
}
!endif
@@ -1102,7 +1111,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000046
<LibraryClasses>
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf
NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf
NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
}
@@ -1381,7 +1390,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
<LibraryClasses>
NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf
NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
Tpm2DeviceLib|Vlv2TbltDevicePkg/Library/Tpm2DeviceLibSeCDxe/Tpm2DeviceLibSeC.inf
}
$(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/FtpmSmm.inf
@@ -1422,7 +1431,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
$(PLATFORM_PACKAGE)/PlatformInfoDxe/PlatformInfoDxe.inf
$(PLATFORM_PACKAGE)/PlatformCpuInfoDxe/PlatformCpuInfoDxe.inf
$(PLATFORM_PACKAGE)/PlatformDxe/PlatformDxe.inf
$(PLATFORM_PACKAGE)/PlatformRtcRuntimeDxe/PlatformRtcRuntimeDxe.inf
$(PLATFORM_PACKAGE)/PlatformRtcRuntimeDxe/PlatformRtcRuntimeDxe.inf
$(PLATFORM_PACKAGE)/PciPlatform/PciPlatform.inf
$(PLATFORM_PACKAGE)/SaveMemoryConfig/SaveMemoryConfig.inf
@@ -1508,7 +1517,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
<LibraryClasses>
TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf
}
MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
!endif
#

View File

@@ -44,3 +44,4 @@
Tpm2CommandLib
MemoryAllocationLib
BaseCryptLib
HashLib

View File

@@ -44,3 +44,4 @@
Tpm2CommandLib
MemoryAllocationLib
BaseCryptLib
HashLib