From e323321e2e36b876e62da2b3a9056795180e5f48 Mon Sep 17 00:00:00 2001 From: lushifex Date: Mon, 4 Sep 2017 16:22:16 +0800 Subject: Vlv2TbltDevicePkg: Upgrade core to UDK2017. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: lushifex --- Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c | 12 ++++----- Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.h | 4 +-- Vlv2TbltDevicePkg/BiosId.env | 29 +++++++++++++++++++++ Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.c | 12 ++------- Vlv2TbltDevicePkg/GenBiosId | Bin 12236 -> 36328 bytes Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/Cpu.S | 4 +-- Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/Cpu.asm | 4 +-- .../Library/DxeEsrtCapsuleBsLib/DxeCapsuleLib.c | 4 +-- .../Library/DxeEsrtCapsuleRtLib/DxeCapsuleLib.c | 4 +-- .../Library/PlatformBdsLib/BdsPlatform.c | 8 +++--- Vlv2TbltDevicePkg/PlatformPkg.fdf | 18 +++++-------- Vlv2TbltDevicePkg/PlatformPkgConfig.dsc | 8 +----- Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | 18 +++++-------- Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 26 ++++++++---------- Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 26 ++++++++---------- Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 26 ++++++++---------- .../MiscMemoryArrayMappedAddressFunction.c | 2 -- Vlv2TbltDevicePkg/bld_vlv.sh | 27 +++---------------- 18 files changed, 98 insertions(+), 134 deletions(-) create mode 100644 Vlv2TbltDevicePkg/BiosId.env diff --git a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c index 70ad07e600..1f2e93702a 100644 --- a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c +++ b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c @@ -1,6 +1,6 @@ /** @file - Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under @@ -35,7 +35,7 @@ Abstract: #include #include -#include +#include #include "AcpiPlatform.h" #include "AcpiPlatformHooks.h" #include "AcpiPlatformHooksLib.h" @@ -156,7 +156,7 @@ LocateSupportProtocol ( // // See if it has the ACPI storage file. // - Status = ((EFI_FIRMWARE_VOLUME_PROTOCOL *) (*Instance))->ReadFile ( + Status = ((EFI_FIRMWARE_VOLUME2_PROTOCOL *) (*Instance))->ReadFile ( *Instance, &gEfiAcpiTableStorageGuid, NULL, @@ -775,12 +775,12 @@ AcpiPlatformEntryPoint ( EFI_STATUS Status; EFI_STATUS AcpiStatus; EFI_ACPI_SUPPORT_PROTOCOL *AcpiSupport; - EFI_FIRMWARE_VOLUME_PROTOCOL *FwVol; + EFI_FIRMWARE_VOLUME2_PROTOCOL *FwVol; INTN Instance; EFI_ACPI_COMMON_HEADER *CurrentTable; UINTN TableHandle; UINT32 FvStatus; - UINT32 Size; + UINTN Size; EFI_EVENT Event; EFI_ACPI_TABLE_VERSION TableVersion; UINTN VarSize; @@ -848,7 +848,7 @@ AcpiPlatformEntryPoint ( // // Locate the firmware volume protocol. // - Status = LocateSupportProtocol (&gEfiFirmwareVolumeProtocolGuid, (VOID **) &FwVol, 1); + Status = LocateSupportProtocol (&gEfiFirmwareVolume2ProtocolGuid, (VOID **) &FwVol, 1); ASSERT_EFI_ERROR (Status); // diff --git a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.h b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.h index 8587beb976..96a537950a 100644 --- a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.h +++ b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.h @@ -1,6 +1,6 @@ /*++ - Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.
+ Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License that accompanies this distribution. @@ -39,7 +39,7 @@ Abstract: #include #include #include -#include +#include #include #include #include diff --git a/Vlv2TbltDevicePkg/BiosId.env b/Vlv2TbltDevicePkg/BiosId.env new file mode 100644 index 0000000000..f71b12cf26 --- /dev/null +++ b/Vlv2TbltDevicePkg/BiosId.env @@ -0,0 +1,29 @@ +#/** @file +# This file is used to define the BIOS ID parameters of the build. +# This file is processed by GenBiosId. +# The BIOS ID format conforms to "BIOS Revision Identification Specification", Rev. 0.7, 6/27/2001. +# +# BIOS ID string format: +# $(BOARD_ID)$(BOARD_REV).$(OEM_ID).$(VERSION_MAJOR).$(BUILD_TYPE)$(VERSION_MINOR).YYMMDDHHMM +# All fields must have a fixed length. +# Example: "TRFTCRB1.86C.0008.D03.0506081529" +# +# Copyright (c) 2008 - 2017, Intel Corporation. All rights reserved.
+# +# 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. +# +# +#**/ + +BOARD_ID = MNW2MAX +BOARD_REV = 1 +BUILD_TYPE = D +VERSION_MAJOR = 0096 +VERSION_MINOR = 01 +BOARD_EXT = X64 diff --git a/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.c b/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.c index f444af1452..646eadd4ed 100644 --- a/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.c +++ b/Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbService.c @@ -4,7 +4,7 @@ Firmware volume block driver for FWH or SPI device. It depends on which Flash Device Library to be linked with this driver. -Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License that accompanies this distribution. @@ -1010,8 +1010,7 @@ FvbInitialize ( EFI_BOOT_MODE BootMode; UINT32 PlatformFvBaseAddress[3]; UINT32 PlatformFvBaseAddressCount; - UINT32 PlatformFvLockList[2]; - UINT32 PlatformFvLockListCount; + // // This platform driver knows there are 3 FVs on // FD, which are FvRecovery, FvMain and FvNvStorage. @@ -1030,13 +1029,6 @@ FvbInitialize ( PlatformFvBaseAddress[2] = PcdGet32 (PcdFlashFvRecoveryBase); } - // - // List of FVs that should be write protected on normal boots. - // - PlatformFvLockListCount = 2; - PlatformFvLockList[0] = PcdGet32 (PcdFlashFvMainBase); - PlatformFvLockList[1] = PcdGet32 (PcdFlashFvRecoveryBase); - // // Calculate the total size for all firmware volume block instances. // diff --git a/Vlv2TbltDevicePkg/GenBiosId b/Vlv2TbltDevicePkg/GenBiosId index ef1578f2bc..9dd7e40c57 100755 Binary files a/Vlv2TbltDevicePkg/GenBiosId and b/Vlv2TbltDevicePkg/GenBiosId differ diff --git a/Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/Cpu.S b/Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/Cpu.S index 1eab73d17e..9867904552 100644 --- a/Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/Cpu.S +++ b/Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/Cpu.S @@ -1,6 +1,6 @@ # # -# Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved +# Copyright (c) 1999 - 2017, Intel Corporation. All rights reserved # # This program and the accompanying materials are licensed and made available under # the terms and conditions of the BSD License that accompanies this distribution. @@ -35,7 +35,7 @@ .globl ASM_PFX(EfiEnableInterrupts) .globl ASM_PFX(EfiCpuidExt) -.text +.code: #------------------------------------------------------------------------------ diff --git a/Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/Cpu.asm b/Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/Cpu.asm index d921132137..f6ad724e20 100644 --- a/Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/Cpu.asm +++ b/Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/Cpu.asm @@ -9,7 +9,7 @@ TITLE Cpu.asm: Assembly code for the x64 resources ; license agreement ; ; -; Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved +; Copyright (c) 1999 - 2017, Intel Corporation. All rights reserved ; ; This program and the accompanying materials are licensed and made available under ; the terms and conditions of the BSD License that accompanies this distribution. @@ -31,7 +31,7 @@ TITLE Cpu.asm: Assembly code for the x64 resources ;* ;------------------------------------------------------------------------------ -text SEGMENT +.code ;------------------------------------------------------------------------------ diff --git a/Vlv2TbltDevicePkg/Library/DxeEsrtCapsuleBsLib/DxeCapsuleLib.c b/Vlv2TbltDevicePkg/Library/DxeEsrtCapsuleBsLib/DxeCapsuleLib.c index bb77abcfde..45c7bcf2d4 100644 --- a/Vlv2TbltDevicePkg/Library/DxeEsrtCapsuleBsLib/DxeCapsuleLib.c +++ b/Vlv2TbltDevicePkg/Library/DxeEsrtCapsuleBsLib/DxeCapsuleLib.c @@ -1,7 +1,7 @@ /** @file Capsule Boottime Library instance to update capsule image to flash. - Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -421,7 +421,6 @@ ProcessFmpCapsuleImage ( EFI_STATUS Status; EFI_STATUS StatusEsrt; EFI_FIRMWARE_MANAGEMENT_CAPSULE_HEADER *FmpCapsuleHeader; - UINT8 *EndOfCapsule; EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER *ImageHeader; UINT8 *Image; EFI_HANDLE ImageHandle; @@ -456,7 +455,6 @@ ProcessFmpCapsuleImage ( EsrtProtocol = NULL; FmpCapsuleHeader = (EFI_FIRMWARE_MANAGEMENT_CAPSULE_HEADER *) ((UINT8 *) CapsuleHeader + CapsuleHeader->HeaderSize); - EndOfCapsule = (UINT8 *) CapsuleHeader + CapsuleHeader->CapsuleImageSize; if (FmpCapsuleHeader->Version > EFI_FIRMWARE_MANAGEMENT_CAPSULE_HEADER_INIT_VERSION) { return EFI_INVALID_PARAMETER; diff --git a/Vlv2TbltDevicePkg/Library/DxeEsrtCapsuleRtLib/DxeCapsuleLib.c b/Vlv2TbltDevicePkg/Library/DxeEsrtCapsuleRtLib/DxeCapsuleLib.c index 604cb3db02..77e2ba0501 100644 --- a/Vlv2TbltDevicePkg/Library/DxeEsrtCapsuleRtLib/DxeCapsuleLib.c +++ b/Vlv2TbltDevicePkg/Library/DxeEsrtCapsuleRtLib/DxeCapsuleLib.c @@ -1,7 +1,7 @@ /** @file Capsule Runtime Library instance to update capsule image to flash. - Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -426,7 +426,6 @@ ProcessFmpCapsuleImage ( EFI_STATUS Status; EFI_STATUS StatusEsrt; EFI_FIRMWARE_MANAGEMENT_CAPSULE_HEADER *FmpCapsuleHeader; - UINT8 *EndOfCapsule; EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER *ImageHeader; UINT8 *Image; EFI_HANDLE ImageHandle; @@ -461,7 +460,6 @@ ProcessFmpCapsuleImage ( EsrtProtocol = NULL; FmpCapsuleHeader = (EFI_FIRMWARE_MANAGEMENT_CAPSULE_HEADER *) ((UINT8 *) CapsuleHeader + CapsuleHeader->HeaderSize); - EndOfCapsule = (UINT8 *) CapsuleHeader + CapsuleHeader->CapsuleImageSize; if (FmpCapsuleHeader->Version > EFI_FIRMWARE_MANAGEMENT_CAPSULE_HEADER_INIT_VERSION) { return EFI_INVALID_PARAMETER; diff --git a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c index 5d1b2d4d3e..2e13a01e38 100644 --- a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c +++ b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c @@ -524,7 +524,7 @@ GetPlugInPciVgaDevicePath ( Status = gBS->HandleProtocol ( HandleBuffer[Index], &gEfiPciIoProtocolGuid, - (VOID**)&PciIo + (VOID **) &PciIo ); if (!EFI_ERROR (Status)) { @@ -533,9 +533,9 @@ GetPlugInPciVgaDevicePath ( // Status = PciIo->Pci.Read ( PciIo, - EfiPciIoWidthUint32, + EfiPciIoWidthUint8, 0, - sizeof (Pci) / sizeof (UINT32), + sizeof (Pci), &Pci ); if (EFI_ERROR (Status)) { @@ -562,7 +562,7 @@ GetPlugInPciVgaDevicePath ( gBS->HandleProtocol ( HandleBuffer[Index], &gEfiDevicePathProtocolGuid, - (VOID**)&DevicePath + (VOID **) &DevicePath ); Index1 = 0; diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Vlv2TbltDevicePkg/PlatformPkg.fdf index 41c11c58c3..3a29715a67 100644 --- a/Vlv2TbltDevicePkg/PlatformPkg.fdf +++ b/Vlv2TbltDevicePkg/PlatformPkg.fdf @@ -554,15 +554,7 @@ INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET # INF MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf INF MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf -!if $(SOURCE_DEBUG_ENABLE) == TRUE -!if $(SMM_SOURCE_DEBUG_ENABLE) == FALSE -INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)RELEASE/$(DXE_ARCHITECTURE)/PiSmmCpuDxeSmm.inf -!else - INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PiSmmCpuDxeSmm.inf -!endif -!else -INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PiSmmCpuDxeSmm.inf -!endif +INF UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf INF UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf INF MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf INF UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.inf @@ -606,10 +598,12 @@ INF IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf #INF IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf # -# SDIO +# eMMC/SD Card # -INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/MmcHost.inf -INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/MmcMediaDevice.inf +INF MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf +INF MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf +INF MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf + # # IDE/SCSI/AHCI # diff --git a/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc b/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc index 0d3d67b743..f595ee98be 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc @@ -1,7 +1,7 @@ #/** @file # platform configuration file. # -# Copyright (c) 2012 - 2015, Intel Corporation. All rights reserved.
+# Copyright (c) 2012 - 2017, Intel Corporation. All rights reserved.
# # This program and the accompanying materials are licensed and made available under # the terms and conditions of the BSD License that accompanies this distribution. @@ -91,11 +91,5 @@ DEFINE ESRT_ENABLE = TRUE # # Enable source level debug default # -!if $(TARGET) == RELEASE DEFINE SOURCE_DEBUG_ENABLE = FALSE - DEFINE SMM_SOURCE_DEBUG_ENABLE = FALSE -!else - DEFINE SOURCE_DEBUG_ENABLE = TRUE - DEFINE SMM_SOURCE_DEBUG_ENABLE = FALSE -!endif diff --git a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf index b68f76f78c..64d0638b48 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf +++ b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf @@ -507,15 +507,7 @@ INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET # INF MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf INF MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf -!if $(SOURCE_DEBUG_ENABLE) == TRUE -!if $(SMM_SOURCE_DEBUG_ENABLE) == FALSE -INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)RELEASE/$(DXE_ARCHITECTURE)/PiSmmCpuDxeSmm.inf -!else - INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PiSmmCpuDxeSmm.inf -!endif -!else -INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PiSmmCpuDxeSmm.inf -!endif +INF UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf INF UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf INF MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf INF UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.inf @@ -559,10 +551,12 @@ INF IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf #INF IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf # -# SDIO +# eMMC/SD Card # -INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/MmcHost.inf -INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/MmcMediaDevice.inf +INF MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf +INF MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf +INF MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf + # # IDE/SCSI/AHCI # diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc index f8f525a734..c8229df4e5 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc @@ -161,6 +161,7 @@ !endif S3IoLib|MdePkg/Library/BaseS3IoLib/BaseS3IoLib.inf S3PciLib|MdePkg/Library/BaseS3PciLib/BaseS3PciLib.inf + SmmCpuFeaturesLib|UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf # # Generic Modules @@ -413,6 +414,7 @@ LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.inf PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf SmmMemLib|MdePkg/Library/SmmMemLib/SmmMemLib.inf + SmmCpuPlatformHookLib|UefiCpuPkg/Library/SmmCpuPlatformHookLibNull/SmmCpuPlatformHookLibNull.inf BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf !if $(TARGET) != RELEASE @@ -614,7 +616,7 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdVariableCollectStatistics|FALSE !endif - gEfiCpuTokenSpaceGuid.PcdCpuSmmBlockStartupThisAp|TRUE + gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmBlockStartupThisAp|TRUE gEfiMdeModulePkgTokenSpaceGuid.PcdHiiOsRuntimeSupport|FALSE [PcdsFixedAtBuild.common] @@ -687,7 +689,7 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdLoadModuleAtFixAddressEnable|$(TOP_MEMORY_ADDRESS) gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserSubtitleTextColor|0x0 gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserFieldTextColor|0x01 - gEfiCpuTokenSpaceGuid.PcdCpuIEDEnabled|TRUE + gEfiCpuTokenSpaceGuid.PcdCpuIEDEnabled|FALSE gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBiosVideoCheckVbeEnable|TRUE gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBiosVideoCheckVgaEnable|TRUE @@ -912,7 +914,7 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdSystemRebootAfterCapsuleProcessFlag|0x0001 gEfiVLVTokenSpaceGuid.PcdCpuLockBoxDataAddress|0 gEfiVLVTokenSpaceGuid.PcdCpuSmramCpuDataAddress|0 gEfiVLVTokenSpaceGuid.PcdCpuLockBoxSize|0 - gEfiSecurityPkgTokenSpaceGuid.PcdUserPhysicalPresence|FALSE + gEfiSecurityPkgTokenSpaceGuid.PcdUserPhysicalPresence|TRUE [Components.IA32] @@ -1365,15 +1367,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf # MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf -!if $(SOURCE_DEBUG_ENABLE) == TRUE -!if $(SMM_SOURCE_DEBUG_ENABLE) == FALSE - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)RELEASE/$(DXE_ARCHITECTURE)/PiSmmCpuDxeSmm.inf -!else - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PiSmmCpuDxeSmm.inf -!endif -!else - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PiSmmCpuDxeSmm.inf -!endif + UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf @@ -1423,10 +1417,12 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf # -# SDIO +# eMMC/SD Card # - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/MmcHost.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/MmcMediaDevice.inf + MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf + MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf + MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf + !if $(ACPI50_ENABLE) == TRUE MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf { diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc index 183f423681..cb2efe280e 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc @@ -161,6 +161,7 @@ !endif S3IoLib|MdePkg/Library/BaseS3IoLib/BaseS3IoLib.inf S3PciLib|MdePkg/Library/BaseS3PciLib/BaseS3PciLib.inf + SmmCpuFeaturesLib|UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf # # Generic Modules @@ -413,6 +414,7 @@ LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.inf PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf SmmMemLib|MdePkg/Library/SmmMemLib/SmmMemLib.inf + SmmCpuPlatformHookLib|UefiCpuPkg/Library/SmmCpuPlatformHookLibNull/SmmCpuPlatformHookLibNull.inf BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf !if $(TARGET) != RELEASE @@ -614,7 +616,7 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdVariableCollectStatistics|FALSE !endif - gEfiCpuTokenSpaceGuid.PcdCpuSmmBlockStartupThisAp|TRUE + gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmBlockStartupThisAp|TRUE gEfiMdeModulePkgTokenSpaceGuid.PcdHiiOsRuntimeSupport|FALSE [PcdsFixedAtBuild.common] @@ -687,7 +689,7 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdLoadModuleAtFixAddressEnable|$(TOP_MEMORY_ADDRESS) gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserSubtitleTextColor|0x0 gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserFieldTextColor|0x01 - gEfiCpuTokenSpaceGuid.PcdCpuIEDEnabled|TRUE + gEfiCpuTokenSpaceGuid.PcdCpuIEDEnabled|FALSE gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBiosVideoCheckVbeEnable|TRUE gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBiosVideoCheckVgaEnable|TRUE @@ -914,7 +916,7 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdSystemRebootAfterCapsuleProcessFlag|0x0001 gEfiVLVTokenSpaceGuid.PcdCpuLockBoxDataAddress|0 gEfiVLVTokenSpaceGuid.PcdCpuSmramCpuDataAddress|0 gEfiVLVTokenSpaceGuid.PcdCpuLockBoxSize|0 - gEfiSecurityPkgTokenSpaceGuid.PcdUserPhysicalPresence|FALSE + gEfiSecurityPkgTokenSpaceGuid.PcdUserPhysicalPresence|TRUE [Components.IA32] @@ -1368,15 +1370,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf # MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf -!if $(SOURCE_DEBUG_ENABLE) == TRUE -!if $(SMM_SOURCE_DEBUG_ENABLE) == FALSE - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)RELEASE/$(DXE_ARCHITECTURE)/PiSmmCpuDxeSmm.inf -!else - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PiSmmCpuDxeSmm.inf -!endif -!else - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PiSmmCpuDxeSmm.inf -!endif + UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf @@ -1426,10 +1420,12 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf # -# SDIO +# eMMC/SD Card # - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/MmcHost.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/MmcMediaDevice.inf + MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf + MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf + MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf + !if $(ACPI50_ENABLE) == TRUE MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf { diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc index 0982963588..e37f73dda6 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc @@ -161,6 +161,7 @@ !endif S3IoLib|MdePkg/Library/BaseS3IoLib/BaseS3IoLib.inf S3PciLib|MdePkg/Library/BaseS3PciLib/BaseS3PciLib.inf + SmmCpuFeaturesLib|UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf # # Generic Modules @@ -413,6 +414,7 @@ LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.inf PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf SmmMemLib|MdePkg/Library/SmmMemLib/SmmMemLib.inf + SmmCpuPlatformHookLib|UefiCpuPkg/Library/SmmCpuPlatformHookLibNull/SmmCpuPlatformHookLibNull.inf BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf !if $(TARGET) != RELEASE @@ -614,7 +616,7 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdVariableCollectStatistics|FALSE !endif - gEfiCpuTokenSpaceGuid.PcdCpuSmmBlockStartupThisAp|TRUE + gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmBlockStartupThisAp|TRUE gEfiMdeModulePkgTokenSpaceGuid.PcdHiiOsRuntimeSupport|FALSE [PcdsFixedAtBuild.common] @@ -687,7 +689,7 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdLoadModuleAtFixAddressEnable|$(TOP_MEMORY_ADDRESS) gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserSubtitleTextColor|0x0 gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserFieldTextColor|0x01 - gEfiCpuTokenSpaceGuid.PcdCpuIEDEnabled|TRUE + gEfiCpuTokenSpaceGuid.PcdCpuIEDEnabled|FALSE gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBiosVideoCheckVbeEnable|TRUE gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBiosVideoCheckVgaEnable|TRUE @@ -914,7 +916,7 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdSystemRebootAfterCapsuleProcessFlag|0x0001 gEfiVLVTokenSpaceGuid.PcdCpuLockBoxDataAddress|0 gEfiVLVTokenSpaceGuid.PcdCpuSmramCpuDataAddress|0 gEfiVLVTokenSpaceGuid.PcdCpuLockBoxSize|0 - gEfiSecurityPkgTokenSpaceGuid.PcdUserPhysicalPresence|FALSE + gEfiSecurityPkgTokenSpaceGuid.PcdUserPhysicalPresence|TRUE [Components.IA32] @@ -1370,15 +1372,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf # MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf -!if $(SOURCE_DEBUG_ENABLE) == TRUE -!if $(SMM_SOURCE_DEBUG_ENABLE) == FALSE - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)RELEASE/$(DXE_ARCHITECTURE)/PiSmmCpuDxeSmm.inf -!else - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PiSmmCpuDxeSmm.inf -!endif -!else - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PiSmmCpuDxeSmm.inf -!endif + UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf @@ -1428,10 +1422,12 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf # -# SDIO +# eMMC/SD Card # - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/MmcHost.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/MmcMediaDevice.inf + MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf + MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf + MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf + !if $(ACPI50_ENABLE) == TRUE MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf { diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscMemoryArrayMappedAddressFunction.c b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscMemoryArrayMappedAddressFunction.c index 27d0ab7f52..c7222b32f8 100644 --- a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscMemoryArrayMappedAddressFunction.c +++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscMemoryArrayMappedAddressFunction.c @@ -67,7 +67,6 @@ MISC_SMBIOS_TABLE_FUNCTION (MiscMemoryArrayMappedAddress) UINT64 TotalMemorySizeInKB; UINT8 Dimm; EFI_SMBIOS_HANDLE SmbiosHandle; - EFI_MEMORY_ARRAY_START_ADDRESS_DATA *ForType19InputData; SMBIOS_TABLE_TYPE19 *SmbiosRecord; MEM_INFO_PROTOCOL *MemInfoHob; UINT16 Type16Handle = 0; @@ -80,7 +79,6 @@ MISC_SMBIOS_TABLE_FUNCTION (MiscMemoryArrayMappedAddress) if (RecordData == NULL) { return EFI_INVALID_PARAMETER; } - ForType19InputData = (EFI_MEMORY_ARRAY_START_ADDRESS_DATA *)RecordData; // // Two zeros following the last string. diff --git a/Vlv2TbltDevicePkg/bld_vlv.sh b/Vlv2TbltDevicePkg/bld_vlv.sh index cba30c6d88..76becfa1f3 100755 --- a/Vlv2TbltDevicePkg/bld_vlv.sh +++ b/Vlv2TbltDevicePkg/bld_vlv.sh @@ -124,10 +124,10 @@ fi ## Remove the values for Platform_Type and Build_Target from BiosIdX.env and stage in Conf if [ $Arch == "IA32" ]; then - cp $PLATFORM_PACKAGE/BiosIdR.env Conf/BiosId.env + cp $PLATFORM_PACKAGE/BiosId.env Conf/BiosId.env echo DEFINE X64_CONFIG = FALSE >> $auto_config_inc else - cp $PLATFORM_PACKAGE/BiosIdx64R.env Conf/BiosId.env + cp $PLATFORM_PACKAGE/BiosId.env Conf/BiosId.env echo DEFINE X64_CONFIG = TRUE >> $auto_config_inc fi sed -i '/^BOARD_ID/d' Conf/BiosId.env @@ -177,30 +177,9 @@ sed -i '/^TARGET_ARCH/d' Conf/target.txt sed -i '/^TOOL_CHAIN_TAG/d' Conf/target.txt sed -i '/^MAX_CONCURRENT_THREAD_NUMBER/d' Conf/target.txt -gcc_version=$(gcc -v 2>&1 | tail -1 | awk '{print $3}') -case $gcc_version in - 4.5.*) - TARGET_TOOLS=GCC45 - ;; - 4.6.*) - TARGET_TOOLS=GCC46 - ;; - 4.7.*) - TARGET_TOOLS=GCC47 - ;; - 4.8.*) - TARGET_TOOLS=GCC48 - ;; - 4.9.*|4.1[0-9].*|5.*.*|6.*.*) - TARGET_TOOLS=GCC49 - ;; - *) - TARGET_TOOLS=GCC44 - ;; -esac ACTIVE_PLATFORM=$PLATFORM_PACKAGE/PlatformPkgGcc"$Arch".dsc -TOOL_CHAIN_TAG=$TARGET_TOOLS +TOOL_CHAIN_TAG=GCC5 MAX_CONCURRENT_THREAD_NUMBER=1 echo ACTIVE_PLATFORM = $ACTIVE_PLATFORM >> Conf/target.txt echo TARGET = $TARGET >> Conf/target.txt -- cgit v1.2.3