* Re: [edk2-devel] [PATCH V2 33/33] AMD/VanGoghBoard: Improvement coding style
2024-01-25 6:39 ` [edk2-devel] [PATCH V2 33/33] AMD/VanGoghBoard: Improvement coding style Zhai, MingXin (Duke) via groups.io
@ 2024-01-25 8:16 ` Xing, Eric via groups.io
0 siblings, 0 replies; 2+ messages in thread
From: Xing, Eric via groups.io @ 2024-01-25 8:16 UTC (permalink / raw)
To: Zhai, MingXin (Duke), devel@edk2.groups.io
Cc: Yao, Ken, Fu, Igniculus, Chang, Abner
[AMD Official Use Only - General]
Hi Duke,
This new patch V2 looks ok to me. Let's wait for other team members and Abner's approval.
Reviewed-by: Eric Xing <eric.xing@amd.com>
Thanks,
Eric
> -----Original Message-----
> From: duke.zhai@amd.com <duke.zhai@amd.com>
> Sent: Thursday, January 25, 2024 2:40 PM
> To: devel@edk2.groups.io
> Cc: Xing, Eric <Eric.Xing@amd.com>; Yao, Ken <Ken.Yao@amd.com>; Fu,
> Igniculus <Igniculus.Fu@amd.com>; Chang, Abner <Abner.Chang@amd.com>
> Subject: [PATCH V2 33/33] AMD/VanGoghBoard: Improvement coding style
>
> From: Duke Zhai <Duke.Zhai@amd.com>
>
> BZ #:4640
> In V2:
> 1.Remove the leading underscore and use double underscore at trailing in C
> header files.
> 2.Remove old tianocore licenses and redundant license description.
> 3.Improve coding style. For example: remove space between @param.
>
> In V1:
> Improve coding style for EDk2 patch check rule.
> Add readme.md for ChachaniBoardPkg introduction.
>
> Signed-off-by: Duke Zhai <duke.zhai@amd.com>
> Cc: Eric Xing <eric.xing@amd.com>
> Cc: Ken Yao <ken.yao@amd.com>
> Cc: Igniculus Fu <igniculus.fu@amd.com>
> Cc: Abner Chang <abner.chang@amd.com>
> ---
> .../AmdPlatformPkg/Universal/LogoDxe/Logo.c | 2 +-
> .../VanGoghBoard/AgesaPublic/Include/AGESA.h | 4 +-
> .../VanGoghBoard/AgesaPublic/Include/AMD.h | 4 +-
> .../AgesaPublic/Include/AmdPspDirectory.h | 4 +-
> .../AgesaPublic/Include/FchRegistersCommon.h | 32 +--
> .../Include/Guid/AmdMemoryInfoHob.h | 4 +-
> .../Include/Library/AmdPspBaseLibV2.h | 4 +-
> .../Include/Library/AmdPspCommonLib.h | 4 +-
> .../Include/Library/AmdPspFtpmLib.h | 4 +-
> .../AgesaPublic/Include/Ppi/AmdPspFtpmPpi.h | 4 +-
> .../Include/Protocol/AmdPspFtpmProtocol.h | 4 +-
> .../Acpi/AcpiTables/Facs/Facs.h | 36 +--
> .../Acpi/AcpiTables/Fadt/Fadt.h | 59 ++--
> .../Acpi/AcpiTables/Hpet/Hpet.h | 49 ++--
> .../Acpi/AcpiTables/Madt/Madt.h | 124 ++++----
> .../Acpi/AcpiTables/Mcfg/Mcfg.h | 48 ++--
> .../SystemFirmwareDescriptor.aslc | 18 +-
> .../SystemFirmwareDescriptor.inf | 18 +-
> .../SystemFirmwareDescriptorPei.c | 18 +-
> .../ChachaniBoardPkg/Conf/build_rule.txt | 6 -
> .../ChachaniBoardPkg/Conf/target.txt | 13 +-
> .../ChachaniBoardPkg/Conf/tools_def.txt | 22 +-
> .../Include/Library/CapsuleHookLib.h | 4 +-
> .../Include/Protocol/GlobalNvsArea.h | 15 +-
> .../PlatformBootManager.c | 29 +-
> .../PlatformBootManager.h | 11 +-
> .../PlatformBootManagerLib.inf | 9 +-
> .../PlatformBootManagerLib/PlatformConsole.c | 13 +-
> .../PlatformBootManagerLib/PlatformConsole.h | 11 +-
> .../PlatformBootManagerLib/PlatformData.c | 11 +-
> .../Library/PlatformSecLib/Ia32/Flat32.nasm | 23 +-
> .../Library/PlatformSecLib/Ia32/Platform.inc | 20 +-
> .../Library/PlatformSecLib/PlatformSecLib.c | 16 +-
> .../Library/PlatformSecLib/PlatformSecLib.inf | 9 +-
> .../PlatformSecLib/PlatformSecLibModStrs.uni | 11 +-
> .../PciPlatform/CommonHeader.h | 24 +-
> .../PciPlatform/PciPlatform.c | 20 +-
> .../PciPlatform/PciPlatform.h | 22 +-
> .../PciPlatform/PciPlatform.inf | 19 +-
> .../BaseTools/Source/Python/GenFds/Capsule.py | 10 +-
> .../FspWrapperNotifyDxe/FspWrapperNotifyDxe.c | 11 +-
> .../FspWrapperNotifyDxe/LoadBelow4G.c | 11 +-
> .../FspmWrapperPeim/FspmWrapperPeim.c | 11 +-
> .../FspsMultiPhaseSiInitDxe.c | 11 +-
> .../FspsMultiPhaseSiInitDxe/LoadBelow4G.c | 12 +-
> .../FspsWrapperPeim/FspsWrapperPeim.c | 11 +-
> .../edk2/Fsp2WrapperPkg/Include/FspUpd.h | 4 +-
> .../edk2/Fsp2WrapperPkg/Include/FspmUpd.h | 4 +-
> .../edk2/Fsp2WrapperPkg/Include/FspsUpd.h | 4 +-
> .../edk2/Fsp2WrapperPkg/Include/FsptUpd.h | 4 +-
> .../Include/Library/FspMeasurementLib.h | 15 +-
> .../Include/Library/FspWrapperApiLib.h | 15 +-
> .../Include/Library/FspWrapperApiTestLib.h | 15 +-
> .../Include/Library/FspWrapperHobProcessLib.h | 15 +-
> .../Library/FspWrapperMultiPhaseProcessLib.h | 15 +-
> .../Include/Library/FspWrapperPlatformLib.h | 15 +-
> .../Library/FspWrapperPlatformMultiPhaseLib.h | 11 +-
> .../Include/MultiPhaseSiPhases.h | 4 +-
> .../Include/Ppi/FspSiliconInitDone.h | 15 +-
> .../Include/Ppi/TopOfTemporaryRam.h | 15 +-
> .../BaseFspMeasurementLib/FspMeasurementLib.c | 11 +-
> .../BaseFspWrapperApiLib/FspWrapperApiLib.c | 11 +-
> .../X64/DispatchExecute.c | 11 +-
> .../BaseFspWrapperApiLib/X64/Thunk64To32.nasm | 5 -
> .../FspWrapperApiTestNull.c | 11 +-
> .../FspWrapperPlatformLibSample.c | 11 +-
> .../FspWrapperPlatformMultiPhaseLibNull.c | 11 +-
> .../DxeFspWrapperMultiPhaseProcessLib.c | 11 +-
> .../PeiFspWrapperMultiPhaseProcessLib.c | 11 +-
> .../CommonHeader.h | 23 +-
> .../FspWrapperHobProcessLibSample.c | 127 ++++-----
> .../MemoryInstall.h | 23 +-
> .../SecFspWrapperPlatformSecLibSample/Fsp.h | 4 +-
> .../SecRamInitData.c | 8 +-
> .../Bus/Pci/PciHostBridgeDxe/IoFifo.h | 22 +-
> .../Bus/Pci/PciHostBridgeDxe/PciHostBridge.c | 73 +----
> .../Bus/Pci/PciHostBridgeDxe/PciHostBridge.h | 36 +--
> .../Pci/PciHostBridgeDxe/PciHostBridge.uni | Bin 2558 -> 1290 bytes
> .../Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf | 20 +-
> .../PciHostBridgeDxe/PciHostBridgeExtra.uni | Bin 1914 -> 826 bytes
> .../Pci/PciHostBridgeDxe/PciRootBridgeIo.c | 269 +-----------------
> .../CapsuleRuntimeDxe/CapsuleService.c | 15 +-
> .../CapsuleRuntimeDxe/CapsuleService.h | 15 +-
> .../edk2/MdeModulePkg/Universal/PCD/Dxe/Pcd.c | 13 +-
> .../edk2/MdeModulePkg/Universal/PCD/Pei/Pcd.c | 21 +-
> .../Register/Intel/SmramSaveStateMap.h | 15 +-
> .../PcatRealTimeClockRuntimeDxe/PcRtc.c | 21 +-
> .../PcatRealTimeClockRuntimeDxe/PcRtc.h | 23 +-
> .../PcatRealTimeClockRuntimeDxe/PcRtc.uni | 22 +-
> .../PcatRealTimeClockRuntimeDxe/PcRtcEntry.c | 19 +-
> .../PcRtcExtra.uni | 17 +-
> .../PcatRealTimeClockRuntimeDxe.inf | 20 +-
> .../DxeTpm2DeviceLibFsp/Tpm2DeviceLibFtpm.c | 23 +-
> .../DxeTpm2DeviceLibFsp/Tpm2DeviceLibFtpm.inf | 18 +-
> .../PeiTpm2DeviceLibFsp/Tpm2DeviceLibFtpm.c | 23 +-
> .../PeiTpm2DeviceLibFsp/Tpm2DeviceLibFtpm.inf | 19 +-
> .../AmdFtpm/Tpm2DeviceLib/Tpm2DeviceLibFtpm.c | 21 +-
> .../Tpm2DeviceLib/Tpm2DeviceLibFtpm.inf | 19 +-
> .../DxeTcg2PhysicalPresenceLib.c | 69 ++---
> .../DxeTcg2PhysicalPresenceLib.inf | 18 +-
> .../DxeTcg2PhysicalPresenceLib.uni | 20 +-
> .../PhysicalPresenceStrings.uni | 19 +-
> .../Tcg/AmdFtpm/FtpmTcg2Smm/Tcg2Smm.c | 39 +--
> .../Tcg/AmdFtpm/FtpmTcg2Smm/Tcg2Smm.h | 23 +-
> .../Tcg/AmdFtpm/FtpmTcg2Smm/Tcg2Smm.inf | 18 +-
> .../Tcg/AmdFtpm/FtpmTcg2Smm/Tcg2SmmExtra.uni | 19 +-
> .../Tcg/Tcg2Config/Tcg2ConfigNvData.h | 25 +-
> .../Tcg/Tcg2Config/Tcg2ConfigPei.inf | 18 +-
> .../Tcg/Tcg2Config/Tcg2ConfigPei.uni | 24 +-
> .../Tcg/Tcg2Config/Tcg2ConfigPeiExtra.uni | 19 +-
> .../Tcg/Tcg2Config/Tcg2ConfigPeim.c | 25 +-
> .../SecurityPkg/Tcg/Tcg2Config/TpmDetection.c | 28 +-
> .../SystemFirmwareCommonDxe.c | 19 +-
> .../SystemFirmwareUpdate/SystemFirmwareDxe.h | 22 +-
> .../SystemFirmwareUpdateDxe.c | 26 +-
> .../SystemFirmwareUpdateDxe.uni | 20 +-
> .../SystemFirmwareUpdateDxeExtra.uni | 17 +-
> .../SmmCpuFeaturesLibCommon.c | 14 +-
> .../PiSmmCpuDxeSmm/SmramSaveState.c | 11 +-
> .../ResetVector/Vtf0/CommonMacros.inc | 9 +-
> .../ResetVector/Vtf0/DebugDisabled.asm | 9 +-
> .../ResetVector/Vtf0/Ia16/Init16.asm | 9 +-
> .../ResetVector/Vtf0/Ia16/Real16ToFlat32.asm | 9 +-
> .../ResetVector/Vtf0/Ia16/ResetVectorVtf0.asm | 9 +-
> .../ResetVector/Vtf0/Ia32/Flat32ToFlat64.asm | 9 +-
> .../ResetVector/Vtf0/Ia32/PageTables64.asm | 9 +-
> .../Vtf0/Ia32/SearchForBfvBase.asm | 9 +-
> .../Vtf0/Ia32/SearchForSecEntry.asm | 9 +-
> .../edk2/UefiCpuPkg/ResetVector/Vtf0/Main.asm | 9 +-
> .../ResetVector/Vtf0/Port80Debug.asm | 9 +-
> .../UefiCpuPkg/ResetVector/Vtf0/PostCodes.inc | 9 +-
> .../ResetVector/Vtf0/ResetVector.uni | Bin 1158 -> 780 bytes
> .../ResetVector/Vtf0/ResetVectorExtra.uni | Bin 1080 -> 682 bytes
> .../ResetVector/Vtf0/SerialDebug.asm | 9 +-
> .../edk2/UefiCpuPkg/ResetVector/Vtf0/Vtf0.inf | 16 +-
> .../UefiCpuPkg/ResetVector/Vtf0/Vtf0.nasmb | 9 +-
> .../ResetVector/Vtf0/X64/PageTables.asm | 9 +-
> Platform/AMD/VanGoghBoard/Readme.md | 67 +++++
> Platform/AMD/VanGoghBoard/ReleaseNote.txt | 14 +
> .../Universal/AcpiPlatformDxe/AcpiPlatform.c | 9 +-
> .../AcpiPlatformDxe/AcpiPlatform.uni | 11 +-
> .../AcpiPlatformDxe/AcpiPlatformDxe.inf | 8 +-
> .../AcpiPlatformDxe/AcpiPlatformExtra.uni | 11 +-
> .../AcpiPlatformDxe/AcpiPlatformHooks.c | 9 +-
> .../AcpiPlatformDxe/AcpiPlatformHooks.h | 13 +-
> .../Universal/FchSpi/FchSpiProtect.h | 4 +-
> .../Universal/FchSpi/FchSpiRuntimeDxe.c | 11 +-
> .../Universal/FchSpi/FchSpiRuntimeDxe.h | 15 +-
> .../Universal/FchSpi/FchSpiRuntimeDxe.inf | 9 +-
> .../VanGoghBoard/Universal/FchSpi/FchSpiSmm.c | 11 +-
> .../VanGoghBoard/Universal/FchSpi/FchSpiSmm.h | 15 +-
> .../Universal/FchSpi/FchSpiSmm.inf | 9 +-
> .../VanGoghBoard/Universal/FchSpi/SpiCommon.c | 11 +-
> .../VanGoghBoard/Universal/FchSpi/SpiInfo.h | 6 +-
> .../Universal/PlatformInitPei/BootMode.c | 27 +-
> .../Universal/PlatformInitPei/CommonHeader.h | 24 +-
> .../PlatformInitPei/MemoryCallback.c | 47 ++-
> .../Universal/PlatformInitPei/MemoryInstall.c | 125 ++++----
> .../Universal/PlatformInitPei/MemoryInstall.h | 23 +-
> .../Universal/PlatformInitPei/MemoryPeim.c | 51 +---
> .../Universal/PlatformInitPei/PlatformInit.c | 29 +-
> .../PlatformInitPei/PlatformInit.inf | 16 +-
> .../Universal/PlatformInitPei/Stall.c | 37 +--
> .../PlatformSmbiosDxe/PlatformSmbiosDxe.c | 10 +-
> .../PlatformSmbiosDxe/PlatformSmbiosDxe.inf | 9 +-
> .../Universal/PlatformSmbiosDxe/SmbiosTable.c | 13 +-
> .../UDKFlashUpdate/SpiFlashDevice.h | 4 +-
> .../UDKFlashUpdate/UDKFlashUpdate.c | 10 +-
> .../UDKFlashUpdate/UDKFlashUpdate.h | 4 +-
> .../FlashUpdate/FlashUpdateCommon.h | 4 +-
> .../FlashUpdate/FlashUpdateSmm.h | 4 +-
> .../VanGoghCommonPkg/FlashUpdate/PcRtc.h | 23 +-
> .../VanGoghCommonPkg/FvbServices/FvbInfo.c | 12 +-
> .../FvbServices/FwBlockService.c | 38 +--
> .../FvbServices/FwBlockService.h | 17 +-
> .../FvbServices/PlatformSmmSpi.inf | 13 +-
> .../Include/Library/SmbiosLib.h | 18 +-
> .../Include/Library/SpiFlashDeviceLib.h | 4 +-
> .../Include/OtaCapsuleUpdate.h | 4 +-
> .../VanGoghCommonPkg/Include/Protocol/Spi.h | 25 +-
> .../Include/Protocol/SpiCommon.h | 22 +-
> .../Include/Protocol/SpiFlashUpdate.h | 4 +-
> .../BaseSerialPortLib16550AmdFchUart.c | 14 +-
> .../BaseSerialPortLib16550AmdFchUart.inf | 11 +-
> .../PlatformFlashAccessLib.c | 17 +-
> .../Library/SmbiosLib/SmbiosLib.c | 12 +-
> .../Library/SmbiosLib/SmbiosLib.inf | 12 +-
> .../Library/TscTimerLib/BaseTscTimerLib.c | 11 +-
> .../Library/TscTimerLib/BaseTscTimerLib.inf | 18 +-
> .../Library/TscTimerLib/DxeTscTimerLib.c | 11 +-
> .../Library/TscTimerLib/PeiTscTimerLib.c | 11 +-
> .../Library/TscTimerLib/TscTimerLibInternal.h | 17 +-
> .../Library/TscTimerLib/TscTimerLibShare.c | 11 +-
> .../Smm/AcpiSmm/AcpiSmmPlatform.c | 15 +-
> .../Smm/AcpiSmm/AcpiSmmPlatform.h | 18 +-
> .../Smm/AcpiSmm/AcpiSmmPlatform.inf | 10 +-
> .../Smm/SmmAccessPei/SmmAccessPei.c | 15 +-
> .../Smm/SmmAccessPei/SmmAccessPei.inf | 12 +-
> 198 files changed, 813 insertions(+), 2894 deletions(-)
> create mode 100644 Platform/AMD/VanGoghBoard/Readme.md
> create mode 100644 Platform/AMD/VanGoghBoard/ReleaseNote.txt
>
> diff --git a/Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/Logo.c
> b/Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/Logo.c
> index 8e3d89380b..4463ba58eb 100644
> --- a/Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/Logo.c
> +++ b/Platform/AMD/AmdPlatformPkg/Universal/LogoDxe/Logo.c
> @@ -98,7 +98,7 @@ LogoDxeDisplayEventCallback (
> IN VOID *Context
> )
> {
> - DEBUG((DEBUG_INFO, "AMD logo is displaying.\n"));
> + DEBUG ((DEBUG_INFO, "AMD logo is displaying.\n"));
>
> BootLogoEnableLogo ();
> gBS->CloseEvent (Event);
> diff --git a/Platform/AMD/VanGoghBoard/AgesaPublic/Include/AGESA.h
> b/Platform/AMD/VanGoghBoard/AgesaPublic/Include/AGESA.h
> index de088b21c4..f36378dae1 100644
> --- a/Platform/AMD/VanGoghBoard/AgesaPublic/Include/AGESA.h
> +++ b/Platform/AMD/VanGoghBoard/AgesaPublic/Include/AGESA.h
> @@ -5,8 +5,8 @@
>
> **/
>
> -#ifndef _AGESA_H_
> -#define _AGESA_H_
> +#ifndef AGESA_H__
> +#define AGESA_H__
>
> #include "AMD.h"
>
> diff --git a/Platform/AMD/VanGoghBoard/AgesaPublic/Include/AMD.h
> b/Platform/AMD/VanGoghBoard/AgesaPublic/Include/AMD.h
> index 7f3727bd4b..7163448844 100644
> --- a/Platform/AMD/VanGoghBoard/AgesaPublic/Include/AMD.h
> +++ b/Platform/AMD/VanGoghBoard/AgesaPublic/Include/AMD.h
> @@ -5,8 +5,8 @@
>
> **/
>
> -#ifndef _AMD_H_
> -#define _AMD_H_
> +#ifndef AMD_H__
> +#define AMD_H__
>
> /// The return status for all AGESA public services.
> ///
> diff --git
> a/Platform/AMD/VanGoghBoard/AgesaPublic/Include/AmdPspDirectory.h
> b/Platform/AMD/VanGoghBoard/AgesaPublic/Include/AmdPspDirectory.h
> index 06d4673be8..40ccd5e12a 100644
> ---
> a/Platform/AMD/VanGoghBoard/AgesaPublic/Include/AmdPspDirectory.h
> +++
> b/Platform/AMD/VanGoghBoard/AgesaPublic/Include/AmdPspDirectory.h
> @@ -5,8 +5,8 @@
>
> **/
>
> -#ifndef _AMD_PSP_DIR_H_
> -#define _AMD_PSP_DIR_H_
> +#ifndef AMD_PSP_DIR_H__
> +#define AMD_PSP_DIR_H__
>
> #pragma pack (push, 1)
> #define PSP_DIRECTORY_HEADER_SIGNATURE 0x50535024ul ///< $PSP
> diff --git
> a/Platform/AMD/VanGoghBoard/AgesaPublic/Include/FchRegistersCommon
> .h
> b/Platform/AMD/VanGoghBoard/AgesaPublic/Include/FchRegistersCommon
> .h
> index 6079fcab75..a69a4791cd 100644
> ---
> a/Platform/AMD/VanGoghBoard/AgesaPublic/Include/FchRegistersCommon
> .h
> +++
> b/Platform/AMD/VanGoghBoard/AgesaPublic/Include/FchRegistersCommon
> .h
> @@ -5,19 +5,19 @@
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> -#define R_FCH_ACPI_PM1_STATUS 0x00
> -#define R_FCH_ACPI_PM1_ENABLE 0x02
> -#define R_FCH_ACPI_PM_CONTROL 0x04
> -#define ACPI_MMIO_BASE 0xFED80000ul
> -#define SMI_BASE 0x200 // DWORD
> -#define PMIO_BASE 0x300 // DWORD
> -#define FCH_SMI_REG80 0x80 // SmiStatus0
> -#define FCH_SMI_REG84 0x84 // SmiStatus1
> -#define FCH_SMI_REG88 0x88 // SmiStatus2
> -#define FCH_SMI_REG8C 0x8C // SmiStatus3
> -#define FCH_SMI_REG90 0x90 // SmiStatus4
> -#define FCH_SMI_REG98 0x98 // SmiTrig
> -#define FCH_SMI_REGA0 0xA0
> -#define FCH_SMI_REGB0 0xB0
> -#define FCH_SMI_REGC4 0xC4
> -#define FCH_PMIOA_REG60 0x60 // AcpiPm1EvtBlk
> \ No newline at end of file
> +#define R_FCH_ACPI_PM1_STATUS 0x00
> +#define R_FCH_ACPI_PM1_ENABLE 0x02
> +#define R_FCH_ACPI_PM_CONTROL 0x04
> +#define ACPI_MMIO_BASE 0xFED80000ul
> +#define SMI_BASE 0x200 // DWORD
> +#define PMIO_BASE 0x300 // DWORD
> +#define FCH_SMI_REG80 0x80 // SmiStatus0
> +#define FCH_SMI_REG84 0x84 // SmiStatus1
> +#define FCH_SMI_REG88 0x88 // SmiStatus2
> +#define FCH_SMI_REG8C 0x8C // SmiStatus3
> +#define FCH_SMI_REG90 0x90 // SmiStatus4
> +#define FCH_SMI_REG98 0x98 // SmiTrig
> +#define FCH_SMI_REGA0 0xA0
> +#define FCH_SMI_REGB0 0xB0
> +#define FCH_SMI_REGC4 0xC4
> +#define FCH_PMIOA_REG60 0x60 // AcpiPm1EvtBlk
> diff --git
> a/Platform/AMD/VanGoghBoard/AgesaPublic/Include/Guid/AmdMemoryInf
> oHob.h
> b/Platform/AMD/VanGoghBoard/AgesaPublic/Include/Guid/AmdMemoryInf
> oHob.h
> index 4815dc4d6e..aa94ed373c 100644
> ---
> a/Platform/AMD/VanGoghBoard/AgesaPublic/Include/Guid/AmdMemoryInf
> oHob.h
> +++
> b/Platform/AMD/VanGoghBoard/AgesaPublic/Include/Guid/AmdMemoryInf
> oHob.h
> @@ -5,8 +5,8 @@
>
> **/
>
> -#ifndef _AMD_MEMORY_INFO_HOB_H_
> -#define _AMD_MEMORY_INFO_HOB_H_
> +#ifndef AMD_MEMORY_INFO_HOB_H__
> +#define AMD_MEMORY_INFO_HOB_H__
>
> extern EFI_GUID gAmdMemoryInfoHobGuid;
>
> diff --git
> a/Platform/AMD/VanGoghBoard/AgesaPublic/Include/Library/AmdPspBaseL
> ibV2.h
> b/Platform/AMD/VanGoghBoard/AgesaPublic/Include/Library/AmdPspBaseL
> ibV2.h
> index 198df537c1..f595d57366 100644
> ---
> a/Platform/AMD/VanGoghBoard/AgesaPublic/Include/Library/AmdPspBaseL
> ibV2.h
> +++
> b/Platform/AMD/VanGoghBoard/AgesaPublic/Include/Library/AmdPspBaseL
> ibV2.h
> @@ -5,8 +5,8 @@
>
> **/
>
> -#ifndef _AMD_PSP_BASELIB_V2_H_
> -#define _AMD_PSP_BASELIB_V2_H_
> +#ifndef AMD_PSP_BASELIB_V2_H__
> +#define AMD_PSP_BASELIB_V2_H__
>
> #include <AMD.h>
> #include <AmdPspDirectory.h>
> diff --git
> a/Platform/AMD/VanGoghBoard/AgesaPublic/Include/Library/AmdPspCom
> monLib.h
> b/Platform/AMD/VanGoghBoard/AgesaPublic/Include/Library/AmdPspCom
> monLib.h
> index eb0f09dd58..73838b5934 100644
> ---
> a/Platform/AMD/VanGoghBoard/AgesaPublic/Include/Library/AmdPspCom
> monLib.h
> +++
> b/Platform/AMD/VanGoghBoard/AgesaPublic/Include/Library/AmdPspCom
> monLib.h
> @@ -5,8 +5,8 @@
>
> **/
>
> -#ifndef _AMD_PSPCOMMONLIB_H_
> -#define _AMD_PSPCOMMONLIB_H_
> +#ifndef AMD_PSPCOMMONLIB_H__
> +#define AMD_PSPCOMMONLIB_H__
>
> #include <AmdPspDirectory.h>
>
> diff --git
> a/Platform/AMD/VanGoghBoard/AgesaPublic/Include/Library/AmdPspFtpm
> Lib.h
> b/Platform/AMD/VanGoghBoard/AgesaPublic/Include/Library/AmdPspFtpm
> Lib.h
> index 2bd4dcefaa..51c2652614 100644
> ---
> a/Platform/AMD/VanGoghBoard/AgesaPublic/Include/Library/AmdPspFtpm
> Lib.h
> +++
> b/Platform/AMD/VanGoghBoard/AgesaPublic/Include/Library/AmdPspFtpm
> Lib.h
> @@ -5,8 +5,8 @@
>
> **/
>
> -#ifndef _PSP_FTPM_LIB_H_
> -#define _PSP_FTPM_LIB_H_
> +#ifndef PSP_FTPM_LIB_H__
> +#define PSP_FTPM_LIB_H__
> #include <IndustryStandard/Acpi30.h>
>
> #define PSP_DEBUG_ENABLE 0
> diff --git
> a/Platform/AMD/VanGoghBoard/AgesaPublic/Include/Ppi/AmdPspFtpmPpi.
> h
> b/Platform/AMD/VanGoghBoard/AgesaPublic/Include/Ppi/AmdPspFtpmPpi.
> h
> index 5fe59719fb..662aaf9736 100644
> ---
> a/Platform/AMD/VanGoghBoard/AgesaPublic/Include/Ppi/AmdPspFtpmPpi.
> h
> +++
> b/Platform/AMD/VanGoghBoard/AgesaPublic/Include/Ppi/AmdPspFtpmPpi.
> h
> @@ -5,8 +5,8 @@
>
> **/
>
> -#ifndef _PSP_FTPM_PPI_H_
> -#define _PSP_FTPM_PPI_H_
> +#ifndef PSP_FTPM_PPI_H__
> +#define PSP_FTPM_PPI_H__
> #include <Uefi.h>
> typedef struct _PSP_FTPM_PPI PSP_FTPM_PPI;
>
> diff --git
> a/Platform/AMD/VanGoghBoard/AgesaPublic/Include/Protocol/AmdPspFtp
> mProtocol.h
> b/Platform/AMD/VanGoghBoard/AgesaPublic/Include/Protocol/AmdPspFtp
> mProtocol.h
> index 532f6ff157..b6463512b6 100644
> ---
> a/Platform/AMD/VanGoghBoard/AgesaPublic/Include/Protocol/AmdPspFtp
> mProtocol.h
> +++
> b/Platform/AMD/VanGoghBoard/AgesaPublic/Include/Protocol/AmdPspFtp
> mProtocol.h
> @@ -5,8 +5,8 @@
>
> **/
>
> -#ifndef _FTPM_PROTOCOL_H_
> -#define _FTPM_PROTOCOL_H_
> +#ifndef FTPM_PROTOCOL_H__
> +#define FTPM_PROTOCOL_H__
>
> #include <Uefi.h>
> //
> diff --git
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Acpi/AcpiTables/Facs/F
> acs.h
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Acpi/AcpiTables/Facs/F
> acs.h
> index daf97dd581..3b6140f754 100644
> ---
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Acpi/AcpiTables/Facs/F
> acs.h
> +++
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Acpi/AcpiTables/Facs/F
> acs.h
> @@ -1,30 +1,16 @@
> /** @file
> Implements Facs.h
> + This file describes the contents of the ACPI Firmware ACPI Control
> Structure (FACS)
> + . Some additional ACPI values are defined in Acpi10.h, Acpi20.h, and
> Acpi30.h
> + All changes to the FACS contents should be done in this file.
>
> Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> + Copyright (c) 2013-2015 Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
> **/
> -/* This file includes code originally published under the following license. */
>
> -/** @file
> -This file describes the contents of the ACPI Firmware ACPI Control Structure
> (FACS)
> -. Some additional ACPI values are defined in Acpi10.h, Acpi20.h, and
> Acpi30.h
> -All changes to the FACS contents should be done in this file.
> -
> -Copyright (c) 2013-2015 Intel Corporation.
> -
> -This program and the accompanying materials
> -are licensed and made available under the terms and conditions of the BSD
> License
> -which 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.
> -
> -**/
> -
> -#ifndef _FACS_H_
> -#define _FACS_H_
> +#ifndef FACS_H__
> +#define FACS_H__
>
> //
> // Statements that include other files
> @@ -34,12 +20,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF
> ANY KIND, EITHER EXPRESS OR IMPLIED.
> //
> // FACS Definitions
> //
> -#define EFI_ACPI_FIRMWARE_WAKING_VECTOR 0x00000000
> -#define EFI_ACPI_GLOBAL_LOCK 0x00000000
> +#define EFI_ACPI_FIRMWARE_WAKING_VECTOR 0x00000000
> +#define EFI_ACPI_GLOBAL_LOCK 0x00000000
>
> -#define EFI_ACPI_FIRMWARE_CONTROL_STRUCTURE_FLAGS 0x00000000
> -#define EFI_ACPI_X_FIRMWARE_WAKING_VECTOR 0x0000000000000000
> +#define EFI_ACPI_FIRMWARE_CONTROL_STRUCTURE_FLAGS 0x00000000
> +#define EFI_ACPI_X_FIRMWARE_WAKING_VECTOR
> 0x0000000000000000
>
> -#define EFI_ACPI_OSPM_FLAGS 0x00000000
> +#define EFI_ACPI_OSPM_FLAGS 0x00000000
>
> #endif
> diff --git
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Acpi/AcpiTables/Fadt/F
> adt.h
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Acpi/AcpiTables/Fadt/F
> adt.h
> index 968a4b0fa5..5d6c25bcf5 100644
> ---
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Acpi/AcpiTables/Fadt/F
> adt.h
> +++
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Acpi/AcpiTables/Fadt/F
> adt.h
> @@ -5,8 +5,8 @@
> SPDX-License-Identifier: BSD-2-Clause-Patent
> **/
>
> -#ifndef _FADT_H_
> -#define _FADT_H_
> +#ifndef FADT_H__
> +#define FADT_H__
>
> //
> // Statements that include other files
> @@ -16,35 +16,35 @@
> //
> // ACPI table information used to initialize tables.
> //
> -#define EFI_ACPI_OEM_ID 'A','M','D',' ',' ',' ' // OEMID 6 bytes long
> -#define EFI_ACPI_OEM_TABLE_ID SIGNATURE_64('E','D','K','2',' ',' ',' ',' ') //
> OEM table id 8 bytes long
> -#define EFI_ACPI_OEM_REVISION 0x00000002
> -#define EFI_ACPI_CREATOR_ID SIGNATURE_32(' ',' ',' ',' ')
> -#define EFI_ACPI_CREATOR_REVISION 0x01000013
> +#define EFI_ACPI_OEM_ID 'A','M','D',' ',' ',' ' // OEMID 6
> bytes long
> +#define EFI_ACPI_OEM_TABLE_ID SIGNATURE_64('E','D','K','2',' ',' ',' ',' ')
> // OEM table id 8 bytes long
> +#define EFI_ACPI_OEM_REVISION 0x00000002
> +#define EFI_ACPI_CREATOR_ID SIGNATURE_32(' ',' ',' ',' ')
> +#define EFI_ACPI_CREATOR_REVISION 0x01000013
>
> //
> // FADT Definitions
> //
> -#define SCI_INT_VECTOR 0x0009
> -#define SMI_CMD_IO_PORT 0x000000B0 // SMI Port 0xB0
> -#define ACPI_ENABLE 0x0A0
> -#define ACPI_DISABLE 0x0A1
> +#define SCI_INT_VECTOR 0x0009
> +#define SMI_CMD_IO_PORT 0x000000B0 // SMI Port 0xB0
> +#define ACPI_ENABLE 0x0A0
> +#define ACPI_DISABLE 0x0A1
>
> -#define PM1a_EVT_BLK 0x00000400
> -#define PM1b_EVT_BLK 0x00000000
> -#define PM1a_CNT_BLK 0x00000404
> -#define PM1b_CNT_BLK 0x00000000
> -#define PM2_CNT_BLK 0x00000800
> -#define PM_TMR_BLK 0x00000408
> -#define GPE0_BLK 0x00000420
> -#define GPE1_BLK 0x00000000
> -#define PM1_EVT_LEN 0x04
> -#define PM1_CNT_LEN 0x02
> -#define PM2_CNT_LEN 0x01
> -#define PM_TM_LEN 0x04
> -#define GPE0_BLK_LEN 0x08
> -#define GPE1_BLK_LEN 0x00
> -#define GPE1_BASE 0x00
> +#define PM1a_EVT_BLK 0x00000400
> +#define PM1b_EVT_BLK 0x00000000
> +#define PM1a_CNT_BLK 0x00000404
> +#define PM1b_CNT_BLK 0x00000000
> +#define PM2_CNT_BLK 0x00000800
> +#define PM_TMR_BLK 0x00000408
> +#define GPE0_BLK 0x00000420
> +#define GPE1_BLK 0x00000000
> +#define PM1_EVT_LEN 0x04
> +#define PM1_CNT_LEN 0x02
> +#define PM2_CNT_LEN 0x01
> +#define PM_TM_LEN 0x04
> +#define GPE0_BLK_LEN 0x08
> +#define GPE1_BLK_LEN 0x00
> +#define GPE1_BASE 0x00
>
> #define RESERVED 0x00
> #define P_LVL2_LAT 0x0064
> @@ -57,9 +57,8 @@
> #define MON_ALRM 0x00
> #define CENTURY 0x00
> #define IAPC_BOOT_ARCH EFI_ACPI_2_0_LEGACY_DEVICES
> -//#define FLAG (EFI_ACPI_1_0_WBINVD | EFI_ACPI_1_0_PROC_C1 |
> EFI_ACPI_1_0_SLP_BUTTON | EFI_ACPI_1_0_RTC_S4)
> -#define FLAG 0x0000C5AD
> -#define FLAG2 (EFI_ACPI_2_0_WBINVD | EFI_ACPI_2_0_PROC_C1 |
> EFI_ACPI_2_0_PWR_BUTTON | EFI_ACPI_2_0_SLP_BUTTON |
> EFI_ACPI_2_0_RTC_S4 | EFI_ACPI_2_0_RESET_REG_SUP |
> EFI_ACPI_3_0_USE_PLATFORM_CLOCK)
> -
> +// #define FLAG (EFI_ACPI_1_0_WBINVD | EFI_ACPI_1_0_PROC_C1 |
> EFI_ACPI_1_0_SLP_BUTTON | EFI_ACPI_1_0_RTC_S4)
> +#define FLAG 0x0000C5AD
> +#define FLAG2 (EFI_ACPI_2_0_WBINVD | EFI_ACPI_2_0_PROC_C1 |
> EFI_ACPI_2_0_PWR_BUTTON | EFI_ACPI_2_0_SLP_BUTTON |
> EFI_ACPI_2_0_RTC_S4 | EFI_ACPI_2_0_RESET_REG_SUP |
> EFI_ACPI_3_0_USE_PLATFORM_CLOCK)
>
> #endif
> diff --git
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Acpi/AcpiTables/Hpet/
> Hpet.h
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Acpi/AcpiTables/Hpet/
> Hpet.h
> index e28a473f39..e3379bf40a 100644
> ---
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Acpi/AcpiTables/Hpet/
> Hpet.h
> +++
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Acpi/AcpiTables/Hpet/
> Hpet.h
> @@ -5,8 +5,8 @@
> SPDX-License-Identifier: BSD-2-Clause-Patent
> **/
>
> -#ifndef _HPET_H_
> -#define _HPET_H_
> +#ifndef HPET_H__
> +#define HPET_H__
>
> //
> // Statements that include other files
> @@ -16,12 +16,11 @@
> //
> // ACPI table information used to initialize tables.
> //
> -#define EFI_ACPI_OEM_ID 'A','M','D',' ',' ',' ' // OEMID 6 bytes long
> -#define EFI_ACPI_OEM_TABLE_ID SIGNATURE_64('E','D','K','2',' ',' ',' ',' ') //
> OEM table id 8 bytes long
> -#define EFI_ACPI_OEM_REVISION 0x00000002
> -#define EFI_ACPI_CREATOR_ID SIGNATURE_32(' ',' ',' ',' ')
> -#define EFI_ACPI_CREATOR_REVISION 0x01000013
> -
> +#define EFI_ACPI_OEM_ID 'A','M','D',' ',' ',' ' // OEMID 6
> bytes long
> +#define EFI_ACPI_OEM_TABLE_ID SIGNATURE_64('E','D','K','2',' ',' ',' ',' ')
> // OEM table id 8 bytes long
> +#define EFI_ACPI_OEM_REVISION 0x00000002
> +#define EFI_ACPI_CREATOR_ID SIGNATURE_32(' ',' ',' ',' ')
> +#define EFI_ACPI_CREATOR_REVISION 0x01000013
>
> //
> // HPET structure
> @@ -29,12 +28,12 @@
> #define EFI_ACPI_5_0_HIGH_PRECISION_EVENT_TIMER_TABLE_REVISION
> 0x00
>
> #define EFI_ACPI_5_0_HPET_EVENT_TIMER_BLOCK_ID 0x10228201
> - // [31:16] 0x1022 - PCI Vendor ID of 1st Timer
> Block
> - // [15] 0x01 - Legacy Replacement IRQ Routing
> Capable
> - // [14] 0x00 - Reserved
> - // [13] 0x00 - COUNT_SIZE_CAP counter size
> - // [12:08] 0x02 - Number of Comparators in 1st
> Timer Block
> - // [07:00] 0x01 - Hardware Rev ID
> +// [31:16] 0x1022 - PCI Vendor ID of 1st Timer Block
> +// [15] 0x01 - Legacy Replacement IRQ Routing Capable
> +// [14] 0x00 - Reserved
> +// [13] 0x00 - COUNT_SIZE_CAP counter size
> +// [12:08] 0x02 - Number of Comparators in 1st Timer Block
> +// [07:00] 0x01 - Hardware Rev ID
> #define EFI_ACPI_5_0_HPET_BASE_ADDRESS_SPACE_ID 0x00
> #define EFI_ACPI_5_0_HPET_BASE_ADDRESS_REGISTER_BIT_WIDTH 0x00
> #define EFI_ACPI_5_0_HPET_BASE_ADDRESS_REGISTER_BIT_OFFSET 0x00
> @@ -52,18 +51,18 @@
> //
> typedef struct {
> // ACPI Common header
> - EFI_ACPI_DESCRIPTION_HEADER Header;
> + EFI_ACPI_DESCRIPTION_HEADER Header;
> // HPET
> - UINT32 EventTimerBlockID; // Offset 0x24
> - UINT8 BaseAddress_SpaceID;
> - UINT8 BaseAddress_RegisterBitWidth;
> - UINT8 BaseAddress_RegisterBitOffset;
> - UINT8 Reserved0[1];
> - UINT32 BaseAddressLower32bit; // Offset 0x28
> - UINT32 Reserved1[1];
> - UINT8 HpetNumber; // Offset 0x34
> - UINT16 MinClockTick; // Offset 0x35
> - UINT8 PageProtectionAndOemAttribute;// Offset 0x37
> + UINT32 EventTimerBlockID; // Offset 0x24
> + UINT8 BaseAddress_SpaceID;
> + UINT8 BaseAddress_RegisterBitWidth;
> + UINT8 BaseAddress_RegisterBitOffset;
> + UINT8 Reserved0[1];
> + UINT32 BaseAddressLower32bit; // Offset 0x28
> + UINT32 Reserved1[1];
> + UINT8 HpetNumber; // Offset 0x34
> + UINT16 MinClockTick; // Offset 0x35
> + UINT8 PageProtectionAndOemAttribute; // Offset 0x37
> } EFI_ACPI_5_0_HIGH_PRECISION_EVENT_TIMER_TABLE;
>
> #pragma pack ()
> diff --git
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Acpi/AcpiTables/Madt/
> Madt.h
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Acpi/AcpiTables/Madt/
> Madt.h
> index cd3e965142..0809e46dd8 100644
> ---
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Acpi/AcpiTables/Madt/
> Madt.h
> +++
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Acpi/AcpiTables/Madt/
> Madt.h
> @@ -1,85 +1,62 @@
> /** @file
> Implements Madt.h
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -**/
> -/* This file includes code originally published under the following license. */
> -
> -/*++
> -
> -Copyright (c) 2004 - 2014, 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.
> -
> - 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:
> -
> - Madt.h
> -
> -Abstract:
> -
> This file describes the contents of the ACPI Multiple APIC Description
> Table (MADT). Some additional ACPI values are defined in Acpi1_0.h and
> Acpi2_0.h.
> To make changes to the MADT, it is necessary to update the count for the
> APIC structure being updated, and to modify table found in Madt.c.
>
> ---*/
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> + Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
> + SPDX-License-Identifier: BSD-2-Clause-Patent
> +**/
>
> -#ifndef _MADT_H_
> -#define _MADT_H_
> +#ifndef MADT_H__
> +#define MADT_H__
>
> //
> // Statements that include other files
> //
> #include <IndustryStandard/Acpi.h>
> -//#include <AcpiHeaderDefaultValue.h>
> +// #include <AcpiHeaderDefaultValue.h>
> //
> // ACPI table information used to initialize tables.
> //
> -#define EFI_ACPI_OEM_ID 'A','M','D',' ',' ',' ' // OEMID 6 bytes long
> -#define EFI_ACPI_OEM_TABLE_ID SIGNATURE_64('E','D','K','2',' ',' ',' ',' ') //
> OEM table id 8 bytes long
> -#define EFI_ACPI_OEM_REVISION 0x00000002
> -#define EFI_ACPI_CREATOR_ID SIGNATURE_32(' ',' ',' ',' ')
> -#define EFI_ACPI_CREATOR_REVISION 0x01000013
> +#define EFI_ACPI_OEM_ID 'A','M','D',' ',' ',' ' // OEMID 6
> bytes long
> +#define EFI_ACPI_OEM_TABLE_ID SIGNATURE_64('E','D','K','2',' ',' ',' ',' ')
> // OEM table id 8 bytes long
> +#define EFI_ACPI_OEM_REVISION 0x00000002
> +#define EFI_ACPI_CREATOR_ID SIGNATURE_32(' ',' ',' ',' ')
> +#define EFI_ACPI_CREATOR_REVISION 0x01000013
>
> //
> // Local APIC address
> //
> -#define EFI_ACPI_LOCAL_APIC_ADDRESS 0xFEE00000
> -//#define EFI_IO_APIC_ADDRESS 0xFEC00000
> +#define EFI_ACPI_LOCAL_APIC_ADDRESS 0xFEE00000
> +// #define EFI_IO_APIC_ADDRESS 0xFEC00000
>
> //
> // Multiple APIC Flags are defined in AcpiX.0.h
> //
> -#define EFI_ACPI_5_0_MULTIPLE_APIC_FLAGS
> (EFI_ACPI_5_0_PCAT_COMPAT)
> +#define EFI_ACPI_5_0_MULTIPLE_APIC_FLAGS
> (EFI_ACPI_5_0_PCAT_COMPAT)
>
> //
> // Define the number of each table type.
> // This is where the table layout is modified.
> //
>
> +#define EFI_ACPI_PROCESSOR_LOCAL_APIC_COUNT 16
>
> -#define EFI_ACPI_PROCESSOR_LOCAL_APIC_COUNT 16
> -
> -#define EFI_ACPI_IO_APIC_COUNT 2
> +#define EFI_ACPI_IO_APIC_COUNT 2
>
> #define EFI_ACPI_INTERRUPT_SOURCE_OVERRIDE_COUNT 2
> #define EFI_ACPI_NON_MASKABLE_INTERRUPT_SOURCE_COUNT 0
>
> -#define EFI_ACPI_LOCAL_APIC_NMI_COUNT 16
> +#define EFI_ACPI_LOCAL_APIC_NMI_COUNT 16
>
> -#define EFI_ACPI_LOCAL_APIC_ADDRESS_OVERRIDE_COUNT 0
> -#define EFI_ACPI_IO_SAPIC_COUNT 0
> -#define EFI_ACPI_PROCESSOR_LOCAL_SAPIC_COUNT 0
> -#define EFI_ACPI_PLATFORM_INTERRUPT_SOURCES_COUNT 0
> +#define EFI_ACPI_LOCAL_APIC_ADDRESS_OVERRIDE_COUNT 0
> +#define EFI_ACPI_IO_SAPIC_COUNT 0
> +#define EFI_ACPI_PROCESSOR_LOCAL_SAPIC_COUNT 0
> +#define EFI_ACPI_PLATFORM_INTERRUPT_SOURCES_COUNT 0
>
> //
> // MADT structure
> @@ -93,44 +70,43 @@ Abstract:
> // ACPI 5.0 Table structure
> //
> typedef struct {
> - EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER Header;
> + EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER Header;
>
> -#if EFI_ACPI_PROCESSOR_LOCAL_APIC_COUNT > 0
> - EFI_ACPI_5_0_PROCESSOR_LOCAL_APIC_STRUCTURE
> LocalApic[EFI_ACPI_PROCESSOR_LOCAL_APIC_COUNT];
> -#endif
> + #if EFI_ACPI_PROCESSOR_LOCAL_APIC_COUNT > 0
> + EFI_ACPI_5_0_PROCESSOR_LOCAL_APIC_STRUCTURE
> LocalApic[EFI_ACPI_PROCESSOR_LOCAL_APIC_COUNT];
> + #endif
>
> -#if EFI_ACPI_IO_APIC_COUNT > 0
> - EFI_ACPI_5_0_IO_APIC_STRUCTURE
> IoApic[EFI_ACPI_IO_APIC_COUNT];
> -#endif
> + #if EFI_ACPI_IO_APIC_COUNT > 0
> + EFI_ACPI_5_0_IO_APIC_STRUCTURE
> IoApic[EFI_ACPI_IO_APIC_COUNT];
> + #endif
>
> -#if EFI_ACPI_INTERRUPT_SOURCE_OVERRIDE_COUNT > 0
> - EFI_ACPI_5_0_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE
> Iso[EFI_ACPI_INTERRUPT_SOURCE_OVERRIDE_COUNT];
> -#endif
> + #if EFI_ACPI_INTERRUPT_SOURCE_OVERRIDE_COUNT > 0
> + EFI_ACPI_5_0_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE
> Iso[EFI_ACPI_INTERRUPT_SOURCE_OVERRIDE_COUNT];
> + #endif
>
> -#if EFI_ACPI_NON_MASKABLE_INTERRUPT_SOURCE_COUNT > 0
> - EFI_ACPI_5_0_NON_MASKABLE_INTERRUPT_SOURCE_STRUCTURE
> NmiSource[EFI_ACPI_NON_MASKABLE_INTERRUPT_SOURCE_COUNT];
> -#endif
> + #if EFI_ACPI_NON_MASKABLE_INTERRUPT_SOURCE_COUNT > 0
> + EFI_ACPI_5_0_NON_MASKABLE_INTERRUPT_SOURCE_STRUCTURE
> NmiSource[EFI_ACPI_NON_MASKABLE_INTERRUPT_SOURCE_COUNT];
> + #endif
>
> -#if EFI_ACPI_LOCAL_APIC_NMI_COUNT > 0
> - EFI_ACPI_5_0_LOCAL_APIC_NMI_STRUCTURE
> LocalApicNmi[EFI_ACPI_LOCAL_APIC_NMI_COUNT];
> -#endif
> -
> -#if EFI_ACPI_LOCAL_APIC_ADDRESS_OVERRIDE_COUNT > 0
> - EFI_ACPI_5_0_LOCAL_APIC_ADDRESS_OVERRIDE_STRUCTURE
> LocalApicOverride[EFI_ACPI_LOCAL_APIC_ADDRESS_OVERRIDE_COUNT];
> -#endif
> + #if EFI_ACPI_LOCAL_APIC_NMI_COUNT > 0
> + EFI_ACPI_5_0_LOCAL_APIC_NMI_STRUCTURE
> LocalApicNmi[EFI_ACPI_LOCAL_APIC_NMI_COUNT];
> + #endif
>
> -#if EFI_ACPI_IO_SAPIC_COUNT > 0
> - EFI_ACPI_5_0_IO_SAPIC_STRUCTURE
> IoSapic[EFI_ACPI_IO_SAPIC_COUNT];
> -#endif
> + #if EFI_ACPI_LOCAL_APIC_ADDRESS_OVERRIDE_COUNT > 0
> + EFI_ACPI_5_0_LOCAL_APIC_ADDRESS_OVERRIDE_STRUCTURE
> LocalApicOverride[EFI_ACPI_LOCAL_APIC_ADDRESS_OVERRIDE_COUNT];
> + #endif
>
> -#if EFI_ACPI_PROCESSOR_LOCAL_SAPIC_COUNT > 0
> - EFI_ACPI_5_0_PROCESSOR_LOCAL_SAPIC_STRUCTURE
> LocalSapic[EFI_ACPI_PROCESSOR_LOCAL_SAPIC_COUNT];
> -#endif
> + #if EFI_ACPI_IO_SAPIC_COUNT > 0
> + EFI_ACPI_5_0_IO_SAPIC_STRUCTURE
> IoSapic[EFI_ACPI_IO_SAPIC_COUNT];
> + #endif
>
> -#if EFI_ACPI_PLATFORM_INTERRUPT_SOURCES_COUNT > 0
> - EFI_ACPI_5_0_PLATFORM_INTERRUPT_SOURCES_STRUCTURE
> PlatformInterruptSources[EFI_ACPI_PLATFORM_INTERRUPT_SOURCES_COUN
> T];
> -#endif
> + #if EFI_ACPI_PROCESSOR_LOCAL_SAPIC_COUNT > 0
> + EFI_ACPI_5_0_PROCESSOR_LOCAL_SAPIC_STRUCTURE
> LocalSapic[EFI_ACPI_PROCESSOR_LOCAL_SAPIC_COUNT];
> + #endif
>
> + #if EFI_ACPI_PLATFORM_INTERRUPT_SOURCES_COUNT > 0
> + EFI_ACPI_5_0_PLATFORM_INTERRUPT_SOURCES_STRUCTURE
> PlatformInterruptSources[EFI_ACPI_PLATFORM_INTERRUPT_SOURCES_COUN
> T];
> + #endif
> } EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE;
>
> #pragma pack ()
> diff --git
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Acpi/AcpiTables/Mcfg/
> Mcfg.h
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Acpi/AcpiTables/Mcfg/
> Mcfg.h
> index 045a84fe91..ab9fdcae37 100644
> ---
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Acpi/AcpiTables/Mcfg/
> Mcfg.h
> +++
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Acpi/AcpiTables/Mcfg/
> Mcfg.h
> @@ -1,30 +1,16 @@
> /** @file
> Implements Mcfg.h
> + This file describes the contents of the ACPI Memory Mapped Configuration
> + Space Access Table (MCFG). Some additional ACPI values are defined in
> Acpi10.h,
> + Acpi20.h, and Acpi30.h.
>
> Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> + Copyright (c) 2013-2015 Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
> **/
> -/* This file includes code originally published under the following license. */
>
> -/** @file
> -This file describes the contents of the ACPI Memory Mapped Configuration
> -Space Access Table (MCFG). Some additional ACPI values are defined in
> Acpi10.h,
> -Acpi20.h, and Acpi30.h.
> -
> -Copyright (c) 2013-2015 Intel Corporation.
> -
> -This program and the accompanying materials
> -are licensed and made available under the terms and conditions of the BSD
> License
> -which 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.
> -
> -**/
> -
> -#ifndef _MCFG_H_
> -#define _MCFG_H_
> +#ifndef MCFG_H__
> +#define MCFG_H__
>
> //
> // Statements that include other files
> @@ -35,11 +21,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF
> ANY KIND, EITHER EXPRESS OR IMPLIED.
> //
> // ACPI table information used to initialize tables.
> //
> -#define EFI_ACPI_OEM_ID 'A','M','D',' ',' ',' ' // OEMID 6 bytes long
> -#define EFI_ACPI_OEM_TABLE_ID SIGNATURE_64('E','D','K','2',' ',' ',' ',' ') //
> OEM table id 8 bytes long
> -#define EFI_ACPI_OEM_REVISION 0x00000002
> -#define EFI_ACPI_CREATOR_ID SIGNATURE_32(' ',' ',' ',' ')
> -#define EFI_ACPI_CREATOR_REVISION 0x01000013
> +#define EFI_ACPI_OEM_ID 'A','M','D',' ',' ',' ' // OEMID 6
> bytes long
> +#define EFI_ACPI_OEM_TABLE_ID SIGNATURE_64('E','D','K','2',' ',' ',' ',' ')
> // OEM table id 8 bytes long
> +#define EFI_ACPI_OEM_REVISION 0x00000002
> +#define EFI_ACPI_CREATOR_ID SIGNATURE_32(' ',' ',' ',' ')
> +#define EFI_ACPI_CREATOR_REVISION 0x01000013
>
> //
> // MCFG Definitions
> @@ -48,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY
> KIND, EITHER EXPRESS OR IMPLIED.
> //
> // Define the number of allocation structures so that we can build the table
> structure.
> //
> -#define EFI_ACPI_ALLOCATION_STRUCTURE_COUNT 1
> +#define EFI_ACPI_ALLOCATION_STRUCTURE_COUNT 1
>
> //
> // MCFG structure
> @@ -63,11 +49,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF
> ANY KIND, EITHER EXPRESS OR IMPLIED.
> // MCFG Table structure
> //
> typedef struct {
> - EFI_ACPI_DESCRIPTION_HEADER Header;
> - UINT64 Reserved;
> - #if EFI_ACPI_ALLOCATION_STRUCTURE_COUNT > 0
> -
> EFI_ACPI_MEMORY_MAPPED_ENHANCED_CONFIGURATION_SPACE_BASE_A
> DDRESS_ALLOCATION_STRUCTURE
> AllocationStructure[EFI_ACPI_ALLOCATION_STRUCTURE_COUNT];
> - #endif
> + EFI_ACPI_DESCRIPTION_HEADER Header;
> + UINT64 Reserved;
> + #if EFI_ACPI_ALLOCATION_STRUCTURE_COUNT > 0
> +
> EFI_ACPI_MEMORY_MAPPED_ENHANCED_CONFIGURATION_SPACE_BASE_A
> DDRESS_ALLOCATION_STRUCTURE
> AllocationStructure[EFI_ACPI_ALLOCATION_STRUCTURE_COUNT];
> + #endif
> }
> EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_SPACE_ACCESS_DESCRIPTIO
> N_TABLE;
>
> #pragma pack ()
> diff --git
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Capsule/SystemFirmwa
> reDescriptor/SystemFirmwareDescriptor.aslc
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Capsule/SystemFirmwa
> reDescriptor/SystemFirmwareDescriptor.aslc
> index af73e846fc..2e05a523c7 100644
> ---
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Capsule/SystemFirmwa
> reDescriptor/SystemFirmwareDescriptor.aslc
> +++
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Capsule/SystemFirmwa
> reDescriptor/SystemFirmwareDescriptor.aslc
> @@ -1,24 +1,10 @@
> /** @file
> System firmware Descriptor file
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> -/** @file
> System Firmware descriptor.
>
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2017, 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
> - which 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.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Capsule/SystemFirmwa
> reDescriptor/SystemFirmwareDescriptor.inf
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Capsule/SystemFirmwa
> reDescriptor/SystemFirmwareDescriptor.inf
> index 28d0b8f644..50f2b8c1a2 100644
> ---
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Capsule/SystemFirmwa
> reDescriptor/SystemFirmwareDescriptor.inf
> +++
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Capsule/SystemFirmwa
> reDescriptor/SystemFirmwareDescriptor.inf
> @@ -1,23 +1,9 @@
> ## @file
> -# System firmware descriptor INF file
> -#
> -# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -# SPDX-License-Identifier: BSD-2-Clause-Patent
> -#
> -##
> -
> -# This file includes code originally published under the following license.
> -## @file
> # System Firmware descriptor.
> #
> +# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> # Copyright (c) 2017, 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
> -# which 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.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Capsule/SystemFirmwa
> reDescriptor/SystemFirmwareDescriptorPei.c
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Capsule/SystemFirmwa
> reDescriptor/SystemFirmwareDescriptorPei.c
> index 2413854577..7f0c4421e3 100644
> ---
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Capsule/SystemFirmwa
> reDescriptor/SystemFirmwareDescriptorPei.c
> +++
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Capsule/SystemFirmwa
> reDescriptor/SystemFirmwareDescriptorPei.c
> @@ -1,24 +1,10 @@
> /** @file
> Implements SystemFirmwareDescriptorPei.c
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> -/** @file
> System Firmware descriptor producer.
>
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2017, 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
> - which 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.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Conf/build_rule.txt
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Conf/build_rule.txt
> index 2d0390e99e..e8ec7d4a3d 100644
> --- a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Conf/build_rule.txt
> +++ b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Conf/build_rule.txt
> @@ -2,16 +2,10 @@
> # EDK II build rule file
> #
> # Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -# SPDX-License-Identifier: BSD-2-Clause-Patent
> -# Modified with edk2/BaseTools/Conf/build_rule.template
> -##
> -# This file includes code originally published under the following license.
> -#
> # Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
> # Portions copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR>
> # Copyright (c) 2020, ARM Ltd. All rights reserved.<BR>
> # SPDX-License-Identifier: BSD-2-Clause-Patent
> -#
>
> ## Syntax
> #
> diff --git a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Conf/target.txt
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Conf/target.txt
> index b668a2c7c9..2ab2514941 100644
> --- a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Conf/target.txt
> +++ b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Conf/target.txt
> @@ -2,20 +2,9 @@
> # EDK II build target file
> #
> # Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> +# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
> # SPDX-License-Identifier: BSD-2-Clause-Patent
> -# Modified with edk2/BaseTools/Conf/target.template
> -##
> -# This file includes code originally published under the following license.
> -#
> -# Copyright (c) 2006 - 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
> -# which 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.
> #
> #
> # ALL Paths are Relative to WORKSPACE
> diff --git
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Conf/tools_def.txt
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Conf/tools_def.txt
> index 18546c8970..ff582668b3 100644
> --- a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Conf/tools_def.txt
> +++ b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Conf/tools_def.txt
> @@ -2,25 +2,13 @@
> # EDK II build tools defination file
> #
> # Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -# SPDX-License-Identifier: BSD-2-Clause-Patent
> -# Modified with edk2/BaseTools/Conf/tools_def.template
> -##
> -# This file includes code originally published under the following license.
> -#
> # Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
> -# Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
> -# Portions copyright (c) 2011 - 2014, ARM Ltd. All rights reserved.<BR>
> +# copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
> +# copyright (c) 2011 - 2014, ARM Ltd. All rights reserved.<BR>
> # Copyright (c) 2015, Hewlett-Packard Development Company, L.P.<BR>
> -# (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
> -#
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the
> BSD License
> -# which 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.
> -#
> +# Copyright (C) 2016 Hewlett Packard Enterprise Development LP<BR>
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> +
>
> IDENTIFIER = Default TOOL_CHAIN_CONF
>
> diff --git
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Include/Library/Capsul
> eHookLib.h
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Include/Library/Capsul
> eHookLib.h
> index e573ac0f09..584adfaee9 100644
> ---
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Include/Library/Capsul
> eHookLib.h
> +++
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Include/Library/Capsul
> eHookLib.h
> @@ -6,8 +6,8 @@
>
> **/
>
> -#ifndef _CAPSULE_HOOK_LIB_H_
> -#define _CAPSULE_HOOK_LIB_H_
> +#ifndef CAPSULE_HOOK_LIB_H__
> +#define CAPSULE_HOOK_LIB_H__
>
> /**
> Detect Capsule file from ESP partition and update capsule.
> diff --git
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Include/Protocol/Globa
> lNvsArea.h
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Include/Protocol/Glob
> alNvsArea.h
> index 0c5077f417..e844932cc0 100644
> ---
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Include/Protocol/Globa
> lNvsArea.h
> +++
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Include/Protocol/Glob
> alNvsArea.h
> @@ -1,11 +1,3 @@
> -/** @file
> - GlobalNvsArea.h
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -**/
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> Definition of the global NVS area protocol. This protocol
> publishes the address and format of a global ACPI NVS buffer
> @@ -13,14 +5,15 @@ used as a communications buffer between SMM code
> and ASL code.
> The format is derived from the ACPI reference code, version 0.95.
> Note: Data structures defined in this protocol are not naturally aligned.
>
> -Copyright (c) 2013-2015 Intel Corporation.
> +Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> +Copyright (c) 2013-2015 Intel Corporation. All rights reserved.<BR>
>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> -#ifndef _GLOBAL_NVS_AREA_H_
> -#define _GLOBAL_NVS_AREA_H_
> +#ifndef GLOBAL_NVS_AREA_H__
> +#define GLOBAL_NVS_AREA_H__
>
> //
> // Includes
> diff --git
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Library/Capsule/Platfor
> mBootManagerLib/PlatformBootManager.c
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Library/Capsule/Platfor
> mBootManagerLib/PlatformBootManager.c
> index a647e92054..94f4f8207a 100644
> ---
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Library/Capsule/Platfor
> mBootManagerLib/PlatformBootManager.c
> +++
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Library/Capsule/Platfor
> mBootManagerLib/PlatformBootManager.c
> @@ -1,17 +1,8 @@
> -/** @file
> - Implements PlatformBootManager.c
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> This file include all platform action which can be customized
> by IBV/OEM.
>
> +Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2015 - 2021, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> @@ -357,7 +348,7 @@ PlatformBdsForceActiveVga (
> EFI_DEVICE_PATH_PROTOCOL *IGpuDevicePath;
> EFI_DEVICE_PATH_PROTOCOL *DGpuDevicePath;
>
> - DEBUG ((EFI_D_INFO, "PlatformBdsForceActiveVga enter\n"));
> + DEBUG ((DEBUG_INFO, "PlatformBdsForceActiveVga enter\n"));
>
> Status = EFI_SUCCESS;
> DevicePathFirst = NULL;
> @@ -373,25 +364,25 @@ PlatformBdsForceActiveVga (
> ASSERT_EFI_ERROR (Status);
>
> if ((IGpuDevicePath == NULL) && (DGpuDevicePath == NULL)) {
> - DEBUG ((EFI_D_INFO, "No valid IGPU and DGPU\n"));
> + DEBUG ((DEBUG_INFO, "No valid IGPU and DGPU\n"));
> return EFI_UNSUPPORTED;
> }
>
> if ((IGpuDevicePath != NULL) && (DGpuDevicePath == NULL)) {
> - DEBUG ((EFI_D_INFO, "Only IGPU is valid\n"));
> - // DEBUG ((EFI_D_INFO,"Only IGPU is valid, Update IGPU ...\n"));
> + DEBUG ((DEBUG_INFO, "Only IGPU is valid\n"));
> + // DEBUG ((DEBUG_INFO,"Only IGPU is valid, Update IGPU ...\n"));
> DevicePathFirst = IGpuDevicePath;
> DevicePathSecond = DGpuDevicePath;
> goto UpdateConOut;
> } else if ((IGpuDevicePath == NULL) && (DGpuDevicePath != NULL)) {
> - DEBUG ((EFI_D_INFO, "Only DGPU is valid\n"));
> - // DEBUG ((EFI_D_INFO,"Only DGPU is valid, Update DGPU ...\n"));
> + DEBUG ((DEBUG_INFO, "Only DGPU is valid\n"));
> + // DEBUG ((DEBUG_INFO,"Only DGPU is valid, Update DGPU ...\n"));
> DevicePathFirst = DGpuDevicePath;
> DevicePathSecond = IGpuDevicePath;
> goto UpdateConOut;
> } else if ((IGpuDevicePath != NULL) && (DGpuDevicePath != NULL)) {
> - DEBUG ((EFI_D_INFO, "DGPU and IGPU are valid, active DGPU\n"));
> - // DEBUG ((EFI_D_INFO,"Only DGPU is valid, Update DGPU ...\n"));
> + DEBUG ((DEBUG_INFO, "DGPU and IGPU are valid, active DGPU\n"));
> + // DEBUG ((DEBUG_INFO,"Only DGPU is valid, Update DGPU ...\n"));
> DevicePathFirst = DGpuDevicePath;
> DevicePathSecond = IGpuDevicePath;
> goto UpdateConOut;
> @@ -685,7 +676,7 @@ ExposeOver4GMemoryEventCallback (
> LIST_ENTRY *TmpLink;
> LIST_ENTRY NonTestedMemRanList;
>
> - DEBUG ((EFI_D_INFO, "ExposeOver4GMemoryEventCallback\n"));
> + DEBUG ((DEBUG_INFO, "ExposeOver4GMemoryEventCallback\n"));
>
> TmpLink = NULL;
> NoFound = TRUE;
> diff --git
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Library/Capsule/Platfor
> mBootManagerLib/PlatformBootManager.h
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Library/Capsule/Platfor
> mBootManagerLib/PlatformBootManager.h
> index 0b4b85e7d2..15891f9471 100644
> ---
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Library/Capsule/Platfor
> mBootManagerLib/PlatformBootManager.h
> +++
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Library/Capsule/Platfor
> mBootManagerLib/PlatformBootManager.h
> @@ -1,16 +1,7 @@
> -/** @file
> - Implements PlatformBootManager.h
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> Head file for BDS Platform specific code
>
> +Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
> **/
> diff --git
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Library/Capsule/Platfor
> mBootManagerLib/PlatformBootManagerLib.inf
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Library/Capsule/Platfor
> mBootManagerLib/PlatformBootManagerLib.inf
> index db58d94301..fc9251d3fd 100644
> ---
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Library/Capsule/Platfor
> mBootManagerLib/PlatformBootManagerLib.inf
> +++
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Library/Capsule/Platfor
> mBootManagerLib/PlatformBootManagerLib.inf
> @@ -1,14 +1,7 @@
> ## @file
> -# Platform Boot Manager Lib Module
> -#
> -# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -# SPDX-License-Identifier: BSD-2-Clause-Patent
> -#
> -##
> -# This file includes code originally published under the following license.
> -## @file
> # Include all platform action which can be customized by IBV/OEM.
> #
> +# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> # Copyright (c) 2012 - 2021, Intel Corporation. All rights reserved.<BR>
> # SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> diff --git
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Library/Capsule/Platfor
> mBootManagerLib/PlatformConsole.c
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Library/Capsule/Platfor
> mBootManagerLib/PlatformConsole.c
> index 0715fcc86e..4849770ff6 100644
> ---
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Library/Capsule/Platfor
> mBootManagerLib/PlatformConsole.c
> +++
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Library/Capsule/Platfor
> mBootManagerLib/PlatformConsole.c
> @@ -1,16 +1,7 @@
> -/** @file
> - Implements PlatformConsole.c
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> This file include all platform action which can be customized by IBV/OEM.
>
> +Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> @@ -379,7 +370,7 @@ DetectAndPreparePlatformPciDevicePath (
> NULL
> );
> ASSERT_EFI_ERROR (Status);
> - DEBUG ((EFI_D_INFO, "InstallProtocolInterface
> gAmdCpmAllPciIoProtocolsInstalledProtocolGuid %r\n", Status));
> + DEBUG ((DEBUG_INFO, "InstallProtocolInterface
> gAmdCpmAllPciIoProtocolsInstalledProtocolGuid %r\n", Status));
> return EFI_SUCCESS;
> }
>
> diff --git
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Library/Capsule/Platfor
> mBootManagerLib/PlatformConsole.h
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Library/Capsule/Platfor
> mBootManagerLib/PlatformConsole.h
> index a43583fb17..dc66db7ced 100644
> ---
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Library/Capsule/Platfor
> mBootManagerLib/PlatformConsole.h
> +++
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Library/Capsule/Platfor
> mBootManagerLib/PlatformConsole.h
> @@ -1,16 +1,7 @@
> -/** @file
> - Implements PlatformConsole.h
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> Head file for BDS Platform specific code
>
> +Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
> **/
> diff --git
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Library/Capsule/Platfor
> mBootManagerLib/PlatformData.c
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Library/Capsule/Platfor
> mBootManagerLib/PlatformData.c
> index 5f4cba87a7..d8871a4bd5 100644
> ---
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Library/Capsule/Platfor
> mBootManagerLib/PlatformData.c
> +++
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Library/Capsule/Platfor
> mBootManagerLib/PlatformData.c
> @@ -1,17 +1,8 @@
> -/** @file
> - Implements PlatformData.c
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> Defined the platform specific device path which will be filled to
> ConIn/ConOut variables.
>
> +Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
> **/
> diff --git
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Library/PlatformSecLib
> /Ia32/Flat32.nasm
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Library/PlatformSecLib
> /Ia32/Flat32.nasm
> index b11f45768c..5638c411e3 100644
> ---
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Library/PlatformSecLib
> /Ia32/Flat32.nasm
> +++
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Library/PlatformSecLib
> /Ia32/Flat32.nasm
> @@ -1,31 +1,14 @@
> ;/** @file
> ; AMD VanGoghBoard PlatformSecLib
> +; This is the code that goes from real-mode to protected mode.
> +; It consumes the reset vector, configures the stack.
> ;
> +; Copyright (c) 2013-2015 Intel Corporation. All rights reserved.<BR>
> ; Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> ; SPDX-License-Identifier: BSD-2-Clause-Patent
> ;
> ;**/
>
> -; This file includes code originally published under the following license.
> -;------------------------------------------------------------------------------
> -;
> -; Copyright (c) 2013-2015 Intel Corporation.
> -;
> -; SPDX-License-Identifier: BSD-2-Clause-Patent
> -;
> -; Module Name:
> -;
> -; Flat32.asm
> -;
> -; Abstract:
> -;
> -; This is the code that goes from real-mode to protected mode.
> -; It consumes the reset vector, configures the stack.
> -;
> -;
> -;------------------------------------------------------------------------------
> -
> -
> ;
> ; Include processor definitions
> ;
> diff --git
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Library/PlatformSecLib
> /Ia32/Platform.inc
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Library/PlatformSecLib
> /Ia32/Platform.inc
> index c057d157d9..7ef0d9a2c0 100644
> ---
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Library/PlatformSecLib
> /Ia32/Platform.inc
> +++
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Library/PlatformSecLib
> /Ia32/Platform.inc
> @@ -1,29 +1,13 @@
> ;/** @file
> ; AMD VanGoghBoard PlatformSecLib
> +; Platform Specific Definitions
> ;
> +; Copyright (c) 2013-2015 Intel Corporation. All rights reserved.<BR>
> ; Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> ; SPDX-License-Identifier: BSD-2-Clause-Patent
> ;
> ;**/
>
> -; This file includes code originally published under the following license.
> -;
> -; Copyright (c) 2013-2015 Intel Corporation.
> -;
> -; SPDX-License-Identifier: BSD-2-Clause-Patent
> -;
> -;------------------------------------------------------------------------------
> -;
> -; Module Name:
> -;
> -; Platform.inc
> -;
> -; Abstract:
> -;
> -; Platform Specific Definitions
> -;
> -;------------------------------------------------------------------------------
> -
> %macro JMP32 1
> lea esp, %%target
> jmp %1
> diff --git
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Library/PlatformSecLib
> /PlatformSecLib.c
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Library/PlatformSecLib
> /PlatformSecLib.c
> index 4c27d9b5a2..c5f7cc6018 100644
> ---
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Library/PlatformSecLib
> /PlatformSecLib.c
> +++
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Library/PlatformSecLib
> /PlatformSecLib.c
> @@ -1,21 +1,9 @@
> -/** @file
> - Implements PlatformSecLib.c
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> Platform SEC Library for Quark.
>
> -Copyright (c) 2013-2015 Intel Corporation.
> -
> +Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> +Copyright (c) 2013-2015 Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -
> **/
>
> #include <PiPei.h>
> diff --git
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Library/PlatformSecLib
> /PlatformSecLib.inf
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Library/PlatformSecLib
> /PlatformSecLib.inf
> index 1c23fd4949..baa7939e46 100644
> ---
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Library/PlatformSecLib
> /PlatformSecLib.inf
> +++
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Library/PlatformSecLib
> /PlatformSecLib.inf
> @@ -1,14 +1,7 @@
> -## @file
> -# Platform Sec Lib Module
> -#
> -# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -# SPDX-License-Identifier: BSD-2-Clause-Patent
> -#
> -##
> -# This file includes code originally published under the following license.
> #/** @file
> # Platform SEC Library for Quark.
> #
> +# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> # Copyright (c) 2013-2015 Intel Corporation.
> #
> # SPDX-License-Identifier: BSD-2-Clause-Patent
> diff --git
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Library/PlatformSecLib
> /PlatformSecLibModStrs.uni
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Library/PlatformSecLib
> /PlatformSecLibModStrs.uni
> index f728e07695..93ee4a65dc 100644
> ---
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Library/PlatformSecLib
> /PlatformSecLibModStrs.uni
> +++
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Library/PlatformSecLib
> /PlatformSecLibModStrs.uni
> @@ -1,16 +1,7 @@
> // /** @file
> -// AMD PlatformSecLibModStrs.uni
> -//
> -// Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -//
> -// SPDX-License-Identifier: BSD-2-Clause-Patent
> -//
> -// **/
> -
> -// This file includes code originally published under the following license.
> -// /** @file
> // PlatformSecLib Localized Abstract and Description Content
> //
> +// Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> // Copyright (c) 2012 - 2013, Intel Corporation. All rights reserved.<BR>
> //
> // SPDX-License-Identifier: BSD-2-Clause-Patent
> diff --git
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/PciPlatform/CommonH
> eader.h
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/PciPlatform/CommonH
> eader.h
> index 430d9f51dc..f4e6461206 100644
> ---
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/PciPlatform/CommonH
> eader.h
> +++
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/PciPlatform/CommonH
> eader.h
> @@ -1,31 +1,15 @@
> /** @file
> Implements CommonHeader.h
> + This file includes package header files, library classes and protocol, PPI &
> GUID definitions.
>
> + Copyright (c) 2013-2015 Intel Corporation. All rights reserved.<BR>
> Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> -/* This file includes code originally published under the following license. */
> -
> -/** @file
> -Common header file shared by all source files.
> -
> -This file includes package header files, library classes and protocol, PPI &
> GUID definitions.
> -
> -Copyright (c) 2013-2015 Intel Corporation.
> -
> -This program and the accompanying materials
> -are licensed and made available under the terms and conditions of the BSD
> License
> -which 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.
> -**/
> -
> -#ifndef __COMMON_HEADER_H_
> -#define __COMMON_HEADER_H_
> +#ifndef COMMON_HEADER_H___
> +#define COMMON_HEADER_H___
>
> #include <PiDxe.h>
>
> diff --git
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/PciPlatform/PciPlatfor
> m.c
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/PciPlatform/PciPlatfor
> m.c
> index 733d334075..aa0a133b1f 100644
> ---
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/PciPlatform/PciPlatfor
> m.c
> +++
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/PciPlatform/PciPlatfor
> m.c
> @@ -1,27 +1,11 @@
> /** @file
> Implements PciPlatform.c
> + Registers onboard PCI ROMs with PCI.IO
>
> Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> + Copyright (c) 2013-2015 Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> -/** @file
> -Registers onboard PCI ROMs with PCI.IO
> -
> -Copyright (c) 2013-2015 Intel Corporation.
> -
> -This program and the accompanying materials
> -are licensed and made available under the terms and conditions of the BSD
> License
> -which 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.
> -
> -
> **/
>
> #include "CommonHeader.h"
> diff --git
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/PciPlatform/PciPlatfor
> m.h
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/PciPlatform/PciPlatfor
> m.h
> index 95a3e8816c..a0a4e01161 100644
> ---
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/PciPlatform/PciPlatfor
> m.h
> +++
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/PciPlatform/PciPlatfor
> m.h
> @@ -1,28 +1,12 @@
> /** @file
> Implements PciPlatform.h
> + This code supports a the private implementation
> + of the Legacy BIOS Platform protocol
>
> Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> + Copyright (c) 2013-2015 Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> -/** @file
> -This code supports a the private implementation
> -of the Legacy BIOS Platform protocol
> -
> -Copyright (c) 2013-2015 Intel Corporation.
> -
> -This program and the accompanying materials
> -are licensed and made available under the terms and conditions of the BSD
> License
> -which 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.
> -
> -
> **/
>
> #ifndef PCI_PLATFORM_H_
> diff --git
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/PciPlatform/PciPlatfor
> m.inf
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/PciPlatform/PciPlatfor
> m.inf
> index 16d46f638a..16028400ce 100644
> ---
> a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/PciPlatform/PciPlatfor
> m.inf
> +++
> b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/PciPlatform/PciPlatfor
> m.inf
> @@ -1,28 +1,13 @@
> ## @file
> # PCI Platform INF file
> +# This driver installs pciplatform protocol to provide access interfaces to the
> onboard pci roms.
> #
> # Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> +# Copyright (c) 2013-2015 Intel Corporation. All rights reserved.<BR>
> # SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> -# This file includes code originally published under the following license.
> -## @file
> -# Component description file for PciPlatform module.
> -#
> -# This driver installs pciplatform protocol to provide access interfaces to the
> onboard pci roms.
> -# Copyright (c) 2013-2015 Intel Corporation.
> -#
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the
> BSD License
> -# which 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.
> -#
> -##
> -
> [Defines]
> INF_VERSION = 0x00010005
> BASE_NAME = PciPlatform
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/BaseTools/Source/Python/
> GenFds/Capsule.py
> b/Platform/AMD/VanGoghBoard/Override/edk2/BaseTools/Source/Python/
> GenFds/Capsule.py
> index 248eb25889..0ec0b3ca43 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/BaseTools/Source/Python/
> GenFds/Capsule.py
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/BaseTools/Source/Python/
> GenFds/Capsule.py
> @@ -1,15 +1,7 @@
> -
> #/**************************************************************
> ***************
> -#*
> -#* Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -#* SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> #***************************************************************
> ***************
> -#
> -
> -# This file includes code originally published under the following license.
> -
> ## @file
> # generate capsule
> #
> +# Copyright (C) 2024 Advanced Micro Devices, Inc.
> # Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
> #
> # SPDX-License-Identifier: BSD-2-Clause-Patent
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/FspWrap
> perNotifyDxe/FspWrapperNotifyDxe.c
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/FspWrap
> perNotifyDxe/FspWrapperNotifyDxe.c
> index e1b4bf169f..0c997b40d0 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/FspWrap
> perNotifyDxe/FspWrapperNotifyDxe.c
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/FspWrap
> perNotifyDxe/FspWrapperNotifyDxe.c
> @@ -1,16 +1,7 @@
> -/** @file
> - Implements FspWrapperNotifyDxe.C
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> This driver will register two callbacks to call fsp's notifies.
>
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2014 - 2019, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/FspWrap
> perNotifyDxe/LoadBelow4G.c
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/FspWrap
> perNotifyDxe/LoadBelow4G.c
> index 50e1d2a249..9a49d3b492 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/FspWrap
> perNotifyDxe/LoadBelow4G.c
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/FspWrap
> perNotifyDxe/LoadBelow4G.c
> @@ -1,15 +1,6 @@
> -/** @file
> - Implements LoadBelow4G.C
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
>
> +Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>
>
> SPDX-License-Identifier: BSD-2-Clause-Patent
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/FspmWra
> pperPeim/FspmWrapperPeim.c
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/FspmWr
> apperPeim/FspmWrapperPeim.c
> index 9b0a17f607..fc5a339e8b 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/FspmWra
> pperPeim/FspmWrapperPeim.c
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/FspmWr
> apperPeim/FspmWrapperPeim.c
> @@ -1,18 +1,9 @@
> -/** @file
> - Implements FspmWrapperPeim.C
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> This will be invoked only once. It will call FspMemoryInit API,
> register TemporaryRamDonePpi to call TempRamExit API, and register
> MemoryDiscoveredPpi
> notify to call FspSiliconInit API.
>
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2014 - 2022, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/FspsMulti
> PhaseSiInitDxe/FspsMultiPhaseSiInitDxe.c
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/FspsMult
> iPhaseSiInitDxe/FspsMultiPhaseSiInitDxe.c
> index 54dd3b02c7..bb5e12cba9 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/FspsMulti
> PhaseSiInitDxe/FspsMultiPhaseSiInitDxe.c
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/FspsMult
> iPhaseSiInitDxe/FspsMultiPhaseSiInitDxe.c
> @@ -1,16 +1,7 @@
> -/** @file
> - Implements FspsMultiPhaseSiInitDxe.C
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> This driver will register two callbacks to call fsp's notifies.
>
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2014 - 2019, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/FspsMulti
> PhaseSiInitDxe/LoadBelow4G.c
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/FspsMult
> iPhaseSiInitDxe/LoadBelow4G.c
> index 50e1d2a249..ae05556cc9 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/FspsMulti
> PhaseSiInitDxe/LoadBelow4G.c
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/FspsMult
> iPhaseSiInitDxe/LoadBelow4G.c
> @@ -1,15 +1,7 @@
> /** @file
> - Implements LoadBelow4G.C
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> -/** @file
> +Implements LoadBelow4G.C
>
> +Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>
>
> SPDX-License-Identifier: BSD-2-Clause-Patent
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/FspsWra
> pperPeim/FspsWrapperPeim.c
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/FspsWra
> pperPeim/FspsWrapperPeim.c
> index 6912d23a7d..e6a589bcb5 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/FspsWra
> pperPeim/FspsWrapperPeim.c
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/FspsWra
> pperPeim/FspsWrapperPeim.c
> @@ -1,18 +1,9 @@
> -/** @file
> - Implements FspsWrapperPeim.C
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> This will be invoked only once. It will call FspMemoryInit API,
> register TemporaryRamDonePpi to call TempRamExit API, and register
> MemoryDiscoveredPpi
> notify to call FspSiliconInit API.
>
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2014 - 2021, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/F
> spUpd.h
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/F
> spUpd.h
> index e26688e0b9..a4827a0068 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/F
> spUpd.h
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/F
> spUpd.h
> @@ -6,8 +6,8 @@
>
> **/
>
> -#ifndef __FSPUPD_H__
> -#define __FSPUPD_H__
> +#ifndef FSPUPD_H____
> +#define FSPUPD_H____
>
> #ifdef USE_EDKII_HEADER_FILE
> #include <FspEas.h>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/F
> spmUpd.h
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/F
> spmUpd.h
> index 5ccf2aad34..ed9a6c79a3 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/F
> spmUpd.h
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/F
> spmUpd.h
> @@ -6,8 +6,8 @@
>
> **/
>
> -#ifndef __FSPMUPD_H__
> -#define __FSPMUPD_H__
> +#ifndef FSPMUPD_H____
> +#define FSPMUPD_H____
>
> #include <FspUpd.h>
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/F
> spsUpd.h
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/F
> spsUpd.h
> index f31cf44ec8..c1fb89c63d 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/F
> spsUpd.h
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/F
> spsUpd.h
> @@ -6,8 +6,8 @@
>
> **/
>
> -#ifndef __FSPSUPD_H__
> -#define __FSPSUPD_H__
> +#ifndef FSPSUPD_H____
> +#define FSPSUPD_H____
>
> #include <FspUpd.h>
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/F
> sptUpd.h
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/F
> sptUpd.h
> index 69fb29ed24..604efefa7d 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/F
> sptUpd.h
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/F
> sptUpd.h
> @@ -6,8 +6,8 @@
>
> **/
>
> -#ifndef __FSPTUPD_H__
> -#define __FSPTUPD_H__
> +#ifndef FSPTUPD_H____
> +#define FSPTUPD_H____
>
> #include <FspUpd.h>
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/L
> ibrary/FspMeasurementLib.h
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/L
> ibrary/FspMeasurementLib.h
> index b4b26623fd..7172544b8a 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/L
> ibrary/FspMeasurementLib.h
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/L
> ibrary/FspMeasurementLib.h
> @@ -1,23 +1,14 @@
> -/** @file
> - Implements FspMeasurementLib.h
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> This library is used by FSP modules to measure data to TPM.
>
> +Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2020, Intel Corporation. All rights reserved. <BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> -#ifndef _FSP_MEASUREMENT_LIB_H_
> -#define _FSP_MEASUREMENT_LIB_H_
> +#ifndef FSP_MEASUREMENT_LIB_H__
> +#define FSP_MEASUREMENT_LIB_H__
>
> #define FSP_MEASURE_FSP BIT0
> #define FSP_MEASURE_FSPT BIT1
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/L
> ibrary/FspWrapperApiLib.h
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/L
> ibrary/FspWrapperApiLib.h
> index e853cea537..073c6e1d0e 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/L
> ibrary/FspWrapperApiLib.h
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/L
> ibrary/FspWrapperApiLib.h
> @@ -1,23 +1,14 @@
> -/** @file
> - Implements FspWrapperApiLib.h
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> Provide FSP wrapper API related function.
>
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> -#ifndef __FSP_WRAPPER_API_LIB_H__
> -#define __FSP_WRAPPER_API_LIB_H__
> +#ifndef FSP_WRAPPER_API_LIB_H____
> +#define FSP_WRAPPER_API_LIB_H____
>
> #include <FspEas.h>
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/L
> ibrary/FspWrapperApiTestLib.h
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/L
> ibrary/FspWrapperApiTestLib.h
> index 6b591def1b..c4e785e41e 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/L
> ibrary/FspWrapperApiTestLib.h
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/L
> ibrary/FspWrapperApiTestLib.h
> @@ -1,23 +1,14 @@
> -/** @file
> - Implements FspWrapperApiTestLib.h
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> Provide FSP wrapper API test related function.
>
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> -#ifndef __FSP_WRAPPER_API_TEST_LIB_H__
> -#define __FSP_WRAPPER_API_TEST_LIB_H__
> +#ifndef FSP_WRAPPER_API_TEST_LIB_H____
> +#define FSP_WRAPPER_API_TEST_LIB_H____
>
> #include <PiPei.h>
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/L
> ibrary/FspWrapperHobProcessLib.h
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/L
> ibrary/FspWrapperHobProcessLib.h
> index 05b0689ce7..8c0c244e43 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/L
> ibrary/FspWrapperHobProcessLib.h
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/L
> ibrary/FspWrapperHobProcessLib.h
> @@ -1,23 +1,14 @@
> -/** @file
> - Implements FspWrapperHobProcessLib.h
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> Provide FSP wrapper hob process related function.
>
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> -#ifndef __FSP_WRAPPER_HOB_PROCESS_LIB_H__
> -#define __FSP_WRAPPER_HOB_PROCESS_LIB_H__
> +#ifndef FSP_WRAPPER_HOB_PROCESS_LIB_H____
> +#define FSP_WRAPPER_HOB_PROCESS_LIB_H____
>
> /**
> Post FSP-M HOB process for Memory Resource Descriptor.
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/L
> ibrary/FspWrapperMultiPhaseProcessLib.h
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/L
> ibrary/FspWrapperMultiPhaseProcessLib.h
> index 6403037cf6..89cff5ea4a 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/L
> ibrary/FspWrapperMultiPhaseProcessLib.h
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/L
> ibrary/FspWrapperMultiPhaseProcessLib.h
> @@ -1,23 +1,14 @@
> -/** @file
> - Implements FspWrapperMultiPhaseProcessLib.h
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> Provide FSP wrapper MultiPhase handling functions.
>
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2022, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> -#ifndef __FSP_WRAPPER_MULTI_PHASE_PROCESS_LIB_H__
> -#define __FSP_WRAPPER_MULTI_PHASE_PROCESS_LIB_H__
> +#ifndef FSP_WRAPPER_MULTI_PHASE_PROCESS_LIB_H____
> +#define FSP_WRAPPER_MULTI_PHASE_PROCESS_LIB_H____
>
> /**
> FSP Wrapper Variable Request Handler
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/L
> ibrary/FspWrapperPlatformLib.h
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/L
> ibrary/FspWrapperPlatformLib.h
> index e5fa14f9b7..529bc31145 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/L
> ibrary/FspWrapperPlatformLib.h
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/L
> ibrary/FspWrapperPlatformLib.h
> @@ -1,23 +1,14 @@
> -/** @file
> - Implements FspWrapperPlatformLib.h
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> Provide FSP wrapper platform related function.
>
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> -#ifndef __FSP_WRAPPER_PLATFORM_LIB_H__
> -#define __FSP_WRAPPER_PLATFORM_LIB_H__
> +#ifndef FSP_WRAPPER_PLATFORM_LIB_H____
> +#define FSP_WRAPPER_PLATFORM_LIB_H____
>
> /**
> This function overrides the default configurations in the FSP-M UPD data
> region.
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/L
> ibrary/FspWrapperPlatformMultiPhaseLib.h
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/L
> ibrary/FspWrapperPlatformMultiPhaseLib.h
> index 56a75bb6fd..8e16ddb719 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/L
> ibrary/FspWrapperPlatformMultiPhaseLib.h
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/L
> ibrary/FspWrapperPlatformMultiPhaseLib.h
> @@ -1,16 +1,7 @@
> -/** @file
> - Implements FspWrapperPlatformMultiPhaseLib.h
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> Provide FSP wrapper Platform MultiPhase handling functions.
>
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2022, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/
> MultiPhaseSiPhases.h
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/
> MultiPhaseSiPhases.h
> index c78b7ff83d..9be1b17b29 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/
> MultiPhaseSiPhases.h
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/
> MultiPhaseSiPhases.h
> @@ -6,8 +6,8 @@
>
> **/
>
> -#ifndef _MULTI_PHASE_SI_PHASES_H_
> -#define _MULTI_PHASE_SI_PHASES_H_
> +#ifndef MULTI_PHASE_SI_PHASES_H__
> +#define MULTI_PHASE_SI_PHASES_H__
>
> typedef enum {
> EnumMultiPhaseAmdCpmDxeTableReadyPhase = 1, // In FSP Doc, the
> index starts from 1.
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/P
> pi/FspSiliconInitDone.h
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/P
> pi/FspSiliconInitDone.h
> index 5413aa9c69..23d46ea1f1 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/P
> pi/FspSiliconInitDone.h
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/P
> pi/FspSiliconInitDone.h
> @@ -1,23 +1,14 @@
> -/** @file
> - Implements FspSiliconInitDone.h
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> Provides the services to return FSP hob list.
>
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> -#ifndef _FSP_SILICON_INIT_DONE_H_
> -#define _FSP_SILICON_INIT_DONE_H_
> +#ifndef FSP_SILICON_INIT_DONE_H__
> +#define FSP_SILICON_INIT_DONE_H__
>
> typedef struct _FSP_SILICON_INIT_DONE_PPI FSP_SILICON_INIT_DONE_PPI;
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/P
> pi/TopOfTemporaryRam.h
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/P
> pi/TopOfTemporaryRam.h
> index 9c87571630..7bb32290cb 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/P
> pi/TopOfTemporaryRam.h
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/P
> pi/TopOfTemporaryRam.h
> @@ -1,23 +1,14 @@
> -/** @file
> - Implements TopOfTemporaryRam.h
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> Provides the pointer to top of temporary ram.
>
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> -#ifndef _TOP_OF_TEMPORARY_RAM_H_
> -#define _TOP_OF_TEMPORARY_RAM_H_
> +#ifndef TOP_OF_TEMPORARY_RAM_H__
> +#define TOP_OF_TEMPORARY_RAM_H__
>
> extern EFI_GUID gTopOfTemporaryRamPpiGuid;
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/B
> aseFspMeasurementLib/FspMeasurementLib.c
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/B
> aseFspMeasurementLib/FspMeasurementLib.c
> index 33a3588019..9a9368bb75 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/B
> aseFspMeasurementLib/FspMeasurementLib.c
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/B
> aseFspMeasurementLib/FspMeasurementLib.c
> @@ -1,16 +1,7 @@
> -/** @file
> - Implements FspMeasurementLib.C
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> This library is used by FSP modules to measure data to TPM.
>
> +Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2020, Intel Corporation. All rights reserved. <BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/B
> aseFspWrapperApiLib/FspWrapperApiLib.c
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/B
> aseFspWrapperApiLib/FspWrapperApiLib.c
> index 3c4467646d..80d64f9bd2 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/B
> aseFspWrapperApiLib/FspWrapperApiLib.c
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/B
> aseFspWrapperApiLib/FspWrapperApiLib.c
> @@ -1,16 +1,7 @@
> -/** @file
> - Implements FspWrapperApiLib.c
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> Provide FSP API related function.
>
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2014 - 2022, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/B
> aseFspWrapperApiLib/X64/DispatchExecute.c
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/B
> aseFspWrapperApiLib/X64/DispatchExecute.c
> index 8c062a30de..3c34806286 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/B
> aseFspWrapperApiLib/X64/DispatchExecute.c
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/B
> aseFspWrapperApiLib/X64/DispatchExecute.c
> @@ -1,18 +1,9 @@
> -/** @file
> - Implements 64-bit DispatchExcute.c
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> Execute 64-bit code in Long Mode.
> Provide a thunk function to transition from long mode to compatibility
> mode to execute 32-bit code and then transit
> back to long mode.
>
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2014 - 2022, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/B
> aseFspWrapperApiLib/X64/Thunk64To32.nasm
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/B
> aseFspWrapperApiLib/X64/Thunk64To32.nasm
> index b89f00aadd..f1a14b2446 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/B
> aseFspWrapperApiLib/X64/Thunk64To32.nasm
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/B
> aseFspWrapperApiLib/X64/Thunk64To32.nasm
> @@ -3,11 +3,6 @@
> ; transit back to long mode.
> ;
> ; Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -; SPDX-License-Identifier: BSD-2-Clause-Patent
> -;
> -;**/
> -; This file includes code originally published under the following license.
> -;
> ; Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>
> ; SPDX-License-Identifier: BSD-2-Clause-Patent
> ;
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/B
> aseFspWrapperApiTestLibNull/FspWrapperApiTestNull.c
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/B
> aseFspWrapperApiTestLibNull/FspWrapperApiTestNull.c
> index 1fc11b14c5..19bd3afc29 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/B
> aseFspWrapperApiTestLibNull/FspWrapperApiTestNull.c
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/B
> aseFspWrapperApiTestLibNull/FspWrapperApiTestNull.c
> @@ -1,16 +1,7 @@
> -/** @file
> - Implements FSP wrapper API test related function.
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> Provide FSP wrapper API test related function.
>
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/B
> aseFspWrapperPlatformLibSample/FspWrapperPlatformLibSample.c
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/B
> aseFspWrapperPlatformLibSample/FspWrapperPlatformLibSample.c
> index 0b29df142c..1afcf68f85 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/B
> aseFspWrapperPlatformLibSample/FspWrapperPlatformLibSample.c
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/B
> aseFspWrapperPlatformLibSample/FspWrapperPlatformLibSample.c
> @@ -1,16 +1,7 @@
> -/** @file
> - Implements FspWrapperPlatformLibSample.C
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> Sample to provide FSP wrapper related function.
>
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/B
> aseFspWrapperPlatformMultiPhaseLibNull/FspWrapperPlatformMultiPhaseLi
> bNull.c
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/B
> aseFspWrapperPlatformMultiPhaseLibNull/FspWrapperPlatformMultiPhaseLi
> bNull.c
> index 4715c640c1..3a0d0e6088 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/B
> aseFspWrapperPlatformMultiPhaseLibNull/FspWrapperPlatformMultiPhaseLi
> bNull.c
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/B
> aseFspWrapperPlatformMultiPhaseLibNull/FspWrapperPlatformMultiPhaseLi
> bNull.c
> @@ -1,17 +1,8 @@
> -/** @file
> - Implements FspWrapperPlatformLibSample.C
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> FSP Wrapper to handle platform specific actions for
> FSP MultiPhase (SeparatePhase) Initialization.
>
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2022, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/D
> xeFspWrapperMultiPhaseProcessLib/DxeFspWrapperMultiPhaseProcessLib.c
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/D
> xeFspWrapperMultiPhaseProcessLib/DxeFspWrapperMultiPhaseProcessLib.c
> index 7f5666f238..cfda44bc71 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/D
> xeFspWrapperMultiPhaseProcessLib/DxeFspWrapperMultiPhaseProcessLib.c
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/D
> xeFspWrapperMultiPhaseProcessLib/DxeFspWrapperMultiPhaseProcessLib.c
> @@ -1,16 +1,7 @@
> -/** @file
> - Implements DxeFspWrapperMultiPhaseProcessLib.c
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> Support FSP Wrapper MultiPhase process.
>
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2022, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/F
> spWrapperMultiPhaseProcessLib/PeiFspWrapperMultiPhaseProcessLib.c
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/F
> spWrapperMultiPhaseProcessLib/PeiFspWrapperMultiPhaseProcessLib.c
> index 042b6a1e54..e072efbb04 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/F
> spWrapperMultiPhaseProcessLib/PeiFspWrapperMultiPhaseProcessLib.c
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/F
> spWrapperMultiPhaseProcessLib/PeiFspWrapperMultiPhaseProcessLib.c
> @@ -1,16 +1,7 @@
> -/** @file
> - Implements PeiFspWrapperMultiPhaseProcessLib.c
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> Support FSP Wrapper MultiPhase process.
>
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2022, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/P
> eiFspWrapperHobProcessLibSample/CommonHeader.h
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/P
> eiFspWrapperHobProcessLibSample/CommonHeader.h
> index 568e7b0079..d512feaa5b 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/P
> eiFspWrapperHobProcessLibSample/CommonHeader.h
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/P
> eiFspWrapperHobProcessLibSample/CommonHeader.h
> @@ -1,31 +1,14 @@
> /** @file
> Implements CommonHeader.h
>
> + Copyright (c) 2013 - 2016 Intel Corporation. All rights reserved.<BR>
> Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> -/* This file includes code originally published under the following license. */
> -
> -/** @file
> -Common header file shared by all source files.
> -
> -This file includes package header files, library classes and protocol, PPI &
> GUID definitions.
> -
> -Copyright (c) 2013 - 2016 Intel Corporation.
> -
> -This program and the accompanying materials
> -are licensed and made available under the terms and conditions of the BSD
> License
> -which 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.
> -**/
> -
> -#ifndef __COMMON_HEADER_H_
> -#define __COMMON_HEADER_H_
> +#ifndef COMMON_HEADER_H___
> +#define COMMON_HEADER_H___
>
> #include <PiPei.h>
> #include <Ppi/Stall.h>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/P
> eiFspWrapperHobProcessLibSample/FspWrapperHobProcessLibSample.c
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/P
> eiFspWrapperHobProcessLibSample/FspWrapperHobProcessLibSample.c
> index c2b09ec52f..3100f4635e 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/P
> eiFspWrapperHobProcessLibSample/FspWrapperHobProcessLibSample.c
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/P
> eiFspWrapperHobProcessLibSample/FspWrapperHobProcessLibSample.c
> @@ -1,16 +1,7 @@
> -/** @file
> - Implements FspWrapperHobProcessLibSample.c
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> Sample to provide FSP wrapper hob process related function.
>
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2014 - 2019, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> @@ -294,15 +285,15 @@ InstallEfiMemory (
> );
> ASSERT_EFI_ERROR (Status);
>
> - DEBUG ((EFI_D_INFO, "NumRanges: %d\n", NumRanges));
> + DEBUG ((DEBUG_INFO, "NumRanges: %d\n", NumRanges));
>
> - DEBUG ((EFI_D_INFO, "GetMemoryMap:\n"));
> + DEBUG ((DEBUG_INFO, "GetMemoryMap:\n"));
> for (Index = 0; Index < NumRanges; Index++) {
> - DEBUG ((EFI_D_INFO, "Index: %d ", Index));
> - DEBUG ((EFI_D_INFO, "RangeLength: 0x%016lX\t",
> MemoryMap[Index].RangeLength));
> - DEBUG ((EFI_D_INFO, "PhysicalAddress: 0x%016lX\t",
> MemoryMap[Index].PhysicalAddress));
> - DEBUG ((EFI_D_INFO, "CpuAddress: 0x%016lX\t",
> MemoryMap[Index].CpuAddress));
> - DEBUG ((EFI_D_INFO, "Type: %d\n", MemoryMap[Index].Type));
> + DEBUG ((DEBUG_INFO, "Index: %d ", Index));
> + DEBUG ((DEBUG_INFO, "RangeLength: 0x%016lX\t",
> MemoryMap[Index].RangeLength));
> + DEBUG ((DEBUG_INFO, "PhysicalAddress: 0x%016lX\t",
> MemoryMap[Index].PhysicalAddress));
> + DEBUG ((DEBUG_INFO, "CpuAddress: 0x%016lX\t",
> MemoryMap[Index].CpuAddress));
> + DEBUG ((DEBUG_INFO, "Type: %d\n", MemoryMap[Index].Type));
> }
>
> //
> @@ -327,9 +318,9 @@ InstallEfiMemory (
> PeiMemoryIndex = 0;
>
> for (Index = 0; Index < NumRanges; Index++) {
> - DEBUG ((EFI_D_INFO, "Found 0x%lx bytes at ",
> MemoryMap[Index].RangeLength));
> - DEBUG ((EFI_D_INFO, "0x%lx.\t", MemoryMap[Index].PhysicalAddress));
> - DEBUG ((EFI_D_INFO, "Type: %d.\n", MemoryMap[Index].Type));
> + DEBUG ((DEBUG_INFO, "Found 0x%lx bytes at ",
> MemoryMap[Index].RangeLength));
> + DEBUG ((DEBUG_INFO, "0x%lx.\t", MemoryMap[Index].PhysicalAddress));
> + DEBUG ((DEBUG_INFO, "Type: %d.\n", MemoryMap[Index].Type));
>
> if ((MemoryMap[Index].Type == DualChannelDdrMainMemory) &&
> (MemoryMap[Index].PhysicalAddress +
> MemoryMap[Index].RangeLength < MAX_ADDRESS) &&
> @@ -381,7 +372,7 @@ InstallEfiMemory (
> if (Status == EFI_SUCCESS) {
> CapsuleBuffer = LargeMemRangeBuf;
> CapsuleBufferLength = LargeMemRangeBufLen;
> - DEBUG ((EFI_D_INFO, "CapsuleBuffer: %x, CapsuleBufferLength: %x\n",
> CapsuleBuffer, CapsuleBufferLength));
> + DEBUG ((DEBUG_INFO, "CapsuleBuffer: %x, CapsuleBufferLength: %x\n",
> CapsuleBuffer, CapsuleBufferLength));
>
> //
> // Call the Capsule PPI Coalesce function to coalesce the capsule data.
> @@ -580,7 +571,7 @@ InstallEfiMemory (
> //
> CopyMem (&DescriptorAcpiVariable, &SmramHobDescriptorBlock-
> >Descriptor[SmramRanges-1], sizeof (EFI_SMRAM_DESCRIPTOR));
> DescriptorAcpiVariable.CpuStart += RESERVED_CPU_S3_SAVE_OFFSET;
> - DEBUG ((EFI_D_INFO, "gEfiAcpiVariableGuid CpuStart: 0x%X\n",
> (UINTN)DescriptorAcpiVariable.CpuStart));
> + DEBUG ((DEBUG_INFO, "gEfiAcpiVariableGuid CpuStart: 0x%X\n",
> (UINTN)DescriptorAcpiVariable.CpuStart));
> BuildGuidDataHob (
> &gEfiAcpiVariableGuid,
> &DescriptorAcpiVariable,
> @@ -644,19 +635,19 @@ InstallS3Memory (
> FspHobList
> );
> ASSERT_EFI_ERROR (Status);
> - DEBUG ((EFI_D_INFO, "NumRanges = 0x%x\n", NumRanges));
> + DEBUG ((DEBUG_INFO, "NumRanges = 0x%x\n", NumRanges));
>
> //
> // Install physical memory descriptor hobs for each memory range.
> //
> SmramRanges = 0;
> - DEBUG ((EFI_D_INFO, "GetMemoryMap:\n"));
> + DEBUG ((DEBUG_INFO, "GetMemoryMap:\n"));
> for (Index = 0; Index < NumRanges; Index++) {
> - DEBUG ((EFI_D_INFO, "Index: %d ", Index));
> - DEBUG ((EFI_D_INFO, "RangeLength: 0x%016lX\t",
> MemoryMap[Index].RangeLength));
> - DEBUG ((EFI_D_INFO, "PhysicalAddress: 0x%016lX\t",
> MemoryMap[Index].PhysicalAddress));
> - DEBUG ((EFI_D_INFO, "CpuAddress: 0x%016lX\t",
> MemoryMap[Index].CpuAddress));
> - DEBUG ((EFI_D_INFO, "Type: %d\n", MemoryMap[Index].Type));
> + DEBUG ((DEBUG_INFO, "Index: %d ", Index));
> + DEBUG ((DEBUG_INFO, "RangeLength: 0x%016lX\t",
> MemoryMap[Index].RangeLength));
> + DEBUG ((DEBUG_INFO, "PhysicalAddress: 0x%016lX\t",
> MemoryMap[Index].PhysicalAddress));
> + DEBUG ((DEBUG_INFO, "CpuAddress: 0x%016lX\t",
> MemoryMap[Index].CpuAddress));
> + DEBUG ((DEBUG_INFO, "Type: %d\n", MemoryMap[Index].Type));
> if ((MemoryMap[Index].PhysicalAddress > 0x100000) &&
> ((MemoryMap[Index].Type == DualChannelDdrSmramCacheable) ||
> (MemoryMap[Index].Type == DualChannelDdrSmramNonCacheable)))
> @@ -666,7 +657,7 @@ InstallS3Memory (
> }
>
> ASSERT (SmramRanges > 0);
> - DEBUG ((EFI_D_INFO, "SmramRanges = 0x%x\n", SmramRanges));
> + DEBUG ((DEBUG_INFO, "SmramRanges = 0x%x\n", SmramRanges));
>
> //
> // Allocate one extra EFI_SMRAM_DESCRIPTOR to describe a page of
> SMRAM memory that contains a pointer
> @@ -677,22 +668,22 @@ InstallS3Memory (
> BufferSize += ((SmramRanges) * sizeof (EFI_SMRAM_DESCRIPTOR));
> }
>
> - DEBUG ((EFI_D_INFO, "BufferSize = 0x%x\n", BufferSize));
> + DEBUG ((DEBUG_INFO, "BufferSize = 0x%x\n", BufferSize));
>
> Hob.Raw = BuildGuidHob (
> &gEfiSmmPeiSmramMemoryReserveGuid,
> BufferSize
> );
> ASSERT (Hob.Raw);
> - DEBUG ((EFI_D_INFO,
> "gEfiSmmPeiSmramMemoryReserveGuid/SmramHobDescriptorBlock: 0x%X
> \n", (UINTN)Hob.Raw));
> + DEBUG ((DEBUG_INFO,
> "gEfiSmmPeiSmramMemoryReserveGuid/SmramHobDescriptorBlock: 0x%X
> \n", (UINTN)Hob.Raw));
>
> SmramHobDescriptorBlock =
> (EFI_SMRAM_HOB_DESCRIPTOR_BLOCK *)(Hob.Raw);
> SmramHobDescriptorBlock->NumberOfSmmReservedRegions =
> SmramRanges + 1;
>
> SmramIndex = 0;
> for (Index = 0; Index < NumRanges; Index++) {
> - DEBUG ((EFI_D_INFO, "Index: 0x%X \t", Index));
> - DEBUG ((EFI_D_INFO, "SmramIndex: 0x%X \n", SmramIndex));
> + DEBUG ((DEBUG_INFO, "Index: 0x%X \t", Index));
> + DEBUG ((DEBUG_INFO, "SmramIndex: 0x%X \n", SmramIndex));
> if ((MemoryMap[Index].PhysicalAddress > 0x100000) &&
> ((MemoryMap[Index].Type == DualChannelDdrSmramCacheable) ||
> (MemoryMap[Index].Type == DualChannelDdrSmramNonCacheable))
> @@ -710,11 +701,11 @@ InstallS3Memory (
> SmramHobDescriptorBlock->Descriptor[SmramIndex].RegionState =
> EFI_SMRAM_CLOSED;
> }
>
> - DEBUG ((EFI_D_INFO, "SmramIndex: 0x%X \n", SmramIndex));
> - DEBUG ((EFI_D_INFO, "PhysicalStart: 0x%X\n",
> (UINTN)SmramHobDescriptorBlock->Descriptor[SmramIndex].PhysicalStart));
> - DEBUG ((EFI_D_INFO, "CpuStart : 0x%X\n",
> (UINTN)SmramHobDescriptorBlock->Descriptor[SmramIndex].CpuStart));
> - DEBUG ((EFI_D_INFO, "PhysicalSize : 0x%X\n",
> (UINTN)SmramHobDescriptorBlock->Descriptor[SmramIndex].PhysicalSize));
> - DEBUG ((EFI_D_INFO, "RegionState : 0x%X\n",
> (UINTN)SmramHobDescriptorBlock->Descriptor[SmramIndex].RegionState));
> + DEBUG ((DEBUG_INFO, "SmramIndex: 0x%X \n", SmramIndex));
> + DEBUG ((DEBUG_INFO, "PhysicalStart: 0x%X\n",
> (UINTN)SmramHobDescriptorBlock->Descriptor[SmramIndex].PhysicalStart));
> + DEBUG ((DEBUG_INFO, "CpuStart : 0x%X\n",
> (UINTN)SmramHobDescriptorBlock->Descriptor[SmramIndex].CpuStart));
> + DEBUG ((DEBUG_INFO, "PhysicalSize : 0x%X\n",
> (UINTN)SmramHobDescriptorBlock->Descriptor[SmramIndex].PhysicalSize));
> + DEBUG ((DEBUG_INFO, "RegionState : 0x%X\n",
> (UINTN)SmramHobDescriptorBlock->Descriptor[SmramIndex].RegionState));
> if ( SmramIndex == SmramRanges - 1) {
> //
> // one extra EFI_SMRAM_DESCRIPTOR for a page of SMRAM memory
> @@ -726,14 +717,14 @@ InstallS3Memory (
> SmramHobDescriptorBlock->Descriptor[SmramIndex].PhysicalSize =
> MemoryMap[Index].RangeLength - EFI_PAGE_SIZE;
> SmramHobDescriptorBlock->Descriptor[SmramIndex].RegionState =
> SmramHobDescriptorBlock->Descriptor[SmramIndex-1].RegionState;
> SmramHobDescriptorBlock->Descriptor[SmramIndex-1].RegionState |=
> EFI_ALLOCATED;
> - DEBUG ((EFI_D_INFO, "SmramIndex: 0x%X \n", SmramIndex));
> - DEBUG ((EFI_D_INFO, "PhysicalStart: 0x%X\n",
> (UINTN)SmramHobDescriptorBlock->Descriptor[SmramIndex].PhysicalStart));
> - DEBUG ((EFI_D_INFO, "CpuStart : 0x%X\n",
> (UINTN)SmramHobDescriptorBlock->Descriptor[SmramIndex].CpuStart));
> - DEBUG ((EFI_D_INFO, "PhysicalSize : 0x%X\n",
> (UINTN)SmramHobDescriptorBlock->Descriptor[SmramIndex].PhysicalSize));
> - DEBUG ((EFI_D_INFO, "RegionState : 0x%X\n\n",
> (UINTN)SmramHobDescriptorBlock->Descriptor[SmramIndex].RegionState));
> -
> - DEBUG ((EFI_D_INFO, "PhysicalSize : 0x%X\n",
> (UINTN)SmramHobDescriptorBlock->Descriptor[SmramIndex-
> 1].PhysicalSize));
> - DEBUG ((EFI_D_INFO, "RegionState : 0x%X\n",
> (UINTN)SmramHobDescriptorBlock->Descriptor[SmramIndex-
> 1].RegionState));
> + DEBUG ((DEBUG_INFO, "SmramIndex: 0x%X \n", SmramIndex));
> + DEBUG ((DEBUG_INFO, "PhysicalStart: 0x%X\n",
> (UINTN)SmramHobDescriptorBlock->Descriptor[SmramIndex].PhysicalStart));
> + DEBUG ((DEBUG_INFO, "CpuStart : 0x%X\n",
> (UINTN)SmramHobDescriptorBlock->Descriptor[SmramIndex].CpuStart));
> + DEBUG ((DEBUG_INFO, "PhysicalSize : 0x%X\n",
> (UINTN)SmramHobDescriptorBlock->Descriptor[SmramIndex].PhysicalSize));
> + DEBUG ((DEBUG_INFO, "RegionState : 0x%X\n\n",
> (UINTN)SmramHobDescriptorBlock->Descriptor[SmramIndex].RegionState));
> +
> + DEBUG ((DEBUG_INFO, "PhysicalSize : 0x%X\n",
> (UINTN)SmramHobDescriptorBlock->Descriptor[SmramIndex-
> 1].PhysicalSize));
> + DEBUG ((DEBUG_INFO, "RegionState : 0x%X\n",
> (UINTN)SmramHobDescriptorBlock->Descriptor[SmramIndex-
> 1].RegionState));
> }
>
> SmramIndex++;
> @@ -745,7 +736,7 @@ InstallS3Memory (
> //
> CopyMem (&DescriptorAcpiVariable, &SmramHobDescriptorBlock-
> >Descriptor[SmramRanges-1], sizeof (EFI_SMRAM_DESCRIPTOR));
> DescriptorAcpiVariable.CpuStart += RESERVED_CPU_S3_SAVE_OFFSET;
> - DEBUG ((EFI_D_INFO, "gEfiAcpiVariableGuid CpuStart: 0x%X\n",
> (UINTN)DescriptorAcpiVariable.CpuStart));
> + DEBUG ((DEBUG_INFO, "gEfiAcpiVariableGuid CpuStart: 0x%X\n",
> (UINTN)DescriptorAcpiVariable.CpuStart));
> BuildGuidDataHob (
> &gEfiAcpiVariableGuid,
> &DescriptorAcpiVariable,
> @@ -757,20 +748,20 @@ InstallS3Memory (
> // install it as PEI Memory.
> //
>
> - DEBUG ((EFI_D_INFO, "TSEG Base = 0x%08x\n",
> SmramHobDescriptorBlock->Descriptor[SmramRanges].PhysicalStart));
> - DEBUG ((EFI_D_INFO, "SmramRanges = 0x%x\n", SmramRanges));
> + DEBUG ((DEBUG_INFO, "TSEG Base = 0x%08x\n",
> SmramHobDescriptorBlock->Descriptor[SmramRanges].PhysicalStart));
> + DEBUG ((DEBUG_INFO, "SmramRanges = 0x%x\n", SmramRanges));
> S3MemoryRangeData = (RESERVED_ACPI_S3_RANGE *)(UINTN)
> (SmramHobDescriptorBlock-
> >Descriptor[SmramRanges].PhysicalStart +
> RESERVED_ACPI_S3_RANGE_OFFSET);
> - DEBUG ((EFI_D_INFO, "S3MemoryRangeData = 0x%08x\n",
> (UINTN)S3MemoryRangeData));
> + DEBUG ((DEBUG_INFO, "S3MemoryRangeData = 0x%08x\n",
> (UINTN)S3MemoryRangeData));
>
> - DEBUG ((EFI_D_INFO, "S3MemoryRangeData->AcpiReservedMemoryBase =
> 0x%X\n", (UINTN)S3MemoryRangeData->AcpiReservedMemoryBase));
> - DEBUG ((EFI_D_INFO, "S3MemoryRangeData->AcpiReservedMemorySize =
> 0x%X\n", (UINTN)S3MemoryRangeData->AcpiReservedMemorySize));
> - DEBUG ((EFI_D_INFO, "S3MemoryRangeData->SystemMemoryLength =
> 0x%X\n", (UINTN)S3MemoryRangeData->SystemMemoryLength));
> + DEBUG ((DEBUG_INFO, "S3MemoryRangeData-
> >AcpiReservedMemoryBase = 0x%X\n", (UINTN)S3MemoryRangeData-
> >AcpiReservedMemoryBase));
> + DEBUG ((DEBUG_INFO, "S3MemoryRangeData->AcpiReservedMemorySize
> = 0x%X\n", (UINTN)S3MemoryRangeData->AcpiReservedMemorySize));
> + DEBUG ((DEBUG_INFO, "S3MemoryRangeData->SystemMemoryLength =
> 0x%X\n", (UINTN)S3MemoryRangeData->SystemMemoryLength));
>
> S3MemoryBase = (UINTN)(S3MemoryRangeData-
> >AcpiReservedMemoryBase);
> - DEBUG ((EFI_D_INFO, "S3MemoryBase = 0x%08x\n", S3MemoryBase));
> + DEBUG ((DEBUG_INFO, "S3MemoryBase = 0x%08x\n", S3MemoryBase));
> S3MemorySize = (UINTN)(S3MemoryRangeData-
> >AcpiReservedMemorySize);
> - DEBUG ((EFI_D_INFO, "S3MemorySize = 0x%08x\n", S3MemorySize));
> + DEBUG ((DEBUG_INFO, "S3MemorySize = 0x%08x\n", S3MemorySize));
>
> Status = PeiServicesInstallPeiMemory (S3MemoryBase, S3MemorySize);
> ASSERT_EFI_ERROR (Status);
> @@ -795,7 +786,7 @@ InstallS3Memory (
> S3MemoryRangeData->SystemMemoryLength - 0x100000
> );
>
> - DEBUG ((EFI_D_INFO, "MemoryBegin: 0x%lX, MemoryLength: 0x%lX\n",
> 0x100000, S3MemoryRangeData->SystemMemoryLength - 0x100000));
> + DEBUG ((DEBUG_INFO, "MemoryBegin: 0x%lX, MemoryLength: 0x%lX\n",
> 0x100000, S3MemoryRangeData->SystemMemoryLength - 0x100000));
>
> for (Index = 0; Index < NumRanges; Index++) {
> if ((MemoryMap[Index].Type == DualChannelDdrMainMemory) &&
> @@ -814,10 +805,10 @@ InstallS3Memory (
> MemoryMap[Index].PhysicalAddress,
> MemoryMap[Index].RangeLength
> );
> - DEBUG ((EFI_D_INFO, "MemoryBegin: 0x%lX, MemoryLength: 0x%lX\n",
> MemoryMap[Index].PhysicalAddress, MemoryMap[Index].RangeLength));
> + DEBUG ((DEBUG_INFO, "MemoryBegin: 0x%lX, MemoryLength: 0x%lX\n",
> MemoryMap[Index].PhysicalAddress, MemoryMap[Index].RangeLength));
>
> - DEBUG ((EFI_D_INFO, "Build resource HOB for Legacy Region on S3
> patch :"));
> - DEBUG ((EFI_D_INFO, " Memory Base:0x%lX Length:0x%lX\n",
> MemoryMap[Index].PhysicalAddress, MemoryMap[Index].RangeLength));
> + DEBUG ((DEBUG_INFO, "Build resource HOB for Legacy Region on S3
> patch :"));
> + DEBUG ((DEBUG_INFO, " Memory Base:0x%lX Length:0x%lX\n",
> MemoryMap[Index].PhysicalAddress, MemoryMap[Index].RangeLength));
> }
> }
>
> @@ -894,7 +885,7 @@ GetPlatformMemorySize (
>
> *MemorySize = PEI_MIN_MEMORY_SIZE;
> for (Index = 0; Index < DataSize / sizeof
> (EFI_MEMORY_TYPE_INFORMATION); Index++) {
> - DEBUG ((EFI_D_INFO, "Index %d, Page: %d\n", Index,
> MemoryData[Index].NumberOfPages));
> + DEBUG ((DEBUG_INFO, "Index %d, Page: %d\n", Index,
> MemoryData[Index].NumberOfPages));
> *MemorySize += MemoryData[Index].NumberOfPages * EFI_PAGE_SIZE;
> }
>
> @@ -908,7 +899,7 @@ GetPlatformMemorySize (
> );
> }
>
> - DEBUG ((EFI_D_INFO, "GetPlatformMemorySize, MemorySize: 0x%lX\n",
> *MemorySize));
> + DEBUG ((DEBUG_INFO, "GetPlatformMemorySize, MemorySize: 0x%lX\n",
> *MemorySize));
> return EFI_SUCCESS;
> }
>
> @@ -941,7 +932,7 @@ PostFspmHobProcess (
> ASSERT_EFI_ERROR (Status);
>
> if (BootMode == BOOT_ON_S3_RESUME) {
> - DEBUG ((EFI_D_INFO, "Following BOOT_ON_S3_RESUME boot path.\n"));
> + DEBUG ((DEBUG_INFO, "Following BOOT_ON_S3_RESUME boot
> path.\n"));
>
> Status = InstallS3Memory (PeiServices, BootMode, FspHobList);
> ASSERT_EFI_ERROR (Status);
> @@ -1032,7 +1023,7 @@ GetAvailableMemoryRanges (
> {
> EFI_PEI_HOB_POINTERS Hob;
>
> - DEBUG ((EFI_D_INFO, "GetAvailableMemoryRanges++\n"));
> + DEBUG ((DEBUG_INFO, "GetAvailableMemoryRanges++\n"));
> if ((*NumRanges) < MAX_RANGES) {
> return EFI_BUFFER_TOO_SMALL;
> }
> @@ -1050,7 +1041,7 @@ GetAvailableMemoryRanges (
> MemoryMap[*NumRanges].Type =
> DualChannelDdrReservedMemory;
> (*NumRanges)++;
> DEBUG ((
> - EFI_D_INFO,
> + DEBUG_INFO,
> " GetAvailableMemoryRanges Base:0x%016lX, Size: 0x%016lX\n", \
> Hob.ResourceDescriptor->PhysicalStart, \
> Hob.ResourceDescriptor->ResourceLength
> @@ -1072,7 +1063,7 @@ GetReservedMemoryRanges (
> {
> EFI_PEI_HOB_POINTERS Hob;
>
> - DEBUG ((EFI_D_INFO, "GetReservedMemoryRanges\n"));
> + DEBUG ((DEBUG_INFO, "GetReservedMemoryRanges\n"));
> if ((*NumRanges) < MAX_RANGES) {
> return EFI_BUFFER_TOO_SMALL;
> }
> @@ -1090,7 +1081,7 @@ GetReservedMemoryRanges (
> MemoryMap[*NumRanges].Type =
> DualChannelDdrReservedMemory;
> (*NumRanges)++;
> DEBUG ((
> - EFI_D_INFO,
> + DEBUG_INFO,
> " GetReservedMemoryRanges Base:0x%016lX, Size: 0x%016lX\n", \
> Hob.ResourceDescriptor->PhysicalStart, \
> Hob.ResourceDescriptor->ResourceLength
> @@ -1375,7 +1366,7 @@ SetPeiCacheMode (
> break;
> }
>
> - DEBUG ((EFI_D_INFO, "Base=%lx, Mask=%lx\n",
> MtrrSetting.Variables.Mtrr[Index].Base,
> MtrrSetting.Variables.Mtrr[Index].Mask));
> + DEBUG ((DEBUG_INFO, "Base=%lx, Mask=%lx\n",
> MtrrSetting.Variables.Mtrr[Index].Base,
> MtrrSetting.Variables.Mtrr[Index].Mask));
> }
>
> //
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/P
> eiFspWrapperHobProcessLibSample/MemoryInstall.h
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/P
> eiFspWrapperHobProcessLibSample/MemoryInstall.h
> index 8b67437ffa..c9a58aea56 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/P
> eiFspWrapperHobProcessLibSample/MemoryInstall.h
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/P
> eiFspWrapperHobProcessLibSample/MemoryInstall.h
> @@ -1,30 +1,15 @@
> /** @file
> Implements MemoryInstall.h
> + Framework PEIM to initialize memory on an DDR2 SDRAM Memory
> Controller.
>
> Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> + Copyright (c) 2013 - 2016 Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> -/* This file includes code originally published under the following license. */
> -
> -/** @file
> -Framework PEIM to initialize memory on an DDR2 SDRAM Memory
> Controller.
> -
> -Copyright (c) 2013 - 2016 Intel Corporation.
> -
> -This program and the accompanying materials
> -are licensed and made available under the terms and conditions of the BSD
> License
> -which 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.
> -
> -**/
> -
> -#ifndef _MRC_WRAPPER_H
> -#define _MRC_WRAPPER_H
> +#ifndef MRC_WRAPPER_H_
> +#define MRC_WRAPPER_H_
>
> //
> // Maximum number of memory ranges supported by the memory
> controller
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/S
> ecFspWrapperPlatformSecLibSample/Fsp.h
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/S
> ecFspWrapperPlatformSecLibSample/Fsp.h
> index 41bee3a613..0bb612ea87 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/S
> ecFspWrapperPlatformSecLibSample/Fsp.h
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/S
> ecFspWrapperPlatformSecLibSample/Fsp.h
> @@ -6,8 +6,8 @@
>
> **/
>
> -#ifndef __FSP_H__
> -#define __FSP_H__
> +#ifndef FSP_H____
> +#define FSP_H____
>
> //
> // Fv Header
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/S
> ecFspWrapperPlatformSecLibSample/SecRamInitData.c
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/S
> ecFspWrapperPlatformSecLibSample/SecRamInitData.c
> index ed6917b27b..5e7f051bb6 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/S
> ecFspWrapperPlatformSecLibSample/SecRamInitData.c
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/S
> ecFspWrapperPlatformSecLibSample/SecRamInitData.c
> @@ -10,10 +10,10 @@
> #include <FspEas.h>
>
> typedef struct {
> - EFI_PHYSICAL_ADDRESS MicrocodeRegionBase;
> - UINT64 MicrocodeRegionSize;
> - EFI_PHYSICAL_ADDRESS CodeRegionBase;
> - UINT64 CodeRegionSize;
> + EFI_PHYSICAL_ADDRESS MicrocodeRegionBase;
> + UINT64 MicrocodeRegionSize;
> + EFI_PHYSICAL_ADDRESS CodeRegionBase;
> + UINT64 CodeRegionSize;
> } FSPT_CORE_UPD;
>
> typedef struct {
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/MdeModulePkg/Bus/Pci/Pc
> iHostBridgeDxe/IoFifo.h
> b/Platform/AMD/VanGoghBoard/Override/edk2/MdeModulePkg/Bus/Pci/Pc
> iHostBridgeDxe/IoFifo.h
> index 051a80753b..41d6a89ce3 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/MdeModulePkg/Bus/Pci/Pc
> iHostBridgeDxe/IoFifo.h
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/MdeModulePkg/Bus/Pci/Pc
> iHostBridgeDxe/IoFifo.h
> @@ -1,29 +1,15 @@
> /** @file
> Implementation of IoFifo.h
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> -/** @file
> I/O FIFO routines
>
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2008 - 2012, 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 which 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.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> -#ifndef _IO_FIFO_H_INCLUDED_
> -#define _IO_FIFO_H_INCLUDED_
> +#ifndef IO_FIFO_H_INCLUDED__
> +#define IO_FIFO_H_INCLUDED__
>
> /**
> Reads an 8-bit I/O port fifo into a block of memory.
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/MdeModulePkg/Bus/Pci/Pc
> iHostBridgeDxe/PciHostBridge.c
> b/Platform/AMD/VanGoghBoard/Override/edk2/MdeModulePkg/Bus/Pci/Pc
> iHostBridgeDxe/PciHostBridge.c
> index 4a03e68c20..6fc9b22b8f 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/MdeModulePkg/Bus/Pci/Pc
> iHostBridgeDxe/PciHostBridge.c
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/MdeModulePkg/Bus/Pci/Pc
> iHostBridgeDxe/PciHostBridge.c
> @@ -1,25 +1,11 @@
> /** @file
> Implementation of PciHostBridge.c
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> -/** @file
> Provides the basic interfaces to abstract a PCI Host Bridge Resource
> Allocation
>
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2008 - 2013, 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 which 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.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> @@ -290,8 +276,7 @@ InitializePciHostBridge (
> programming.
>
> @param[in] This The instance pointer of
> -
> EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL
> -
> +
> EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL
> @param[in] Phase The phase during enumeration
>
> @retval EFI_NOT_READY This phase cannot be entered at this time.
> For
> @@ -299,20 +284,16 @@ InitializePciHostBridge (
> EfiPciHostBridgeAllocateResources if
> SubmitResources() has not been called for one
> or more PCI root bridges before this call
> -
> @retval EFI_DEVICE_ERROR Programming failed due to a hardware
> error.
> This error is valid for a Phase of
> EfiPciHostBridgeSetResources.
> -
> @retval EFI_INVALID_PARAMETER Invalid phase parameter
> -
> @retval EFI_OUT_OF_RESOURCES The request could not be completed
> due to a
> lack of resources. This error is valid for a
> Phase of EfiPciHostBridgeAllocateResources if
> the previously submitted resource requests
> cannot be fulfilled or were only partially
> fulfilled.
> -
> @retval EFI_SUCCESS The notification was accepted without any
> errors.
> **/
> @@ -597,18 +578,15 @@ NotifyPhase (
> For D945 implementation, there is only one root bridge in PCI host bridge.
>
> @param[in] This The instance pointer of
> -
> EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL
> -
> +
> EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL
> @param[in, out] RootBridgeHandle Returns the device handle of the next
> PCI
> root bridge.
>
> @retval EFI_SUCCESS If parameter RootBridgeHandle = NULL, then
> return the first Rootbridge handle of the
> specific Host bridge and return EFI_SUCCESS.
> -
> @retval EFI_NOT_FOUND Can not find the any more root bridge in
> specific host bridge.
> -
> @retval EFI_INVALID_PARAMETER RootBridgeHandle is not an
> EFI_HANDLE that was
> returned on a previous call to
> GetNextRootBridge().
> @@ -704,21 +682,17 @@ GetNextRootBridge (
> corresponding 32-bit memory pool.
>
> @param[in] This The instance pointer of
> -
> EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL
> -
> +
> EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL
> @param[in] RootBridgeHandle The device handle of the PCI root bridge
> in
> which the caller is interested. Type
> EFI_HANDLE is defined in
> InstallProtocolInterface() in the UEFI 2.0
> Specification.
> -
> @param[out] Attributes The pointer to attribte of root bridge, it is
> output parameter
>
> @retval EFI_INVALID_PARAMETER Attribute pointer is NULL
> -
> @retval EFI_INVALID_PARAMETER RootBridgehandle is invalid.
> -
> @retval EFI_SUCCESS Success to get attribute of interested root
> bridge.
> **/
> @@ -766,18 +740,14 @@ GetAttributes (
> resource descriptor format.
>
> @param[in] This The
> -
> EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL
> +
> EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL
> instance.
> -
> @param[in] RootBridgeHandle The PCI Root Bridge to be set up.
> -
> @param[out] Configuration Pointer to the pointer to the PCI bus
> resource
> descriptor.
>
> @retval EFI_INVALID_PARAMETER Invalid Root bridge's handle
> -
> @retval EFI_OUT_OF_RESOURCES Fail to allocate ACPI resource descriptor
> tag.
> -
> @retval EFI_SUCCESS Sucess to allocate ACPI resource descriptor.
> **/
> EFI_STATUS
> @@ -859,37 +829,26 @@ StartBusEnumeration (
> @param[in] This The
>
> EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL
> instance
> -
> @param[in] RootBridgeHandle The PCI Root Bridge whose bus range is to
> be
> programmed
> -
> @param[in] Configuration The pointer to the PCI bus resource descriptor
>
> @retval EFI_INVALID_PARAMETER RootBridgeHandle is not a valid root
> bridge
> handle.
> -
> @retval EFI_INVALID_PARAMETER Configuration is NULL.
> -
> @retval EFI_INVALID_PARAMETER Configuration does not point to a valid
> ACPI
> 2.0 resource descriptor.
> -
> @retval EFI_INVALID_PARAMETER Configuration does not include a valid
> ACPI
> 2.0 bus resource descriptor.
> -
> @retval EFI_INVALID_PARAMETER Configuration includes valid ACPI 2.0
> resource
> descriptors other than bus descriptors.
> -
> @retval EFI_INVALID_PARAMETER Configuration contains one or more
> invalid
> ACPI resource descriptors.
> -
> @retval EFI_INVALID_PARAMETER "Address Range Minimum" is invalid for
> this
> root bridge.
> -
> @retval EFI_INVALID_PARAMETER "Address Range Length" is invalid for
> this
> root bridge.
> -
> @retval EFI_DEVICE_ERROR Programming failed due to a hardware
> error.
> -
> @retval EFI_SUCCESS The bus range for the PCI root bridge was
> programmed.
> **/
> @@ -989,36 +948,27 @@ SetBusNumbers (
> @param[in] This Pointer to the
>
> EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL
> instance.
> -
> @param[in] RootBridgeHandle The PCI root bridge whose I/O and memory
> resource requirements are being submitted.
> -
> @param[in] Configuration The pointer to the PCI I/O and PCI memory
> resource descriptor.
>
> @retval EFI_SUCCESS The I/O and memory resource requests for a
> PCI
> root bridge were accepted.
> -
> @retval EFI_INVALID_PARAMETER RootBridgeHandle is not a valid root
> bridge
> handle.
> -
> @retval EFI_INVALID_PARAMETER Configuration is NULL.
> -
> @retval EFI_INVALID_PARAMETER Configuration does not point to a valid
> ACPI
> 2.0 resource descriptor.
> -
> @retval EFI_INVALID_PARAMETER Configuration includes requests for one
> or
> more resource types that are not supported by
> this PCI root bridge. This error will happen
> if the caller did not combine resources
> according to Attributes that were returned by
> GetAllocAttributes().
> -
> @retval EFI_INVALID_PARAMETER Address Range Maximum" is invalid.
> -
> @retval EFI_INVALID_PARAMETER "Address Range Length" is invalid for
> this PCI
> root bridge.
> -
> @retval EFI_INVALID_PARAMETER "Address Space Granularity" is invalid
> for
> this PCI root bridge.
> **/
> @@ -1172,21 +1122,16 @@ SubmitResources (
> @param[in] This Pointer to the
>
> EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL
> instance.
> -
> @param[in] RootBridgeHandle The PCI root bridge handle. Type
> EFI_HANDLE is
> defined in InstallProtocolInterface() in the
> UEFI 2.0 Specification.
> -
> @param[out] Configuration The pointer to the pointer to the PCI I/O and
> memory resource descriptor.
>
> @retval EFI_SUCCESS The requested parameters were returned.
> -
> @retval EFI_INVALID_PARAMETER RootBridgeHandle is not a valid root
> bridge
> handle.
> -
> @retval EFI_DEVICE_ERROR Programming failed due to a hardware
> error.
> -
> @retval EFI_OUT_OF_RESOURCES The request could not be completed
> due to a
> lack of resources.
> **/
> @@ -1362,11 +1307,9 @@ GetProposedResources (
> @param This Pointer to the
> EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL
> instance.
> -
> @param RootBridgeHandle The associated PCI root bridge handle. Type
> EFI_HANDLE is defined in InstallProtocolInterface()
> in the UEFI 2.0 Specification.
> -
> @param PciAddress The address of the PCI device on the PCI bus. This
> address can be passed to the
> EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL member functions to
> @@ -1374,18 +1317,14 @@ GetProposedResources (
> See Table 12-1 in the UEFI 2.0 Specification for the
> definition of
> EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_PCI_ADDRESS.
> -
> @param Phase The phase of the PCI device enumeration.
>
> @retval EFI_SUCCESS The requested parameters were returned.
> -
> @retval EFI_INVALID_PARAMETER RootBridgeHandle is not a valid root
> bridge
> handle.
> -
> @retval EFI_INVALID_PARAMETER Phase is not a valid phase that is
> defined
> in
> EFI_PCI_CONTROLLER_RESOURCE_ALLOCATION_PHASE.
> -
> @retval EFI_DEVICE_ERROR Programming failed due to a hardware
> error.
> The PCI enumerator should not enumerate this
> device, including its child devices if it is
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/MdeModulePkg/Bus/Pci/Pc
> iHostBridgeDxe/PciHostBridge.h
> b/Platform/AMD/VanGoghBoard/Override/edk2/MdeModulePkg/Bus/Pci/Pc
> iHostBridgeDxe/PciHostBridge.h
> index a6a14e8bac..b13c8c1612 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/MdeModulePkg/Bus/Pci/Pc
> iHostBridgeDxe/PciHostBridge.h
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/MdeModulePkg/Bus/Pci/Pc
> iHostBridgeDxe/PciHostBridge.h
> @@ -1,28 +1,15 @@
> /** @file
> Implementation of PciHostBridge.h
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> -/** @file
> The Header file of the Pci Host Bridge Driver
>
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2008 - 2010, Intel Corporation. All rights reserved.<BR>
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> - This program and the accompanying materials are licensed and made
> available
> - under the terms and conditions of the BSD License which 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.
> **/
>
> -#ifndef _PCI_HOST_BRIDGE_H_
> -#define _PCI_HOST_BRIDGE_H_
> +#ifndef PCI_HOST_BRIDGE_H__
> +#define PCI_HOST_BRIDGE_H__
>
> #include <PiDxe.h>
>
> @@ -164,7 +151,6 @@ typedef struct {
>
> @param[in] This The instance pointer of
>
> EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL
> -
> @param[in] Phase The phase during enumeration
>
> @retval EFI_NOT_READY This phase cannot be entered at this time.
> For
> @@ -215,7 +201,6 @@ NotifyPhase (
>
> @param[in] This The instance pointer of
>
> EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL
> -
> @param[in, out] RootBridgeHandle Returns the device handle of the next
> PCI
> root bridge.
>
> @@ -278,13 +263,11 @@ GetNextRootBridge (
>
> @param[in] This The instance pointer of
>
> EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL
> -
> @param[in] RootBridgeHandle The device handle of the PCI root bridge
> in
> which the caller is interested. Type
> EFI_HANDLE is defined in
> InstallProtocolInterface() in the UEFI 2.0
> Specification.
> -
> @param[out] Attributes The pointer to attribte of root bridge, it is
> output parameter
>
> @@ -313,9 +296,7 @@ GetAttributes (
> @param[in] This The
>
> EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL
> instance.
> -
> @param[in] RootBridgeHandle The PCI Root Bridge to be set up.
> -
> @param[out] Configuration Pointer to the pointer to the PCI bus
> resource
> descriptor.
>
> @@ -345,10 +326,8 @@ StartBusEnumeration (
> @param[in] This The
>
> EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL
> instance
> -
> @param[in] RootBridgeHandle The PCI Root Bridge whose bus range is to
> be
> programmed
> -
> @param[in] Configuration The pointer to the PCI bus resource descriptor
>
> @retval EFI_INVALID_PARAMETER RootBridgeHandle is not a valid root
> bridge
> @@ -400,10 +379,8 @@ SetBusNumbers (
> @param[in] This Pointer to the
>
> EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL
> instance.
> -
> @param[in] RootBridgeHandle The PCI root bridge whose I/O and memory
> resource requirements are being submitted.
> -
> @param[in] Configuration The pointer to the PCI I/O and PCI memory
> resource descriptor.
>
> @@ -455,11 +432,9 @@ SubmitResources (
> @param[in] This Pointer to the
>
> EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL
> instance.
> -
> @param[in] RootBridgeHandle The PCI root bridge handle. Type
> EFI_HANDLE is
> defined in InstallProtocolInterface() in the
> UEFI 2.0 Specification.
> -
> @param[out] Configuration The pointer to the pointer to the PCI I/O and
> memory resource descriptor.
>
> @@ -494,11 +469,9 @@ GetProposedResources (
> @param This Pointer to the
> EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL
> instance.
> -
> @param RootBridgeHandle The associated PCI root bridge handle. Type
> EFI_HANDLE is defined in InstallProtocolInterface()
> in the UEFI 2.0 Specification.
> -
> @param PciAddress The address of the PCI device on the PCI bus. This
> address can be passed to the
> EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL member functions to
> @@ -506,7 +479,6 @@ GetProposedResources (
> See Table 12-1 in the UEFI 2.0 Specification for the
> definition of
> EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_PCI_ADDRESS.
> -
> @param Phase The phase of the PCI device enumeration.
>
> @retval EFI_SUCCESS The requested parameters were returned.
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/MdeModulePkg/Bus/Pci/Pc
> iHostBridgeDxe/PciHostBridge.uni
> b/Platform/AMD/VanGoghBoard/Override/edk2/MdeModulePkg/Bus/Pci/Pc
> iHostBridgeDxe/PciHostBridge.uni
> index
> 9b5bedb8fcb24ebee1ec579df5b028b9cfc5a995..311a1c450d0faa5317ad3b25
> 4390f866e813e712 100644
> GIT binary patch
> delta 29
> lcmew-+{HDaXfhM?iHVb%CRRyIKE>QIS&p${^9gn{CIGrD3!DG|
>
> literal 2558
> zcmdUwU2hUW6o${WiT`0jZ`72f8ZS&^jI^L7)j|r5dS!qD-
> Gq;ZkJkQq^?A=SyM<um
> zg%>uP-
> I+Oa<~?WL^Rd5vR;*%y_XSU|_cpZD#x}60_5`W+8aA<OmramQZE0QJ)Mm^B
> z-yz?Y^^u&gTCjIyb5@r&LO-
> z;dTEYV;2xuWZFjCavMbI7duGS>obi<%@V;hN1?L8f
> zQ!EUa2m1_KpHnmDHDouw9$<MNNy9Z0KRL$ha1VdsD`^gp-Z)-jZ}Ios-
> tF+P&An>&
> z)ynp1ZDZ<Z%UHSOw75u}G2tD8eq?P<l<~dHO~&}WTAye+YuTB|K^%j#UvUo#
> SqDy1
> zPKP`ufwg!TgDU&l>%)WQiiB7nxlR|IG28|iURjU1kgoj3!6TwGbM}`mm5rI7nc1x)
> zjM&pDv7X&J$r*Y$U*xy^>2c$QBV>Lr-
> Qp0bFy(vtU}h~n!d>))GUaB<ORWaXV=gN9
> zj)_Oevrkbd@-
> M)SR*LqVY>fQIG1z1CcX!?N^SU{(H?UFWRTaIYieg<T0;&ih%*hOW
> zi(39SHB)5mHRv-
> UB^wj0s)kj+G2@g6%3gIB?cJ@T9FWK>#VchtCgMf3x=57;o4G06
> zh_BOGMRdJ$sGoJc26Rr{Xgl{aTNBU8h$7FVnR<<Du8hsPUA#e7?P04s6u#bi1^
> 4;N
> zyUp9C+(L-
> L%Bozp)ID|U9)89itGE<dI%Fs7Yx4RBTH9W2GLx~XPSA7SROcB7@@aXG
> zS#{tgu{iX;uil(hzVzo_vk7PCM6|NS{sKu4-!I9!P3s9LSG<vvIO;wpR>!Lry|-x}
> z`Bv%d>fdd?H6J@j8&vZJ+I3`s*%@OUd4W(wp+RQX(P%qzlbQY>`j!}lEA$fMk*~
> Gd
> z&wUH_g?;(ebc<S7u_VvVkT*aTM$@gIvy$(U$z}&F>BwrP^#NU-{Kk07jyzW-
> *4I|D
> zTh#f#M4SS>0T(UuN;YddyO#df#UDew?&aB|UK#L0{Cx+h3C0CzbyijXM`@=DT
> OIWN
> z^z3=v2x~>A=wBW@Bg$aO(-Nou-
> %elhxc)sa%BnVuDC1grBzJN1xOqv4n^@8N8}Q<j
> As{jB1
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/MdeModulePkg/Bus/Pci/Pc
> iHostBridgeDxe/PciHostBridgeDxe.inf
> b/Platform/AMD/VanGoghBoard/Override/edk2/MdeModulePkg/Bus/Pci/Pc
> iHostBridgeDxe/PciHostBridgeDxe.inf
> index ac1d1e8afc..05eec84d7e 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/MdeModulePkg/Bus/Pci/Pc
> iHostBridgeDxe/PciHostBridgeDxe.inf
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/MdeModulePkg/Bus/Pci/Pc
> iHostBridgeDxe/PciHostBridgeDxe.inf
> @@ -1,25 +1,11 @@
> ## @file
> # Platform Boot Manager Lib Module
> -#
> -# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -# SPDX-License-Identifier: BSD-2-Clause-Patent
> -#
> -##
> -# This file includes code originally published under the following license.
> -## @file
> # The basic interfaces implementation to a single segment PCI Host Bridge
> # driver.
> #
> -# Copyright (c) 2008 - 2014, 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 which 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.
> +# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> +# Copyright (c) 2008 - 2014, Intel Corporation. All rights reserved.<BR>
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/MdeModulePkg/Bus/Pci/Pc
> iHostBridgeDxe/PciHostBridgeExtra.uni
> b/Platform/AMD/VanGoghBoard/Override/edk2/MdeModulePkg/Bus/Pci/Pc
> iHostBridgeDxe/PciHostBridgeExtra.uni
> index
> 98b82859a26c32373a70cc7ba24082e60c51f8de..819a077f54064dbbd5e260a
> aecdb4615149eee47 100644
> GIT binary patch
> delta 25
> hcmeyxw~K8;&Ey!ShKX~UCLdv%G+BeOV)6;LO#qXp3nu^o
>
> literal 1914
> zcmb`IT~8BH5QgX4#Q$&tH)?3{>xvj7&{Z0RHZ4TFBHL2RCM`>rwunDoecstUyO
> e-e
> zrrGl`XXc$b@64J0`Mqu17WiKA3--
> w_EVG$S?72Nds<W=m?b>B?<X5(^lrOWKbzr<;
> z?AsX00lOQ{_N-ucZd3FV`-!B$rfo|svKqPZu#erf-MQ7&F3}J6!uIVY^ILn(_ny@*
> zh%0ce@HJr_>=3juRypeqvX$>A#IS{=>zZx1oDqMxhkxTcX-<%?9ItI3h<solABk|t
> z4Lf#fE&EpaxN_STUe2)=E17dAydBW@Y=}jR*jwCWM%>HFqVN2bHj#rk2hYQ{
> N6^TQ
> z;UvR4)Y%E_#ls9#`PbPP9<)|Y#Q)TFQgmi;8(?^8Bi2H?^cx4yh-?bZ7cP~L+--8Z
> zb%ZHrvJ&g%t=lz2|E`>;t0KT-4x*yV>{k`d&?`kZoBEBEYvoz>A%>sg?D6^;*Y)$p
> z-
> qjT$6xD)k3OLc&)bszTmL^}<py%91KIV9hH;P=RaG<>Dh3V|BW_<2ZDKi<X8GJP
> L
> zkRnx{*Rvv~BEGE4T1frP=uM}dec9<9KFqp!DTqUr6j2nJG&8Smt#w+y_;`b|&Xv
> #m
> z71G3d>$N*(6z=+MGkgkBSY>_7mpX`UJtEH7XOx#<;#Kiqa8kZ#MXmnwFsgNC0
> {2S&
> z4U8)Lyy8GHE$%U^-
> m@SVJKp=$mCBlzenIpTx|k|v%K5sF8zduQKj*!#pR_@_<cpld
> zS@$`hKdO5UtY=>scj;;BTtmi=&&No+bdwXb6J&wa5p#mPL1?njrLq$=hK}50rO
> v5w
> zgITyj-(cSJy>?r5Y{9;BuDE*cQTtsyDY7HvT~LM5bMFIoid{1KJVr}8@>*(rMpu?U
> zn7?wO$km&Z%1e2Rgw7gq8uTt)^r<WP?7(~EEzS>n<z`(u>K}m!#NAoNZXc9EeS
> <Tw
> zd!U|xpP+L@l!vT@z3Fd77)z={|6#$apoR9(H8#N9C$3Qc<B84YKTo+k1x>T0`hO
> |l
> IT<G!p3rwXcGynhq
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/MdeModulePkg/Bus/Pci/Pc
> iHostBridgeDxe/PciRootBridgeIo.c
> b/Platform/AMD/VanGoghBoard/Override/edk2/MdeModulePkg/Bus/Pci/Pc
> iHostBridgeDxe/PciRootBridgeIo.c
> index 7349d0c291..b70e4745cc 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/MdeModulePkg/Bus/Pci/Pc
> iHostBridgeDxe/PciRootBridgeIo.c
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/MdeModulePkg/Bus/Pci/Pc
> iHostBridgeDxe/PciRootBridgeIo.c
> @@ -1,24 +1,11 @@
> /** @file
> Implementation of PciRootBridgeIo.c
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> -/** @file
> PCI Root Bridge Io Protocol implementation
>
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2008 - 2012, Intel Corporation. All rights reserved.<BR>
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> - This program and the accompanying materials are licensed and made
> available
> - under the terms and conditions of the BSD License which 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.
> **/
>
> #include "PciHostBridge.h"
> @@ -57,35 +44,25 @@ RESOURCE_CONFIGURATION Configuration = {
> is equal to Value.
>
> @param[in] This A pointer to the
> EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.
> -
> @param[in] Width Signifies the width of the memory operations.
> -
> @param[in] Address The base address of the memory operations. The
> caller
> is responsible for aligning Address if required.
> -
> @param[in] Mask Mask used for the polling criteria. Bytes above Width
> in Mask are ignored. The bits in the bytes below Width
> which are zero in Mask are ignored when polling the
> memory address.
> -
> @param[in] Value The comparison value used for the polling exit
> criteria.
> -
> @param[in] Delay The number of 100 ns units to poll. Note that timer
> available may be of poorer granularity.
> -
> @param[out] Result Pointer to the last value read from the memory
> location.
>
> @retval EFI_SUCCESS The last data returned from the access matched
> the poll exit criteria.
> -
> @retval EFI_INVALID_PARAMETER Width is invalid.
> -
> @retval EFI_INVALID_PARAMETER Result is NULL.
> -
> @retval EFI_TIMEOUT Delay expired before a match occurred.
> -
> @retval EFI_OUT_OF_RESOURCES The request could not be completed
> due to a
> lack of resources.
> **/
> @@ -113,34 +90,23 @@ RootBridgeIoPollMem (
> Value.
>
> @param[in] This A pointer to the EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.
> -
> @param[in] Width Signifies the width of the I/O operations.
> -
> @param[in] Address The base address of the I/O operations. The caller is
> responsible for aligning Address if required.
> -
> @param[in] Mask Mask used for the polling criteria. Bytes above Width
> in
> Mask are ignored. The bits in the bytes below Width
> which are zero in Mask are ignored when polling the I/O
> address.
> -
> @param[in] Value The comparison value used for the polling exit criteria.
> -
> -
> @param[in] Delay The number of 100 ns units to poll. Note that timer
> available may be of poorer granularity.
> -
> @param[out] Result Pointer to the last value read from the memory
> location.
>
> @retval EFI_SUCCESS The last data returned from the access matched
> the poll exit criteria.
> -
> @retval EFI_INVALID_PARAMETER Width is invalid.
> -
> @retval EFI_INVALID_PARAMETER Result is NULL.
> -
> @retval EFI_TIMEOUT Delay expired before a match occurred.
> -
> @retval EFI_OUT_OF_RESOURCES The request could not be completed
> due to a
> lack of resources.
> **/
> @@ -167,26 +133,19 @@ RootBridgeIoPollIo (
> PCI Root Bridge on a platform might require.
>
> @param[in] This A pointer to the
> EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.
> -
> @param[in] Width Signifies the width of the memory operation.
> -
> @param[in] Address The base address of the memory operation. The
> caller
> is responsible for aligning the Address if required.
> -
> @param[in] Count The number of memory operations to perform.
> Bytes
> moved is Width size * Count, starting at Address.
> -
> @param[out] Buffer For read operations, the destination buffer to store
> the results. For write operations, the source buffer
> to write data from.
>
> @retval EFI_SUCCESS The data was read from or written to the PCI
> root bridge.
> -
> @retval EFI_INVALID_PARAMETER Width is invalid for this PCI root bridge.
> -
> @retval EFI_INVALID_PARAMETER Buffer is NULL.
> -
> @retval EFI_OUT_OF_RESOURCES The request could not be completed
> due to a
> lack of resources.
> **/
> @@ -211,26 +170,19 @@ RootBridgeIoMemRead (
> PCI Root Bridge on a platform might require.
>
> @param[in] This A pointer to the
> EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.
> -
> @param[in] Width Signifies the width of the memory operation.
> -
> @param[in] Address The base address of the memory operation. The
> caller
> is responsible for aligning the Address if required.
> -
> @param[in] Count The number of memory operations to perform.
> Bytes
> moved is Width size * Count, starting at Address.
> -
> @param[in] Buffer For read operations, the destination buffer to store
> the results. For write operations, the source buffer
> to write data from.
>
> @retval EFI_SUCCESS The data was read from or written to the PCI
> root bridge.
> -
> @retval EFI_INVALID_PARAMETER Width is invalid for this PCI root bridge.
> -
> @retval EFI_INVALID_PARAMETER Buffer is NULL.
> -
> @retval EFI_OUT_OF_RESOURCES The request could not be completed
> due to a
> lack of resources.
> **/
> @@ -249,15 +201,11 @@ RootBridgeIoMemWrite (
> bridge I/O space.
>
> @param[in] This A pointer to the
> EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.
> -
> @param[in] Width Signifies the width of the memory operations.
> -
> @param[in] UserAddress The base address of the I/O operation. The
> caller is
> responsible for aligning the Address if required.
> -
> @param[in] Count The number of I/O operations to perform. Bytes
> moved
> is Width size * Count, starting at Address.
> -
> @param[out] UserBuffer For read operations, the destination buffer to
> store
> the results. For write operations, the source buffer
> to write data from.
> @@ -265,11 +213,8 @@ RootBridgeIoMemWrite (
>
> @retval EFI_SUCCESS The data was read from or written to the PCI
> root bridge.
> -
> @retval EFI_INVALID_PARAMETER Width is invalid for this PCI root bridge.
> -
> @retval EFI_INVALID_PARAMETER Buffer is NULL.
> -
> @retval EFI_OUT_OF_RESOURCES The request could not be completed
> due to a
> lack of resources.
> **/
> @@ -288,15 +233,11 @@ RootBridgeIoIoRead (
> bridge I/O space.
>
> @param[in] This A pointer to the
> EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.
> -
> @param[in] Width Signifies the width of the memory operations.
> -
> @param[in] UserAddress The base address of the I/O operation. The
> caller is
> responsible for aligning the Address if required.
> -
> @param[in] Count The number of I/O operations to perform. Bytes
> moved
> is Width size * Count, starting at Address.
> -
> @param[in] UserBuffer For read operations, the destination buffer to
> store
> the results. For write operations, the source buffer
> to write data from.
> @@ -304,11 +245,8 @@ RootBridgeIoIoRead (
>
> @retval EFI_SUCCESS The data was read from or written to the PCI
> root bridge.
> -
> @retval EFI_INVALID_PARAMETER Width is invalid for this PCI root bridge.
> -
> @retval EFI_INVALID_PARAMETER Buffer is NULL.
> -
> @retval EFI_OUT_OF_RESOURCES The request could not be completed
> due to a
> lack of resources.
> **/
> @@ -336,17 +274,13 @@ RootBridgeIoIoWrite (
>
> @param[in] This A pointer to the
> EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL
> instance.
> -
> @param[in] Width Signifies the width of the memory operations.
> -
> @param[in] DestAddress The destination address of the memory
> operation. The
> caller is responsible for aligning the DestAddress if
> required.
> -
> @param[in] SrcAddress The source address of the memory operation. The
> caller
> is responsible for aligning the SrcAddress if
> required.
> -
> @param[in] Count The number of memory operations to perform.
> Bytes
> moved is Width size * Count, starting at DestAddress
> and SrcAddress.
> @@ -354,9 +288,7 @@ RootBridgeIoIoWrite (
>
> @retval EFI_SUCCESS The data was copied from one memory region
> to another memory region.
> -
> @retval EFI_INVALID_PARAMETER Width is invalid for this PCI root bridge.
> -
> @retval EFI_OUT_OF_RESOURCES The request could not be completed
> due to a
> lack of resources.
> **/
> @@ -381,16 +313,12 @@ RootBridgeIoCopyMem (
> that a PCI Root Bridge on a platform might require.
>
> @param[in] This A pointer to the
> EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.
> -
> @param[in] Width Signifies the width of the memory operations.
> -
> @param[in] Address The address within the PCI configuration space for
> the
> PCI controller.
> -
> @param[in] Count The number of PCI configuration operations to
> perform.
> Bytes moved is Width size * Count, starting at
> Address.
> -
> @param[out] Buffer For read operations, the destination buffer to store
> the results. For write operations, the source buffer
> to write data from.
> @@ -398,11 +326,8 @@ RootBridgeIoCopyMem (
>
> @retval EFI_SUCCESS The data was read from or written to the PCI
> root bridge.
> -
> @retval EFI_INVALID_PARAMETER Width is invalid for this PCI root bridge.
> -
> @retval EFI_INVALID_PARAMETER Buffer is NULL.
> -
> @retval EFI_OUT_OF_RESOURCES The request could not be completed
> due to a
> lack of resources.
> **/
> @@ -427,16 +352,12 @@ RootBridgeIoPciRead (
> that a PCI Root Bridge on a platform might require.
>
> @param[in] This A pointer to the
> EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.
> -
> @param[in] Width Signifies the width of the memory operations.
> -
> @param[in] Address The address within the PCI configuration space for
> the
> PCI controller.
> -
> @param[in] Count The number of PCI configuration operations to
> perform.
> Bytes moved is Width size * Count, starting at
> Address.
> -
> @param[in] Buffer For read operations, the destination buffer to store
> the results. For write operations, the source buffer
> to write data from.
> @@ -444,11 +365,8 @@ RootBridgeIoPciRead (
>
> @retval EFI_SUCCESS The data was read from or written to the PCI
> root bridge.
> -
> @retval EFI_INVALID_PARAMETER Width is invalid for this PCI root bridge.
> -
> @retval EFI_INVALID_PARAMETER Buffer is NULL.
> -
> @retval EFI_OUT_OF_RESOURCES The request could not be completed
> due to a
> lack of resources.
> **/
> @@ -472,42 +390,29 @@ RootBridgeIoPciWrite (
>
> @param[in] This A pointer to the
> EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.
> -
> @param[in] Operation Indicates if the bus master is going to read
> or write to system memory.
> -
> @param[in] HostAddress The system memory address to map to the
> PCI
> controller.
> -
> @param[in, out] NumberOfBytes On input the number of bytes to map.
> On
> output the number of bytes that were mapped.
> -
> @param[out] DeviceAddress The resulting map address for the bus
> master
> PCI controller to use to access the system
> memory's HostAddress.
> -
> @param[out] Mapping The value to pass to Unmap() when the bus
> master DMA operation is complete.
>
> @retval EFI_SUCCESS The range was mapped for the returned
> NumberOfBytes.
> -
> @retval EFI_INVALID_PARAMETER Operation is invalid.
> -
> @retval EFI_INVALID_PARAMETER HostAddress is NULL.
> -
> @retval EFI_INVALID_PARAMETER NumberOfBytes is NULL.
> -
> @retval EFI_INVALID_PARAMETER DeviceAddress is NULL.
> -
> @retval EFI_INVALID_PARAMETER Mapping is NULL.
> -
> @retval EFI_UNSUPPORTED The HostAddress cannot be mapped as a
> common
> buffer.
> -
> @retval EFI_DEVICE_ERROR The system hardware could not map the
> requested address.
> -
> @retval EFI_OUT_OF_RESOURCES The request could not be completed
> due to a
> lack of resources.
> **/
> @@ -533,14 +438,11 @@ RootBridgeIoMap (
> Any resources used for the mapping are freed.
>
> @param[in] This A pointer to the EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.
> -
> @param[in] Mapping The mapping value returned from Map().
>
> @retval EFI_SUCCESS The range was unmapped.
> -
> @retval EFI_INVALID_PARAMETER Mapping is not a value that was
> returned by
> Map().
> -
> @retval EFI_DEVICE_ERROR The data was not committed to the target
> system memory.
> **/
> @@ -556,17 +458,12 @@ RootBridgeIoUnmap (
> or EfiPciOperationBusMasterCommonBuffer64 mapping.
>
> @param This A pointer to the EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.
> -
> @param Type This parameter is not used and must be ignored.
> -
> @param MemoryType The type of memory to allocate,
> EfiBootServicesData or
> EfiRuntimeServicesData.
> -
> @param Pages The number of pages to allocate.
> -
> @param HostAddress A pointer to store the base system memory address
> of the
> allocated range.
> -
> @param Attributes The requested bit mask of attributes for the allocated
> range. Only the attributes
> EFI_PCI_ATTRIBUTE_MEMORY_WRITE_COMBINE,
> @@ -575,15 +472,11 @@ RootBridgeIoUnmap (
> function.
>
> @retval EFI_SUCCESS The requested memory pages were allocated.
> -
> @retval EFI_INVALID_PARAMETER MemoryType is invalid.
> -
> @retval EFI_INVALID_PARAMETER HostAddress is NULL.
> -
> @retval EFI_UNSUPPORTED Attributes is unsupported. The only legal
> attribute bits are MEMORY_WRITE_COMBINE,
> MEMORY_CACHED, and DUAL_ADDRESS_CYCLE.
> -
> @retval EFI_OUT_OF_RESOURCES The memory pages could not be
> allocated.
> **/
> EFI_STATUS
> @@ -604,13 +497,10 @@ RootBridgeIoAllocateBuffer (
> AllocateBuffer().
>
> @param This A pointer to the EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.
> -
> @param Pages The number of pages to free.
> -
> @param HostAddress The base system memory address of the allocated
> range.
>
> @retval EFI_SUCCESS The requested memory pages were freed.
> -
> @retval EFI_INVALID_PARAMETER The memory range specified by
> HostAddress and
> Pages was not allocated with AllocateBuffer().
> **/
> @@ -640,7 +530,6 @@ RootBridgeIoFreeBuffer (
>
> @retval EFI_SUCCESS The PCI posted write transactions were flushed
> from the PCI host bridge to system memory.
> -
> @retval EFI_DEVICE_ERROR The PCI posted write transactions were not
> flushed
> from the PCI host bridge due to a hardware error.
> **/
> @@ -660,10 +549,8 @@ RootBridgeIoFlush (
> currently using.
>
> @param This A pointer to the EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.
> -
> @param Supported A pointer to the mask of attributes that this PCI root
> bridge supports setting with SetAttributes().
> -
> @param Attributes A pointer to the mask of attributes that this PCI root
> bridge is currently using.
>
> @@ -673,7 +560,6 @@ RootBridgeIoFlush (
> in Supports. If Attributes is not NULL, then
> the attributes that the PCI root bridge is
> currently using is returned in Attributes.
> -
> @retval EFI_INVALID_PARAMETER Both Supports and Attributes are NULL.
> **/
> EFI_STATUS
> @@ -699,7 +585,6 @@ RootBridgeIoGetAttributes (
>
> @param[in] This A pointer to the
> EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.
> -
> @param[in] Attributes The mask of attributes to set. If the
> attribute bit MEMORY_WRITE_COMBINE,
> MEMORY_CACHED, or MEMORY_DISABLE is set,
> @@ -713,17 +598,14 @@ RootBridgeIoGetAttributes (
> @param[in, out] ResourceBase A pointer to the base address of the
> resource range to be modified by the
> attributes specified by Attributes.
> -
> @param[in, out] ResourceLength A pointer to the length of the resource
> range to be modified by the attributes
> specified by Attributes.
>
> @retval EFI_SUCCESS The current configuration of this PCI root bridge
> was returned in Resources.
> -
> @retval EFI_UNSUPPORTED The current configuration of this PCI root
> bridge
> could not be retrieved.
> -
> @retval EFI_INVALID_PARAMETER Invalid pointer of
> EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL
>
> @@ -750,7 +632,6 @@ RootBridgeIoSetAttributes (
> or more QWORD Address Space Descriptors followed by an End Tag.
>
> @param[in] This A pointer to the
> EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.
> -
> @param[out] Resources A pointer to the ACPI 2.0 resource descriptors
> that
> describe the current configuration of this PCI root
> bridge. The storage for the ACPI 2.0 resource
> @@ -761,10 +642,8 @@ RootBridgeIoSetAttributes (
>
> @retval EFI_SUCCESS The current configuration of this PCI root bridge
> was returned in Resources.
> -
> @retval EFI_UNSUPPORTED The current configuration of this PCI root
> bridge
> could not be retrieved.
> -
> @retval EFI_INVALID_PARAMETER Invalid pointer of
> EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL
> **/
> @@ -820,11 +699,8 @@ UINT8 mOutStride[] = {
> Construct the Pci Root Bridge Io protocol
>
> @param Protocol Point to protocol instance
> -
> @param HostBridgeHandle Handle of host bridge
> -
> @param Attri Attribute of host bridge
> -
> @param ResAperture ResourceAperture for host bridge
>
> @retval EFI_SUCCESS Success to initialize the Pci Root Bridge.
> @@ -935,30 +811,21 @@ RootBridgeConstructor (
> hand, will be handled by the driver.
>
> @param[in] This A pointer to the
> EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.
> -
> @param[in] OperationType I/O operation type: IO/MMIO/PCI.
> -
> @param[in] Width Signifies the width of the I/O or Memory operation.
> -
> @param[in] Address The base address of the I/O operation.
> -
> @param[in] Count The number of I/O operations to perform. The
> number
> of bytes moved is Width size * Count, starting at
> Address.
> -
> @param[in] Buffer For read operations, the destination buffer to
> store the results. For write operations, the source
> buffer from which to write data.
>
> @retval EFI_SUCCESS The parameters for this request pass the
> checks.
> -
> @retval EFI_INVALID_PARAMETER Width is invalid for this PI system.
> -
> @retval EFI_INVALID_PARAMETER Buffer is NULL.
> -
> @retval EFI_UNSUPPORTED The Buffer is not aligned for the given
> Width.
> -
> @retval EFI_UNSUPPORTED The address range specified by Address,
> Width,
> and Count is not valid for this PI system.
> **/
> @@ -1089,29 +956,21 @@ RootBridgeIoCheckParameter (
> Internal help function for read and write memory space.
>
> @param[in] This A pointer to the
> EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.
> -
> @param[in] Write Switch value for Read or Write.
> -
> @param[in] Width Signifies the width of the memory operations.
> -
> @param[in] UserAddress The address within the PCI configuration space
> for
> the PCI controller.
> -
> @param[in] Count The number of PCI configuration operations to
> perform. Bytes moved is Width size * Count,
> starting at Address.
> -
> @param[in, out] UserBuffer For read operations, the destination buffer to
> store the results. For write operations, the
> source buffer to write data from.
>
> @retval EFI_SUCCESS The data was read from or written to the PCI
> root bridge.
> -
> @retval EFI_INVALID_PARAMETER Width is invalid for this PCI root bridge.
> -
> @retval EFI_INVALID_PARAMETER Buffer is NULL.
> -
> @retval EFI_OUT_OF_RESOURCES The request could not be completed
> due to a
> lack of resources.
> **/
> @@ -1204,18 +1063,13 @@ RootBridgeIoMemRW (
> Internal help function for read and write IO space.
>
> @param[in] This A pointer to the
> EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.
> -
> @param[in] Write Switch value for Read or Write.
> -
> @param[in] Width Signifies the width of the memory operations.
> -
> @param[in] UserAddress The address within the PCI configuration space
> for
> the PCI controller.
> -
> @param[in] Count The number of PCI configuration operations to
> perform. Bytes moved is Width size * Count,
> starting at Address.
> -
> @param[in, out] UserBuffer For read operations, the destination buffer to
> store the results. For write operations, the
> source buffer to write data from.
> @@ -1223,11 +1077,8 @@ RootBridgeIoMemRW (
>
> @retval EFI_SUCCESS The data was read from or written to the PCI
> root bridge.
> -
> @retval EFI_INVALID_PARAMETER Width is invalid for this PCI root bridge.
> -
> @retval EFI_INVALID_PARAMETER Buffer is NULL.
> -
> @retval EFI_OUT_OF_RESOURCES The request could not be completed
> due to a
> lack of resources.
> **/
> @@ -1360,18 +1211,13 @@ RootBridgeIoIoRW (
> Internal help function for read and write PCI configuration space.
>
> @param[in] This A pointer to the
> EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.
> -
> @param[in] Write Switch value for Read or Write.
> -
> @param[in] Width Signifies the width of the memory operations.
> -
> @param[in] UserAddress The address within the PCI configuration space
> for
> the PCI controller.
> -
> @param[in] Count The number of PCI configuration operations to
> perform. Bytes moved is Width size * Count,
> starting at Address.
> -
> @param[in, out] UserBuffer For read operations, the destination buffer to
> store the results. For write operations, the
> source buffer to write data from.
> @@ -1379,11 +1225,8 @@ RootBridgeIoIoRW (
>
> @retval EFI_SUCCESS The data was read from or written to the PCI
> root bridge.
> -
> @retval EFI_INVALID_PARAMETER Width is invalid for this PCI root bridge.
> -
> @retval EFI_INVALID_PARAMETER Buffer is NULL.
> -
> @retval EFI_OUT_OF_RESOURCES The request could not be completed
> due to a
> lack of resources.
> **/
> @@ -1491,35 +1334,25 @@ RootBridgeIoPciRW (
> is equal to Value.
>
> @param[in] This A pointer to the
> EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.
> -
> @param[in] Width Signifies the width of the memory operations.
> -
> @param[in] Address The base address of the memory operations. The
> caller
> is responsible for aligning Address if required.
> -
> @param[in] Mask Mask used for the polling criteria. Bytes above Width
> in Mask are ignored. The bits in the bytes below Width
> which are zero in Mask are ignored when polling the
> memory address.
> -
> @param[in] Value The comparison value used for the polling exit
> criteria.
> -
> @param[in] Delay The number of 100 ns units to poll. Note that timer
> available may be of poorer granularity.
> -
> @param[out] Result Pointer to the last value read from the memory
> location.
>
> @retval EFI_SUCCESS The last data returned from the access matched
> the poll exit criteria.
> -
> @retval EFI_INVALID_PARAMETER Width is invalid.
> -
> @retval EFI_INVALID_PARAMETER Result is NULL.
> -
> @retval EFI_TIMEOUT Delay expired before a match occurred.
> -
> @retval EFI_OUT_OF_RESOURCES The request could not be completed
> due to a
> lack of resources.
> **/
> @@ -1614,33 +1447,23 @@ RootBridgeIoPollMem (
> expired, or (Result & Mask) is equal to Value.
>
> @param[in] This A pointer to the EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.
> -
> @param[in] Width Signifies the width of the I/O operations.
> -
> @param[in] Address The base address of the I/O operations. The caller is
> responsible for aligning Address if required.
> -
> @param[in] Mask Mask used for the polling criteria. Bytes above Width
> in
> Mask are ignored. The bits in the bytes below Width
> which are zero in Mask are ignored when polling the I/O
> address.
> -
> @param[in] Value The comparison value used for the polling exit criteria.
> -
> @param[in] Delay The number of 100 ns units to poll. Note that timer
> available may be of poorer granularity.
> -
> @param[out] Result Pointer to the last value read from the memory
> location.
>
> @retval EFI_SUCCESS The last data returned from the access matched
> the poll exit criteria.
> -
> @retval EFI_INVALID_PARAMETER Width is invalid.
> -
> @retval EFI_INVALID_PARAMETER Result is NULL.
> -
> @retval EFI_TIMEOUT Delay expired before a match occurred.
> -
> @retval EFI_OUT_OF_RESOURCES The request could not be completed
> due to a
> lack of resources.
> **/
> @@ -1732,26 +1555,19 @@ RootBridgeIoPollIo (
> PCI Root Bridge on a platform might require.
>
> @param[in] This A pointer to the
> EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.
> -
> @param[in] Width Signifies the width of the memory operation.
> -
> @param[in] Address The base address of the memory operation. The
> caller
> is responsible for aligning the Address if required.
> -
> @param[in] Count The number of memory operations to perform.
> Bytes
> moved is Width size * Count, starting at Address.
> -
> @param[out] Buffer For read operations, the destination buffer to store
> the results. For write operations, the source buffer
> to write data from.
>
> @retval EFI_SUCCESS The data was read from or written to the PCI
> root bridge.
> -
> @retval EFI_INVALID_PARAMETER Width is invalid for this PCI root bridge.
> -
> @retval EFI_INVALID_PARAMETER Buffer is NULL.
> -
> @retval EFI_OUT_OF_RESOURCES The request could not be completed
> due to a
> lack of resources.
> **/
> @@ -1779,26 +1595,19 @@ RootBridgeIoMemRead (
> PCI Root Bridge on a platform might require.
>
> @param[in] This A pointer to the
> EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.
> -
> @param[in] Width Signifies the width of the memory operation.
> -
> @param[in] Address The base address of the memory operation. The
> caller
> is responsible for aligning the Address if required.
> -
> @param[in] Count The number of memory operations to perform.
> Bytes
> moved is Width size * Count, starting at Address.
> -
> @param[in] Buffer For read operations, the destination buffer to store
> the results. For write operations, the source buffer
> to write data from.
>
> @retval EFI_SUCCESS The data was read from or written to the PCI
> root bridge.
> -
> @retval EFI_INVALID_PARAMETER Width is invalid for this PCI root bridge.
> -
> @retval EFI_INVALID_PARAMETER Buffer is NULL.
> -
> @retval EFI_OUT_OF_RESOURCES The request could not be completed
> due to a
> lack of resources.
> **/
> @@ -1820,15 +1629,11 @@ RootBridgeIoMemWrite (
> bridge I/O space.
>
> @param[in] This A pointer to the
> EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.
> -
> @param[in] Width Signifies the width of the memory operations.
> -
> @param[in] Address The base address of the I/O operation. The caller
> is
> responsible for aligning the Address if required.
> -
> @param[in] Count The number of I/O operations to perform. Bytes
> moved
> is Width size * Count, starting at Address.
> -
> @param[out] Buffer For read operations, the destination buffer to store
> the results. For write operations, the source buffer
> to write data from.
> @@ -1836,11 +1641,8 @@ RootBridgeIoMemWrite (
>
> @retval EFI_SUCCESS The data was read from or written to the PCI
> root bridge.
> -
> @retval EFI_INVALID_PARAMETER Width is invalid for this PCI root bridge.
> -
> @retval EFI_INVALID_PARAMETER Buffer is NULL.
> -
> @retval EFI_OUT_OF_RESOURCES The request could not be completed
> due to a
> lack of resources.
> **/
> @@ -1862,26 +1664,19 @@ RootBridgeIoIoRead (
> bridge I/O space.
>
> @param[in] This A pointer to the
> EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.
> -
> @param[in] Width Signifies the width of the memory operations.
> -
> @param[in] Address The base address of the I/O operation. The caller
> is
> responsible for aligning the Address if required.
> -
> @param[in] Count The number of I/O operations to perform. Bytes
> moved
> is Width size * Count, starting at Address.
> -
> @param[in] Buffer For read operations, the destination buffer to store
> the results. For write operations, the source buffer
> to write data from.
>
> @retval EFI_SUCCESS The data was read from or written to the PCI
> root bridge.
> -
> @retval EFI_INVALID_PARAMETER Width is invalid for this PCI root bridge.
> -
> @retval EFI_INVALID_PARAMETER Buffer is NULL.
> -
> @retval EFI_OUT_OF_RESOURCES The request could not be completed
> due to a
> lack of resources.
> **/
> @@ -1912,26 +1707,20 @@ RootBridgeIoIoWrite (
>
> @param[in] This A pointer to the
> EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL
> instance.
> -
> @param[in] Width Signifies the width of the memory operations.
> -
> @param[in] DestAddress The destination address of the memory
> operation. The
> caller is responsible for aligning the DestAddress if
> required.
> -
> @param[in] SrcAddress The source address of the memory operation. The
> caller
> is responsible for aligning the SrcAddress if
> required.
> -
> @param[in] Count The number of memory operations to perform.
> Bytes
> moved is Width size * Count, starting at DestAddress
> and SrcAddress.
>
> @retval EFI_SUCCESS The data was copied from one memory region
> to another memory region.
> -
> @retval EFI_INVALID_PARAMETER Width is invalid for this PCI root bridge.
> -
> @retval EFI_OUT_OF_RESOURCES The request could not be completed
> due to a
> lack of resources.
> **/
> @@ -2016,27 +1805,20 @@ RootBridgeIoCopyMem (
> that a PCI Root Bridge on a platform might require.
>
> @param[in] This A pointer to the
> EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.
> -
> @param[in] Width Signifies the width of the memory operations.
> -
> @param[in] Address The address within the PCI configuration space for
> the
> PCI controller.
> -
> @param[in] Count The number of PCI configuration operations to
> perform.
> Bytes moved is Width size * Count, starting at
> Address.
> -
> @param[out] Buffer For read operations, the destination buffer to store
> the results. For write operations, the source buffer
> to write data from.
>
> @retval EFI_SUCCESS The data was read from or written to the PCI
> root bridge.
> -
> @retval EFI_INVALID_PARAMETER Width is invalid for this PCI root bridge.
> -
> @retval EFI_INVALID_PARAMETER Buffer is NULL.
> -
> @retval EFI_OUT_OF_RESOURCES The request could not be completed
> due to a
> lack of resources.
> **/
> @@ -2064,27 +1846,20 @@ RootBridgeIoPciRead (
> that a PCI Root Bridge on a platform might require.
>
> @param[in] This A pointer to the
> EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.
> -
> @param[in] Width Signifies the width of the memory operations.
> -
> @param[in] Address The address within the PCI configuration space for
> the
> PCI controller.
> -
> @param[in] Count The number of PCI configuration operations to
> perform.
> Bytes moved is Width size * Count, starting at
> Address.
> -
> @param[in] Buffer For read operations, the destination buffer to store
> the results. For write operations, the source buffer
> to write data from.
>
> @retval EFI_SUCCESS The data was read from or written to the PCI
> root bridge.
> -
> @retval EFI_INVALID_PARAMETER Width is invalid for this PCI root bridge.
> -
> @retval EFI_INVALID_PARAMETER Buffer is NULL.
> -
> @retval EFI_OUT_OF_RESOURCES The request could not be completed
> due to a
> lack of resources.
> **/
> @@ -2111,42 +1886,29 @@ RootBridgeIoPciWrite (
>
> @param[in] This A pointer to the
> EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.
> -
> @param[in] Operation Indicates if the bus master is going to read
> or write to system memory.
> -
> @param[in] HostAddress The system memory address to map to the
> PCI
> controller.
> -
> @param[in, out] NumberOfBytes On input the number of bytes to map.
> On
> output the number of bytes that were mapped.
> -
> @param[out] DeviceAddress The resulting map address for the bus
> master
> PCI controller to use to access the system
> memory's HostAddress.
> -
> @param[out] Mapping The value to pass to Unmap() when the bus
> master DMA operation is complete.
>
> @retval EFI_SUCCESS The range was mapped for the returned
> NumberOfBytes.
> -
> @retval EFI_INVALID_PARAMETER Operation is invalid.
> -
> @retval EFI_INVALID_PARAMETER HostAddress is NULL.
> -
> @retval EFI_INVALID_PARAMETER NumberOfBytes is NULL.
> -
> @retval EFI_INVALID_PARAMETER DeviceAddress is NULL.
> -
> @retval EFI_INVALID_PARAMETER Mapping is NULL.
> -
> @retval EFI_UNSUPPORTED The HostAddress cannot be mapped as a
> common
> buffer.
> -
> @retval EFI_DEVICE_ERROR The system hardware could not map the
> requested address.
> -
> @retval EFI_OUT_OF_RESOURCES The request could not be completed
> due to a
> lack of resources.
> **/
> @@ -2285,14 +2047,11 @@ RootBridgeIoMap (
> Any resources used for the mapping are freed.
>
> @param[in] This A pointer to the EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.
> -
> @param[in] Mapping The mapping value returned from Map().
>
> @retval EFI_SUCCESS The range was unmapped.
> -
> @retval EFI_INVALID_PARAMETER Mapping is not a value that was
> returned by
> Map().
> -
> @retval EFI_DEVICE_ERROR The data was not committed to the target
> system memory.
> **/
> @@ -2346,17 +2105,12 @@ RootBridgeIoUnmap (
> or EfiPciOperationBusMasterCommonBuffer64 mapping.
>
> @param This A pointer to the EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.
> -
> @param Type This parameter is not used and must be ignored.
> -
> @param MemoryType The type of memory to allocate,
> EfiBootServicesData or
> EfiRuntimeServicesData.
> -
> @param Pages The number of pages to allocate.
> -
> @param HostAddress A pointer to store the base system memory address
> of the
> allocated range.
> -
> @param Attributes The requested bit mask of attributes for the allocated
> range. Only the attributes
> EFI_PCI_ATTRIBUTE_MEMORY_WRITE_COMBINE,
> @@ -2365,15 +2119,11 @@ RootBridgeIoUnmap (
> function.
>
> @retval EFI_SUCCESS The requested memory pages were allocated.
> -
> @retval EFI_INVALID_PARAMETER MemoryType is invalid.
> -
> @retval EFI_INVALID_PARAMETER HostAddress is NULL.
> -
> @retval EFI_UNSUPPORTED Attributes is unsupported. The only legal
> attribute bits are MEMORY_WRITE_COMBINE,
> MEMORY_CACHED, and DUAL_ADDRESS_CYCLE.
> -
> @retval EFI_OUT_OF_RESOURCES The memory pages could not be
> allocated.
> **/
> EFI_STATUS
> @@ -2441,13 +2191,10 @@ RootBridgeIoAllocateBuffer (
> AllocateBuffer().
>
> @param This A pointer to the EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.
> -
> @param Pages The number of pages to free.
> -
> @param HostAddress The base system memory address of the allocated
> range.
>
> @retval EFI_SUCCESS The requested memory pages were freed.
> -
> @retval EFI_INVALID_PARAMETER The memory range specified by
> HostAddress and
> Pages was not allocated with AllocateBuffer().
> **/
> @@ -2480,7 +2227,6 @@ RootBridgeIoFreeBuffer (
>
> @retval EFI_SUCCESS The PCI posted write transactions were flushed
> from the PCI host bridge to system memory.
> -
> @retval EFI_DEVICE_ERROR The PCI posted write transactions were not
> flushed
> from the PCI host bridge due to a hardware error.
> **/
> @@ -2506,10 +2252,8 @@ RootBridgeIoFlush (
> currently using.
>
> @param This A pointer to the EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.
> -
> @param Supported A pointer to the mask of attributes that this PCI root
> bridge supports setting with SetAttributes().
> -
> @param Attributes A pointer to the mask of attributes that this PCI root
> bridge is currently using.
>
> @@ -2518,7 +2262,6 @@ RootBridgeIoFlush (
> in Supports. If Attributes is not NULL, then
> the attributes that the PCI root bridge is
> currently using is returned in Attributes.
> -
> @retval EFI_INVALID_PARAMETER Both Supports and Attributes are NULL.
> **/
> EFI_STATUS
> @@ -2566,7 +2309,6 @@ RootBridgeIoGetAttributes (
>
> @param[in] This A pointer to the
> EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.
> -
> @param[in] Attributes The mask of attributes to set. If the
> attribute bit MEMORY_WRITE_COMBINE,
> MEMORY_CACHED, or MEMORY_DISABLE is set,
> @@ -2576,21 +2318,17 @@ RootBridgeIoGetAttributes (
> MEMORY_DISABLE are not set, then
> ResourceBase and ResourceLength are ignored,
> and may be NULL.
> -
> @param[in, out] ResourceBase A pointer to the base address of the
> resource range to be modified by the
> attributes specified by Attributes.
> -
> @param[in, out] ResourceLength A pointer to the length of the resource
> range to be modified by the attributes
> specified by Attributes.
>
> @retval EFI_SUCCESS The current configuration of this PCI root bridge
> was returned in Resources.
> -
> @retval EFI_UNSUPPORTED The current configuration of this PCI root
> bridge
> could not be retrieved.
> -
> @retval EFI_INVALID_PARAMETER Invalid pointer of
> EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL
> **/
> @@ -2639,7 +2377,6 @@ RootBridgeIoSetAttributes (
> or more QWORD Address Space Descriptors followed by an End Tag.
>
> @param[in] This A pointer to the
> EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL.
> -
> @param[out] Resources A pointer to the ACPI 2.0 resource descriptors
> that
> describe the current configuration of this PCI root
> bridge. The storage for the ACPI 2.0 resource
> @@ -2650,10 +2387,8 @@ RootBridgeIoSetAttributes (
>
> @retval EFI_SUCCESS The current configuration of this PCI root bridge
> was returned in Resources.
> -
> @retval EFI_UNSUPPORTED The current configuration of this PCI root
> bridge
> could not be retrieved.
> -
> @retval EFI_INVALID_PARAMETER Invalid pointer of
> EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL
> **/
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/MdeModulePkg/Universal/
> CapsuleRuntimeDxe/CapsuleService.c
> b/Platform/AMD/VanGoghBoard/Override/edk2/MdeModulePkg/Universal/
> CapsuleRuntimeDxe/CapsuleService.c
> index 45e9e40e2f..6915c054dd 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/MdeModulePkg/Universal/
> CapsuleRuntimeDxe/CapsuleService.c
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/MdeModulePkg/Universal/
> CapsuleRuntimeDxe/CapsuleService.c
> @@ -1,21 +1,12 @@
> -/** @file
> - Implements CapsuleService.c
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> Capsule Runtime Driver produces two UEFI capsule runtime services.
> (UpdateCapsule, QueryCapsuleCapabilities)
> It installs the Capsule Architectural Protocol defined in PI1.0a to signify
> the capsule runtime services are ready.
>
> -Copyright (c) 2006 - 2020, Intel Corporation. All rights reserved.<BR>
> -SPDX-License-Identifier: BSD-2-Clause-Patent
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> + Copyright (c) 2006 - 2020, Intel Corporation. All rights reserved.<BR>
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/MdeModulePkg/Universal/
> CapsuleRuntimeDxe/CapsuleService.h
> b/Platform/AMD/VanGoghBoard/Override/edk2/MdeModulePkg/Universal/
> CapsuleRuntimeDxe/CapsuleService.h
> index d5df075e46..fc6d831663 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/MdeModulePkg/Universal/
> CapsuleRuntimeDxe/CapsuleService.h
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/MdeModulePkg/Universal/
> CapsuleRuntimeDxe/CapsuleService.h
> @@ -1,19 +1,10 @@
> -/** @file
> - Implements CapsuleService.h
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> Capsule Runtime Driver produces two UEFI capsule runtime services.
> (UpdateCapsule, QueryCapsuleCapabilities)
> It installs the Capsule Architectural Protocol defined in PI1.0a to signify
> the capsule runtime services are ready.
>
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
> Copyright (c) 2018, Linaro, Ltd. All rights reserved.<BR>
>
> @@ -21,8 +12,8 @@
>
> **/
>
> -#ifndef _CAPSULE_SERVICE_H_
> -#define _CAPSULE_SERVICE_H_
> +#ifndef CAPSULE_SERVICE_H__
> +#define CAPSULE_SERVICE_H__
>
> #include <Uefi.h>
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/MdeModulePkg/Universal/
> PCD/Dxe/Pcd.c
> b/Platform/AMD/VanGoghBoard/Override/edk2/MdeModulePkg/Universal/
> PCD/Dxe/Pcd.c
> index cce92be6a6..5533786b2c 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/MdeModulePkg/Universal/
> PCD/Dxe/Pcd.c
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/MdeModulePkg/Universal/
> PCD/Dxe/Pcd.c
> @@ -1,18 +1,9 @@
> -/** @file
> - Implements Dxe Pcd.c
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> PCD DXE driver manage all PCD entry initialized in PEI phase and DXE phase,
> and
> produce the implementation of native PCD protocol and
> EFI_PCD_PROTOCOL defined in
> PI 1.4a Vol3.
>
> +Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> @@ -39,7 +30,7 @@ CheckPcdInFsp (
> && ( CompareGuid (InputGuid,
> &gEfiAmdAgesaModulePkgTokenSpaceGuid) // AgesaModulePkg
> || CompareGuid (InputGuid, &gEfiAmdAgesaPkgTokenSpaceGuid) //
> AgesaPkg
> || CompareGuid (InputGuid, &gAmdFspPkgGuid) // FspPkg
> - || CompareGuid (InputGuid, &gAmdCpmPkgTokenSpaceGuid)))
> // AmdCpmPkg
> + || CompareGuid (InputGuid, &gAmdCpmPkgTokenSpaceGuid))) //
> AmdCpmPkg
> {
> return TRUE;
> }
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/MdeModulePkg/Universal/
> PCD/Pei/Pcd.c
> b/Platform/AMD/VanGoghBoard/Override/edk2/MdeModulePkg/Universal/
> PCD/Pei/Pcd.c
> index 129f03e684..2a4045bd36 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/MdeModulePkg/Universal/
> PCD/Pei/Pcd.c
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/MdeModulePkg/Universal/
> PCD/Pei/Pcd.c
> @@ -1,16 +1,7 @@
> -/** @file
> - Implements PEI Pcd.c
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> All Pcd Ppi services are implemented here.
>
> +Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2006 - 2021, Intel Corporation. All rights reserved.<BR>
> (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
> @@ -30,11 +21,11 @@ CheckPcdInFsp (
> IN CONST EFI_GUID *InputGuid
> )
> {
> - if ((FixedPcdGet8 (PcdFspModeSelection) == 0) // Dispatch
> mode
> - && (CompareGuid (InputGuid,
> &gEfiAmdAgesaModulePkgTokenSpaceGuid) // AgesaModulePkg
> - || CompareGuid (InputGuid, &gEfiAmdAgesaPkgTokenSpaceGuid) //
> AgesaPkg
> - || CompareGuid (InputGuid, &gAmdFspPkgGuid) // FspPkg
> - || CompareGuid (InputGuid, &gAmdCpmPkgTokenSpaceGuid))) //
> AmdCpmPkg
> + if ( (FixedPcdGet8 (PcdFspModeSelection) == 0) // Dispatch
> mode
> + && ( CompareGuid (InputGuid,
> &gEfiAmdAgesaModulePkgTokenSpaceGuid) // AgesaModulePkg
> + || CompareGuid (InputGuid, &gEfiAmdAgesaPkgTokenSpaceGuid)
> // AgesaPkg
> + || CompareGuid (InputGuid, &gAmdFspPkgGuid) // FspPkg
> + || CompareGuid (InputGuid, &gAmdCpmPkgTokenSpaceGuid))) //
> AmdCpmPkg
> {
> return TRUE;
> }
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/MdePkg/Include/Register/I
> ntel/SmramSaveStateMap.h
> b/Platform/AMD/VanGoghBoard/Override/edk2/MdePkg/Include/Register/I
> ntel/SmramSaveStateMap.h
> index b6da9625d7..05487d75e9 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/MdePkg/Include/Register/I
> ntel/SmramSaveStateMap.h
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/MdePkg/Include/Register/I
> ntel/SmramSaveStateMap.h
> @@ -1,13 +1,3 @@
> -/** @file
> - Implements SmramSaveStateMap.h
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> SMRAM Save State Map Definitions.
>
> @@ -17,13 +7,14 @@ Intel(R) 64 and IA-32 Architectures Software
> Developer's Manual
> Volume 3C, Section 34.5 SMI Handler Execution Environment
> Volume 3C, Section 34.7 Managing Synchronous and Asynchronous SMIs
>
> +Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2015 - 2019, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> -#ifndef __INTEL_SMRAM_SAVE_STATE_MAP_H__
> -#define __INTEL_SMRAM_SAVE_STATE_MAP_H__
> +#ifndef INTEL_SMRAM_SAVE_STATE_MAP_H____
> +#define INTEL_SMRAM_SAVE_STATE_MAP_H____
> #define AMD_CPU 1
> ///
> /// Default SMBASE address
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/PcAtChipsetPkg/PcatRealTi
> meClockRuntimeDxe/PcRtc.c
> b/Platform/AMD/VanGoghBoard/Override/edk2/PcAtChipsetPkg/PcatRealTi
> meClockRuntimeDxe/PcRtc.c
> index 37ba9d8b5d..4e42d9d2ad 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/PcAtChipsetPkg/PcatRealTi
> meClockRuntimeDxe/PcRtc.c
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/PcAtChipsetPkg/PcatRealTi
> meClockRuntimeDxe/PcRtc.c
> @@ -1,27 +1,12 @@
> /** @file
> - Implements PcRtc.c
> + RTC Architectural Protocol GUID as defined in DxeCis 0.96.
>
> Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> + Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> -/* This file includes code originally published under the following license. */
> -
> -/** @file
> - RTC Architectural Protocol GUID as defined in DxeCis 0.96.
> -
> -Copyright (c) 2006 - 2016, 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
> -which 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.
> -
> -**/
> -
> #include "PcRtc.h"
>
> //
> @@ -1349,7 +1334,7 @@ PcRtcAcpiTableChangeCallback (
> if (!EFI_ERROR (Status)) {
> Century = (UINT8)(Time.Year / 100);
> Century = DecimalToBcd8 (Century);
> - DEBUG ((EFI_D_INFO, "PcRtc: Write 0x%x to CMOS location 0x%x\n",
> Century, mModuleGlobal.CenturyRtcAddress));
> + DEBUG ((DEBUG_INFO, "PcRtc: Write 0x%x to CMOS location 0x%x\n",
> Century, mModuleGlobal.CenturyRtcAddress));
> RtcWrite (mModuleGlobal.CenturyRtcAddress, Century);
> }
> }
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/PcAtChipsetPkg/PcatRealTi
> meClockRuntimeDxe/PcRtc.h
> b/Platform/AMD/VanGoghBoard/Override/edk2/PcAtChipsetPkg/PcatRealTi
> meClockRuntimeDxe/PcRtc.h
> index 15e2646040..159bebf309 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/PcAtChipsetPkg/PcatRealTi
> meClockRuntimeDxe/PcRtc.h
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/PcAtChipsetPkg/PcatRealTi
> meClockRuntimeDxe/PcRtc.h
> @@ -1,29 +1,14 @@
> /** @file
> - Implements PcRtc.h
> + Header file for real time clock driver.
>
> Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> + Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> -/* This file includes code originally published under the following license. */
> -
> -/** @file
> - Header file for real time clock driver.
> -
> -Copyright (c) 2006 - 2016, 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
> -which 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.
> -
> -**/
> -
> -#ifndef _RTC_H_
> -#define _RTC_H_
> +#ifndef RTC_H__
> +#define RTC_H__
>
> #include <Uefi.h>
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/PcAtChipsetPkg/PcatRealTi
> meClockRuntimeDxe/PcRtc.uni
> b/Platform/AMD/VanGoghBoard/Override/edk2/PcAtChipsetPkg/PcatRealTi
> meClockRuntimeDxe/PcRtc.uni
> index 29813a45fe..33d7211191 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/PcAtChipsetPkg/PcatRealTi
> meClockRuntimeDxe/PcRtc.uni
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/PcAtChipsetPkg/PcatRealTi
> meClockRuntimeDxe/PcRtc.uni
> @@ -1,30 +1,12 @@
> -// /** @file
> -// PcRtc Localized Strings and Content
> -//
> -// Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -//
> -// SPDX-License-Identifier: BSD-2-Clause-Patent
> -//
> -// **/
> -// This file includes code originally published under the following license.
> -
> // /** @file
> // PcRtc driver to install EFI_REAL_TIME_CLOCK_ARCH_PROTOCOL
> -//
> -// PcRtc driver to install EFI_REAL_TIME_CLOCK_ARCH_PROTOCOL.
> -//
> // This driver provides GetTime, SetTime, GetWakeupTime, SetWakeupTime
> services to Runtime Service Table.
> // It will install a tagging protocol with gEfiRealTimeClockArchProtocolGuid.
> //
> +// Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> // Copyright (c) 2006 - 2014, 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
> -// which 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.
> +// SPDX-License-Identifier: BSD-2-Clause-Patent
> //
> // **/
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/PcAtChipsetPkg/PcatRealTi
> meClockRuntimeDxe/PcRtcEntry.c
> b/Platform/AMD/VanGoghBoard/Override/edk2/PcAtChipsetPkg/PcatRealTi
> meClockRuntimeDxe/PcRtcEntry.c
> index f6dc844861..9ac9914fb2 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/PcAtChipsetPkg/PcatRealTi
> meClockRuntimeDxe/PcRtcEntry.c
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/PcAtChipsetPkg/PcatRealTi
> meClockRuntimeDxe/PcRtcEntry.c
> @@ -1,27 +1,12 @@
> /** @file
> - Implements PcRtcEntry.c
> + Provides Set/Get time operations.
>
> Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> + Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> -/* This file includes code originally published under the following license. */
> -
> -/** @file
> - Provides Set/Get time operations.
> -
> -Copyright (c) 2006 - 2016, 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
> -which 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.
> -
> -**/
> -
> #include "PcRtc.h"
>
> PC_RTC_MODULE_GLOBALS mModuleGlobal;
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/PcAtChipsetPkg/PcatRealTi
> meClockRuntimeDxe/PcRtcExtra.uni
> b/Platform/AMD/VanGoghBoard/Override/edk2/PcAtChipsetPkg/PcatRealTi
> meClockRuntimeDxe/PcRtcExtra.uni
> index 8901872767..59f4ed64d1 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/PcAtChipsetPkg/PcatRealTi
> meClockRuntimeDxe/PcRtcExtra.uni
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/PcAtChipsetPkg/PcatRealTi
> meClockRuntimeDxe/PcRtcExtra.uni
> @@ -2,24 +2,9 @@
> // PcRtc Extra Localized Strings and Content
> //
> // Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -//
> -// SPDX-License-Identifier: BSD-2-Clause-Patent
> -//
> -// **/
> -// This file includes code originally published under the following license.
> -
> -// /** @file
> -// PcRtc Localized Strings and Content
> -//
> // Copyright (c) 2013 - 2014, 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
> -// which 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.
> +// SPDX-License-Identifier: BSD-2-Clause-Patent
> //
> // **/
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/PcAtChipsetPkg/PcatRealTi
> meClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf
> b/Platform/AMD/VanGoghBoard/Override/edk2/PcAtChipsetPkg/PcatRealTi
> meClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf
> index 8964795fc7..99818777c8 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/PcAtChipsetPkg/PcatRealTi
> meClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/PcAtChipsetPkg/PcatRealTi
> meClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf
> @@ -1,27 +1,11 @@
> ## @file
> # Pcat RealTimeClock Runtime Dxe
> -#
> -# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -# SPDX-License-Identifier: BSD-2-Clause-Patent
> -#
> -##
> -
> -# This file includes code originally published under the following license.
> -
> -## @file
> -# PcRtc driver to install EFI_REAL_TIME_CLOCK_ARCH_PROTOCOL.
> -#
> # This driver provides GetTime, SetTime, GetWakeupTime, SetWakeupTime
> services to Runtime Service Table.
> # It will install a tagging protocol with gEfiRealTimeClockArchProtocolGuid.
> #
> +# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> # Copyright (c) 2006 - 2015, 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
> -# which 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.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Library/AmdFt
> pm/DxeTpm2DeviceLibFsp/Tpm2DeviceLibFtpm.c
> b/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Library/AmdFt
> pm/DxeTpm2DeviceLibFsp/Tpm2DeviceLibFtpm.c
> index 9ea87fafd4..fe359cdc28 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Library/AmdFt
> pm/DxeTpm2DeviceLibFsp/Tpm2DeviceLibFtpm.c
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Library/AmdFt
> pm/DxeTpm2DeviceLibFsp/Tpm2DeviceLibFtpm.c
> @@ -1,26 +1,11 @@
> -/** @file
> - Implements Tpm2DeviceLibFtpm.C
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> This library is TPM2 device router. Platform can register multi TPM2
> instance to it
> via PcdTpmInstanceGuid. Platform need make choice that which one will be
> final one.
> At most one TPM2 instance can be finally registered, and other will return
> unsupported.
>
> -Copyright (c) 2013 - 2017, 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
> -which 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.
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> + Copyright (c) 2013 - 2017, Intel Corporation. All rights reserved. <BR>
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> @@ -75,7 +60,7 @@ Tpm2SubmitCommand (
> EFI_STATUS Status = EFI_SUCCESS;
>
> if ((NULL == InputParameterBlock) || (NULL == OutputParameterBlock) || (0
> == InputParameterBlockSize)) {
> - DEBUG ((EFI_D_ERROR, "Buffer == NULL or InputParameterBlockSize ==
> 0\n"));
> + DEBUG ((DEBUG_ERROR, "Buffer == NULL or InputParameterBlockSize ==
> 0\n"));
> Status = EFI_INVALID_PARAMETER;
> return Status;
> }
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Library/AmdFt
> pm/DxeTpm2DeviceLibFsp/Tpm2DeviceLibFtpm.inf
> b/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Library/AmdFt
> pm/DxeTpm2DeviceLibFsp/Tpm2DeviceLibFtpm.inf
> index 27f8673668..6708abdfce 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Library/AmdFt
> pm/DxeTpm2DeviceLibFsp/Tpm2DeviceLibFtpm.inf
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Library/AmdFt
> pm/DxeTpm2DeviceLibFsp/Tpm2DeviceLibFtpm.inf
> @@ -1,13 +1,3 @@
> -## @file
> -# Ftpm TPM 2.0 Device Library DXE Module INF file
> -#
> -# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -# SPDX-License-Identifier: BSD-2-Clause-Patent
> -#
> -##
> -
> -# This file includes code originally published under the following license.
> -
> ## @file
> # Provides TPM 2.0 TIS functions
> #
> @@ -15,13 +5,9 @@
> # it via PcdTpmInstanceGuid. Platform need make choice that which one will
> be final one.
> # At most one TPM 2.0 instance can be finally registered, and other will
> return unsupported.
> #
> +# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> # Copyright (c) 2013 - 2016, 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
> -# which 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.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Library/AmdFt
> pm/PeiTpm2DeviceLibFsp/Tpm2DeviceLibFtpm.c
> b/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Library/AmdFt
> pm/PeiTpm2DeviceLibFsp/Tpm2DeviceLibFtpm.c
> index 32f63b78ee..9e8cb5588d 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Library/AmdFt
> pm/PeiTpm2DeviceLibFsp/Tpm2DeviceLibFtpm.c
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Library/AmdFt
> pm/PeiTpm2DeviceLibFsp/Tpm2DeviceLibFtpm.c
> @@ -1,26 +1,11 @@
> -/** @file
> - Implements Tpm2DeviceLibFtpm.C
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> This library is TPM2 device router. Platform can register multi TPM2
> instance to it
> via PcdTpmInstanceGuid. Platform need make choice that which one will be
> final one.
> At most one TPM2 instance can be finally registered, and other will return
> unsupported.
>
> -Copyright (c) 2013 - 2017, 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
> -which 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.
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> + Copyright (c) 2013 - 2017, Intel Corporation. All rights reserved. <BR>
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> @@ -84,7 +69,7 @@ Tpm2SubmitCommand (
> EFI_STATUS Status = EFI_SUCCESS;
>
> if ((NULL == InputParameterBlock) || (NULL == OutputParameterBlock) || (0
> == InputParameterBlockSize)) {
> - DEBUG ((EFI_D_ERROR, "Buffer == NULL or InputParameterBlockSize ==
> 0\n"));
> + DEBUG ((DEBUG_ERROR, "Buffer == NULL or InputParameterBlockSize ==
> 0\n"));
> Status = EFI_INVALID_PARAMETER;
> return Status;
> }
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Library/AmdFt
> pm/PeiTpm2DeviceLibFsp/Tpm2DeviceLibFtpm.inf
> b/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Library/AmdFt
> pm/PeiTpm2DeviceLibFsp/Tpm2DeviceLibFtpm.inf
> index a28c76332a..a38ada3efd 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Library/AmdFt
> pm/PeiTpm2DeviceLibFsp/Tpm2DeviceLibFtpm.inf
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Library/AmdFt
> pm/PeiTpm2DeviceLibFsp/Tpm2DeviceLibFtpm.inf
> @@ -1,13 +1,3 @@
> -## @file
> -# Ftpm TPM 2.0 Device Library PEI Module INF file
> -#
> -# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -# SPDX-License-Identifier: BSD-2-Clause-Patent
> -#
> -##
> -
> -# This file includes code originally published under the following license.
> -
> ## @file
> # Provides TPM 2.0 TIS functions
> #
> @@ -15,17 +5,12 @@
> # it via PcdTpmInstanceGuid. Platform need make choice that which one will
> be final one.
> # At most one TPM 2.0 instance can be finally registered, and other will
> return unsupported.
> #
> +# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> # Copyright (c) 2013 - 2016, 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
> -# which 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.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> -
> [Defines]
> INF_VERSION = 0x00010005
> BASE_NAME = Tpm2DeviceLibFtpm
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Library/AmdFt
> pm/Tpm2DeviceLib/Tpm2DeviceLibFtpm.c
> b/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Library/AmdFt
> pm/Tpm2DeviceLib/Tpm2DeviceLibFtpm.c
> index daf75fa1b3..713c87a1ca 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Library/AmdFt
> pm/Tpm2DeviceLib/Tpm2DeviceLibFtpm.c
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Library/AmdFt
> pm/Tpm2DeviceLib/Tpm2DeviceLibFtpm.c
> @@ -1,27 +1,12 @@
> /** @file
> - Implements Tpm2DeviceLibFtpm.C
> + This library is TPM2 TCG2 protocol lib.
>
> Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> + Copyright (c) 2013 - 2016, Intel Corporation. All rights reserved. <BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> -/* This file includes code originally published under the following license. */
> -
> -/** @file
> - This library is TPM2 TCG2 protocol lib.
> -
> -Copyright (c) 2013 - 2016, 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
> -which 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.
> -
> -**/
> -
> #include <Uefi.h>
> #include <Library/BaseLib.h>
> #include <Library/DebugLib.h>
> @@ -69,7 +54,7 @@ Tpm2SubmitCommand (
> EFI_STATUS Status = EFI_SUCCESS;
>
> if ((NULL == InputParameterBlock) || (NULL == OutputParameterBlock) || (0
> == InputParameterBlockSize)) {
> - DEBUG ((EFI_D_ERROR, "Buffer == NULL or InputParameterBlockSize ==
> 0\n"));
> + DEBUG ((DEBUG_ERROR, "Buffer == NULL or InputParameterBlockSize ==
> 0\n"));
> Status = EFI_INVALID_PARAMETER;
> return Status;
> }
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Library/AmdFt
> pm/Tpm2DeviceLib/Tpm2DeviceLibFtpm.inf
> b/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Library/AmdFt
> pm/Tpm2DeviceLib/Tpm2DeviceLibFtpm.inf
> index ce3a7c53f1..7e42703347 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Library/AmdFt
> pm/Tpm2DeviceLib/Tpm2DeviceLibFtpm.inf
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Library/AmdFt
> pm/Tpm2DeviceLib/Tpm2DeviceLibFtpm.inf
> @@ -1,30 +1,15 @@
> -## @file
> -# Ftpm TPM 2.0 Device Library INF file
> -#
> -# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -# SPDX-License-Identifier: BSD-2-Clause-Patent
> -#
> -##
> -
> -# This file includes code originally published under the following license.
> -
> ## @file
> # Provides function interfaces to communicate with TPM 2.0 device
> #
> # This library helps to use TPM 2.0 device in library function API
> # based on TPM2 protocol.
> #
> +# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> # Copyright (c) 2013 - 2014, 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
> -# which 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.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> -
> [Defines]
> INF_VERSION = 0x00010005
> BASE_NAME = Tpm2DeviceLibFtpm
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Library/DxeTcg
> 2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.c
> b/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Library/DxeTcg
> 2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.c
> index 053f565562..28b945fbba 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Library/DxeTcg
> 2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.c
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Library/DxeTcg
> 2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.c
> @@ -1,13 +1,3 @@
> -/** @file
> - Implements DxeTcg2PhysicalPresenceLib.C
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> Execute pending TPM2 requests from OS or BIOS.
>
> @@ -17,14 +7,9 @@
>
> Tpm2ExecutePendingTpmRequest() will receive untrusted input and do
> validation.
>
> -Copyright (c) 2013 - 2016, 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
> -which 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.
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> + Copyright (c) 2013 - 2016, Intel Corporation. All rights reserved.<BR>
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> @@ -100,16 +85,16 @@ Tpm2CommandClear (
> CopyMem (LocalAuthSession.hmac.buffer, PlatformAuth->buffer,
> PlatformAuth->size);
> }
>
> - DEBUG ((EFI_D_INFO, "Tpm2ClearControl ... \n"));
> + DEBUG ((DEBUG_INFO, "Tpm2ClearControl ... \n"));
> Status = Tpm2ClearControl (TPM_RH_PLATFORM, AuthSession, NO);
> - DEBUG ((EFI_D_INFO, "Tpm2ClearControl - %r\n", Status));
> + DEBUG ((DEBUG_INFO, "Tpm2ClearControl - %r\n", Status));
> if (EFI_ERROR (Status)) {
> goto Done;
> }
>
> - DEBUG ((EFI_D_INFO, "Tpm2Clear ... \n"));
> + DEBUG ((DEBUG_INFO, "Tpm2Clear ... \n"));
> Status = Tpm2Clear (TPM_RH_PLATFORM, AuthSession);
> - DEBUG ((EFI_D_INFO, "Tpm2Clear - %r\n", Status));
> + DEBUG ((DEBUG_INFO, "Tpm2Clear - %r\n", Status));
>
> Done:
> ZeroMem (&LocalAuthSession.hmac, sizeof (LocalAuthSession.hmac));
> @@ -143,7 +128,7 @@ Tpm2CommandChangeEps (
> }
>
> Status = Tpm2ChangeEPS (TPM_RH_PLATFORM, AuthSession);
> - DEBUG ((EFI_D_INFO, "Tpm2ChangeEPS - %r\n", Status));
> + DEBUG ((DEBUG_INFO, "Tpm2ChangeEPS - %r\n", Status));
>
> ZeroMem (&LocalAuthSession.hmac, sizeof (LocalAuthSession.hmac));
> return Status;
> @@ -808,7 +793,7 @@ Tcg2ExecutePendingTpmRequest (
> //
> // Print confirm text and wait for approval.
> //
> - DEBUG ((EFI_D_INFO, "Print confirm text and wait for approval.\n"));
> + DEBUG ((DEBUG_INFO, "Print confirm text and wait for approval.\n"));
> RequestConfirmed = TRUE;
> // RequestConfirmed = Tcg2UserConfirm (TcgPpData->PPRequest,
> TcgPpData->PPRequestParameter);
> }
> @@ -863,12 +848,12 @@ Tcg2ExecutePendingTpmRequest (
> TcgPpData
> );
> if (EFI_ERROR (Status)) {
> - DEBUG ((EFI_D_ERROR, "Fail to set variable %S, %r\n",
> TCG2_PHYSICAL_PRESENCE_VARIABLE, Status));
> + DEBUG ((DEBUG_ERROR, "Fail to set variable %S, %r\n",
> TCG2_PHYSICAL_PRESENCE_VARIABLE, Status));
> return;
> }
>
> if (TcgPpData->PPResponse ==
> TCG_PP_OPERATION_RESPONSE_USER_ABORT) {
> - DEBUG ((EFI_D_INFO, "User abort the TPM action \n"));
> + DEBUG ((DEBUG_INFO, "User abort the TPM action \n"));
> return;
> }
>
> @@ -912,7 +897,7 @@ Tcg2ExecutePendingTpmRequest (
> }
>
> // Print (L"Rebooting system to make TPM2 settings in effect\n");
> - DEBUG ((EFI_D_INFO, "Rebooting system to make TPM2 settings in
> effect\n"));
> + DEBUG ((DEBUG_INFO, "Rebooting system to make TPM2 settings in
> effect\n"));
> gRT->ResetSystem (EfiResetCold, EFI_SUCCESS, 0, NULL);
> ASSERT (FALSE);
> }
> @@ -954,7 +939,7 @@ Tcg2PhysicalPresenceLibProcessRequest (
> &gEfiTcg2PhysicalPresenceGuid
> );
> if (EFI_ERROR (Status)) {
> - DEBUG ((EFI_D_ERROR, "[TPM2] Error when lock variable %s, Status
> = %r\n", TCG2_PHYSICAL_PRESENCE_FLAGS_VARIABLE, Status));
> + DEBUG ((DEBUG_ERROR, "[TPM2] Error when lock variable %s, Status
> = %r\n", TCG2_PHYSICAL_PRESENCE_FLAGS_VARIABLE, Status));
> ASSERT_EFI_ERROR (Status);
> }
> }
> @@ -965,7 +950,7 @@ Tcg2PhysicalPresenceLibProcessRequest (
> // Check S4 resume
> //
> // if (GetBootModeHob () == BOOT_ON_S4_RESUME) {
> - // DEBUG ((EFI_D_INFO, "S4 Resume, Skip TPM PP process!\n"));
> + // DEBUG ((DEBUG_INFO, "S4 Resume, Skip TPM PP process!\n"));
> // return ;
> // }
>
> @@ -990,7 +975,7 @@ Tcg2PhysicalPresenceLibProcessRequest (
> &PpiFlags
> );
> if (EFI_ERROR (Status)) {
> - DEBUG ((EFI_D_ERROR, "[TPM2] Set physical presence flag failed, Status
> = %r\n", Status));
> + DEBUG ((DEBUG_ERROR, "[TPM2] Set physical presence flag failed,
> Status = %r\n", Status));
> return;
> }
>
> @@ -1019,18 +1004,18 @@ Tcg2PhysicalPresenceLibProcessRequest (
> &TcgPpData
> );
> if (EFI_ERROR (Status)) {
> - DEBUG ((EFI_D_ERROR, "[TPM2] Set physical presence variable failed,
> Status = %r\n", Status));
> + DEBUG ((DEBUG_ERROR, "[TPM2] Set physical presence variable failed,
> Status = %r\n", Status));
> return;
> }
> }
>
> - DEBUG ((EFI_D_INFO, "[TPM2] Flags=%x, PPRequest=%x
> (LastPPRequest=%x)\n", PpiFlags.PPFlags, TcgPpData.PPRequest,
> TcgPpData.LastPPRequest));
> + DEBUG ((DEBUG_INFO, "[TPM2] Flags=%x, PPRequest=%x
> (LastPPRequest=%x)\n", PpiFlags.PPFlags, TcgPpData.PPRequest,
> TcgPpData.LastPPRequest));
>
> //
> // Execute pending TPM request.
> //
> Tcg2ExecutePendingTpmRequest (PlatformAuth, &TcgPpData, &PpiFlags);
> - DEBUG ((EFI_D_INFO, "[TPM2] PPResponse = %x (LastPPRequest=%x,
> Flags=%x)\n", TcgPpData.PPResponse, TcgPpData.LastPPRequest,
> PpiFlags.PPFlags));
> + DEBUG ((DEBUG_INFO, "[TPM2] PPResponse = %x (LastPPRequest=%x,
> Flags=%x)\n", TcgPpData.PPResponse, TcgPpData.LastPPRequest,
> PpiFlags.PPFlags));
> }
>
> /**
> @@ -1061,7 +1046,7 @@ Tcg2PhysicalPresenceLibNeedUserConfirm (
> // Check S4 resume
> //
> // if (GetBootModeHob () == BOOT_ON_S4_RESUME) {
> - // DEBUG ((EFI_D_INFO, "S4 Resume, Skip TPM PP process!\n"));
> + // DEBUG ((DEBUG_INFO, "S4 Resume, Skip TPM PP process!\n"));
> // return FALSE;
> // }
>
> @@ -1077,7 +1062,7 @@ Tcg2PhysicalPresenceLibNeedUserConfirm (
> &TcgPpData
> );
> if (EFI_ERROR (Status)) {
> - DEBUG ((EFI_D_ERROR, "[TPM2] GetVariable %S, %r\n",
> TCG2_PHYSICAL_PRESENCE_VARIABLE, Status));
> + DEBUG ((DEBUG_ERROR, "[TPM2] GetVariable %S, %r\n",
> TCG2_PHYSICAL_PRESENCE_VARIABLE, Status));
> return FALSE;
> }
>
> @@ -1090,7 +1075,7 @@ Tcg2PhysicalPresenceLibNeedUserConfirm (
> &PpiFlags
> );
> if (EFI_ERROR (Status)) {
> - DEBUG ((EFI_D_ERROR, "[TPM2] GetVariable %S, %r\n",
> TCG2_PHYSICAL_PRESENCE_FLAGS_VARIABLE, Status));
> + DEBUG ((DEBUG_ERROR, "[TPM2] GetVariable %S, %r\n",
> TCG2_PHYSICAL_PRESENCE_FLAGS_VARIABLE, Status));
> return FALSE;
> }
>
> @@ -1138,7 +1123,7 @@
> Tcg2PhysicalPresenceLibReturnOperationResponseToOsFunction (
> UINTN DataSize;
> EFI_TCG2_PHYSICAL_PRESENCE PpData;
>
> - DEBUG ((EFI_D_INFO, "[TPM2]
> ReturnOperationResponseToOsFunction\n"));
> + DEBUG ((DEBUG_INFO, "[TPM2]
> ReturnOperationResponseToOsFunction\n"));
>
> //
> // Get the Physical Presence variable
> @@ -1154,7 +1139,7 @@
> Tcg2PhysicalPresenceLibReturnOperationResponseToOsFunction (
> if (EFI_ERROR (Status)) {
> *MostRecentRequest = 0;
> *Response = 0;
> - DEBUG ((EFI_D_ERROR, "[TPM2] Get PP variable failure! Status = %r\n",
> Status));
> + DEBUG ((DEBUG_ERROR, "[TPM2] Get PP variable failure! Status = %r\n",
> Status));
> return TCG_PP_RETURN_TPM_OPERATION_RESPONSE_FAILURE;
> }
>
> @@ -1189,7 +1174,7 @@
> Tcg2PhysicalPresenceLibSubmitRequestToPreOSFunction (
> EFI_TCG2_PHYSICAL_PRESENCE PpData;
> EFI_TCG2_PHYSICAL_PRESENCE_FLAGS Flags;
>
> - DEBUG ((EFI_D_INFO, "[TPM2] SubmitRequestToPreOSFunction, Request
> = %x, %x\n", OperationRequest, RequestParameter));
> + DEBUG ((DEBUG_INFO, "[TPM2] SubmitRequestToPreOSFunction, Request
> = %x, %x\n", OperationRequest, RequestParameter));
>
> //
> // Get the Physical Presence variable
> @@ -1203,7 +1188,7 @@
> Tcg2PhysicalPresenceLibSubmitRequestToPreOSFunction (
> &PpData
> );
> if (EFI_ERROR (Status)) {
> - DEBUG ((EFI_D_ERROR, "[TPM2] Get PP variable failure! Status = %r\n",
> Status));
> + DEBUG ((DEBUG_ERROR, "[TPM2] Get PP variable failure! Status = %r\n",
> Status));
> return TCG_PP_SUBMIT_REQUEST_TO_PREOS_GENERAL_FAILURE;
> }
>
> @@ -1227,7 +1212,7 @@
> Tcg2PhysicalPresenceLibSubmitRequestToPreOSFunction (
> &PpData
> );
> if (EFI_ERROR (Status)) {
> - DEBUG ((EFI_D_ERROR, "[TPM2] Set PP variable failure! Status = %r\n",
> Status));
> + DEBUG ((DEBUG_ERROR, "[TPM2] Set PP variable failure! Status = %r\n",
> Status));
> return TCG_PP_SUBMIT_REQUEST_TO_PREOS_GENERAL_FAILURE;
> }
> }
> @@ -1266,7 +1251,7 @@ Tcg2PhysicalPresenceLibGetManagementFlags (
> EFI_TCG2_PHYSICAL_PRESENCE_FLAGS PpiFlags;
> UINTN DataSize;
>
> - DEBUG ((EFI_D_INFO, "[TPM2] GetManagementFlags\n"));
> + DEBUG ((DEBUG_INFO, "[TPM2] GetManagementFlags\n"));
>
> DataSize = sizeof (EFI_TCG2_PHYSICAL_PRESENCE_FLAGS);
> Status = gRT->GetVariable (
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Library/DxeTcg
> 2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf
> b/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Library/DxeTcg
> 2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf
> index b0ee10240e..2ce1133596 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Library/DxeTcg
> 2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Library/DxeTcg
> 2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf
> @@ -1,13 +1,3 @@
> -## @file
> -# TCG 2.0 Physical Presence DXE Module INF file
> -#
> -# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -# SPDX-License-Identifier: BSD-2-Clause-Patent
> -#
> -##
> -
> -# This file includes code originally published under the following license.
> -
> ## @file
> # Executes TPM 2.0 requests from OS or BIOS
> #
> @@ -18,13 +8,9 @@
> # This driver will have external input - variable.
> # This external input must be validated carefully to avoid security issue.
> #
> +# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> # Copyright (c) 2013 - 2016, 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
> -# which 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.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Library/DxeTcg
> 2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.uni
> b/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Library/DxeTcg
> 2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.uni
> index ac2e78d735..d7e4af732b 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Library/DxeTcg
> 2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.uni
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Library/DxeTcg
> 2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.uni
> @@ -1,14 +1,3 @@
> -// /** @file
> -// TCG 2.0 Physical Presence Library uni file
> -//
> -// Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -//
> -// SPDX-License-Identifier: BSD-2-Clause-Patent
> -//
> -// **/
> -// This file includes code originally published under the following license.
> -// */
> -
> // /** @file
> // Executes TPM 2.0 requests from OS or BIOS
> //
> @@ -19,18 +8,13 @@
> // This driver will have external input - variable.
> // This external input must be validated carefully to avoid security issue.
> //
> +// Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> // Copyright (c) 2013 - 2014, 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
> -// which 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.
> +// SPDX-License-Identifier: BSD-2-Clause-Patent
> //
> // **/
>
> -
> #string STR_MODULE_ABSTRACT #language en-US "Executes TPM 2.0
> requests from OS or BIOS"
>
> #string STR_MODULE_DESCRIPTION #language en-US "This library will
> check and execute TPM 2.0 request from OS or BIOS. The request may ask for
> user confirmation before execution.\n"
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Library/DxeTcg
> 2PhysicalPresenceLib/PhysicalPresenceStrings.uni
> b/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Library/DxeTcg
> 2PhysicalPresenceLib/PhysicalPresenceStrings.uni
> index 7cf9901046..70fa651455 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Library/DxeTcg
> 2PhysicalPresenceLib/PhysicalPresenceStrings.uni
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Library/DxeTcg
> 2PhysicalPresenceLib/PhysicalPresenceStrings.uni
> @@ -1,27 +1,12 @@
> // /** @file
> -// Physical Presence String uni file
> +// String definitions for TPM 2.0 physical presence confirm text.
> //
> // Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> +// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
> //
> // SPDX-License-Identifier: BSD-2-Clause-Patent
> //
> // **/
> -// This file includes code originally published under the following license.
> -// */
> -
> -/** @file
> - String definitions for TPM 2.0 physical presence confirm text.
> -
> -Copyright (c) 2013 - 2014, 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
> -which 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.
> -
> -**/
>
> #langdef en-US "English"
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Tcg/AmdFtpm/
> FtpmTcg2Smm/Tcg2Smm.c
> b/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Tcg/AmdFtpm/
> FtpmTcg2Smm/Tcg2Smm.c
> index f38749298a..62317165cb 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Tcg/AmdFtpm/
> FtpmTcg2Smm/Tcg2Smm.c
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Tcg/AmdFtpm/
> FtpmTcg2Smm/Tcg2Smm.c
> @@ -1,13 +1,3 @@
> -/** @file
> - Implements Tcg2Smm.C
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> It updates fTPM2 items in ACPI table and registers SMI2 callback
> functions for Tcg2 physical presence, ClearMemory, and sample
> @@ -19,14 +9,9 @@
>
> PhysicalPresenceCallback() and MemoryClearCallback() will receive
> untrusted input and do some check.
>
> -Copyright (c) 2015 - 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
> -which 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.
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> + Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> @@ -345,7 +330,7 @@ UpdatePPVersion (
> {
> if (AsciiStrCmp ((CHAR8 *)DataPtr, PHYSICAL_PRESENCE_VERSION_TAG) ==
> 0) {
> Status = AsciiStrCpyS ((CHAR8 *)DataPtr,
> PHYSICAL_PRESENCE_VERSION_SIZE, PPVer);
> - DEBUG ((EFI_D_INFO, "TPM2 Physical Presence Interface Version update
> status 0x%x\n", Status));
> + DEBUG ((DEBUG_INFO, "TPM2 Physical Presence Interface Version
> update status 0x%x\n", Status));
> return Status;
> }
> }
> @@ -687,8 +672,8 @@ PublishAcpiTable (
> ASSERT (Table->OemTableId == SIGNATURE_64 ('T', 'p', 'm', '2', 'T', 'a', 'b',
> 'l'));
> CopyMem (Table->OemId, PcdGetPtr (PcdAcpiDefaultOemId), sizeof (Table-
> >OemId));
>
> - DEBUG ((EFI_D_INFO, "FtpmControlArea: 0x%lX\n", (UINTN)(VOID
> *)mFtpmControlArea));
> - DEBUG ((EFI_D_INFO, "CommandSize: 0x%lX, ResponseSize: 0x%lX \n",
> mFtpmControlArea->CommandSize, mFtpmControlArea->ResponseSize));
> + DEBUG ((DEBUG_INFO, "FtpmControlArea: 0x%lX\n", (UINTN)(VOID
> *)mFtpmControlArea));
> + DEBUG ((DEBUG_INFO, "CommandSize: 0x%lX, ResponseSize: 0x%lX \n",
> mFtpmControlArea->CommandSize, mFtpmControlArea->ResponseSize));
>
> Status = AssignMemory32Fixed (Table, (UINT32)mFtpmControlArea-
> >CommandAddress, (UINT32)mFtpmControlArea->ResponseAddress);
> ASSERT_EFI_ERROR (Status);
> @@ -813,18 +798,18 @@ InitializeTcgSmm (
> EFI_SMM_SW_REGISTER_CONTEXT SwContext;
> EFI_HANDLE SwHandle;
>
> - DEBUG ((EFI_D_INFO, "InitializeTcgSmm Entry \n"));
> + DEBUG ((DEBUG_INFO, "InitializeTcgSmm Entry \n"));
> if (!CompareGuid (PcdGetPtr (PcdTpmInstanceGuid),
> &gEfiTpmDeviceInstanceTpm20DtpmGuid)) {
> - DEBUG ((EFI_D_ERROR, "No TPM2 DTPM instance required!\n"));
> + DEBUG ((DEBUG_ERROR, "No TPM2 DTPM instance required!\n"));
> return EFI_UNSUPPORTED;
> }
>
> // if (!GetFtpmControlArea(&mFtpmControlArea)) {
> - // DEBUG ((EFI_D_ERROR, "Get fTPM Control Area failed!\n"));
> + // DEBUG ((DEBUG_ERROR, "Get fTPM Control Area failed!\n"));
> // return EFI_UNSUPPORTED;
> // }
> mFtpmControlArea = (VOID *)(UINTN)PcdGet64 (PcdTpmBaseAddress);
> - DEBUG ((EFI_D_INFO, "Get PcdTpmBaseAddress:%x\n",
> mFtpmControlArea));
> + DEBUG ((DEBUG_INFO, "Get PcdTpmBaseAddress:%x\n",
> mFtpmControlArea));
> Status = PublishAcpiTable ();
> ASSERT_EFI_ERROR (Status);
>
> @@ -841,7 +826,7 @@ InitializeTcgSmm (
> }
>
> mTcgNvs->PhysicalPresence.SoftwareSmi =
> (UINT8)SwContext.SwSmiInputValue;
> - DEBUG ((EFI_D_INFO, "PhysicalPresence SoftwareSmi: 0x%X\n",
> (UINT8)SwContext.SwSmiInputValue));
> + DEBUG ((DEBUG_INFO, "PhysicalPresence SoftwareSmi: 0x%X\n",
> (UINT8)SwContext.SwSmiInputValue));
>
> SwContext.SwSmiInputValue = (UINTN)-1;
> Status = SwDispatch->Register (SwDispatch,
> MemoryClearCallback, &SwContext, &SwHandle);
> @@ -851,7 +836,7 @@ InitializeTcgSmm (
> }
>
> mTcgNvs->MemoryClear.SoftwareSmi =
> (UINT8)SwContext.SwSmiInputValue;
> - DEBUG ((EFI_D_INFO, "MemoryClear SoftwareSmi: 0x%X\n",
> (UINT8)SwContext.SwSmiInputValue));
> + DEBUG ((DEBUG_INFO, "MemoryClear SoftwareSmi: 0x%X\n",
> (UINT8)SwContext.SwSmiInputValue));
>
> //
> // Locate SmmVariableProtocol.
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Tcg/AmdFtpm/
> FtpmTcg2Smm/Tcg2Smm.h
> b/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Tcg/AmdFtpm/
> FtpmTcg2Smm/Tcg2Smm.h
> index 4012942176..b1fda8c6b4 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Tcg/AmdFtpm/
> FtpmTcg2Smm/Tcg2Smm.h
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Tcg/AmdFtpm/
> FtpmTcg2Smm/Tcg2Smm.h
> @@ -1,29 +1,14 @@
> /** @file
> - Implements Tcg2Smm.h
> + The header file for Tcg2 SMM driver.
>
> Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> + Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> -/* This file includes code originally published under the following license. */
> -
> -/** @file
> - The header file for Tcg2 SMM driver.
> -
> -Copyright (c) 2015 - 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
> -which 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.
> -
> -**/
> -
> -#ifndef __TCG2_SMM_H__
> -#define __TCG2_SMM_H__
> +#ifndef TCG2_SMM_H____
> +#define TCG2_SMM_H____
>
> #include <PiDxe.h>
> #include <IndustryStandard/Acpi.h>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Tcg/AmdFtpm/
> FtpmTcg2Smm/Tcg2Smm.inf
> b/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Tcg/AmdFtpm/
> FtpmTcg2Smm/Tcg2Smm.inf
> index fef93e632a..52419f55ea 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Tcg/AmdFtpm/
> FtpmTcg2Smm/Tcg2Smm.inf
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Tcg/AmdFtpm/
> FtpmTcg2Smm/Tcg2Smm.inf
> @@ -1,13 +1,3 @@
> -## @file
> -# TCG 2.0 SMM Module INF file
> -#
> -# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -# SPDX-License-Identifier: BSD-2-Clause-Patent
> -#
> -##
> -
> -# This file includes code originally published under the following license.
> -
> ## @file
> # Provides ACPI methods for fTPM 2.0 support
> #
> @@ -26,13 +16,9 @@
> # This driver will have external input - variable and ACPINvs data in SMM
> mode.
> # This external input must be validated carefully to avoid security issue.
> #
> +# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> # Copyright (c) 2015 - 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
> -# which 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.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Tcg/AmdFtpm/
> FtpmTcg2Smm/Tcg2SmmExtra.uni
> b/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Tcg/AmdFtpm/
> FtpmTcg2Smm/Tcg2SmmExtra.uni
> index 62835b409f..b85ec10eba 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Tcg/AmdFtpm/
> FtpmTcg2Smm/Tcg2SmmExtra.uni
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Tcg/AmdFtpm/
> FtpmTcg2Smm/Tcg2SmmExtra.uni
> @@ -1,25 +1,10 @@
> -// /** @file
> -// TCG 2.0 SMM extra uni file
> -//
> -// Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -//
> -// SPDX-License-Identifier: BSD-2-Clause-Patent
> -//
> -// **/
> -// This file includes code originally published under the following license.
> -// */
> -
> // /** @file
> // Tcg2Smm Localized Strings and Content
> //
> +// Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> // Copyright (c) 2015, 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
> -// which 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.
> +// SPDX-License-Identifier: BSD-2-Clause-Patent
> //
> // **/
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Tcg/Tcg2Config
> /Tcg2ConfigNvData.h
> b/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Tcg/Tcg2Config
> /Tcg2ConfigNvData.h
> index 271c99613a..86b9362d9f 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Tcg/Tcg2Config
> /Tcg2ConfigNvData.h
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Tcg/Tcg2Config
> /Tcg2ConfigNvData.h
> @@ -1,29 +1,14 @@
> /** @file
> - Implements Tcg2ConfigNvData.h
> + Header file for NV data structure definition.
>
> Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> + Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> -/* This file includes code originally published under the following license. */
> -
> -/** @file
> - Header file for NV data structure definition.
> -
> -Copyright (c) 2015 - 2017, 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
> -which 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.
> -
> -**/
> -
> -#ifndef __TCG2_CONFIG_NV_DATA_H__
> -#define __TCG2_CONFIG_NV_DATA_H__
> +#ifndef TCG2_CONFIG_NV_DATA_H____
> +#define TCG2_CONFIG_NV_DATA_H____
>
> #include <Guid/HiiPlatformSetupFormset.h>
> #include <Guid/Tcg2ConfigHii.h>
> @@ -32,7 +17,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY
> KIND, EITHER EXPRESS OR IMPLIED.
> //
> // BUGBUG: In order to pass VfrCompiler, we have to redefine below
> MACRO, which already in <Protocol/Tcg2Protocol.h>.
> //
> -#ifndef __TCG2_H__
> +#ifndef TCG2_H____
> #define EFI_TCG2_EVENT_LOG_FORMAT_TCG_1_2 0x00000001
> #define EFI_TCG2_EVENT_LOG_FORMAT_TCG_2 0x00000002
> #endif
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Tcg/Tcg2Config
> /Tcg2ConfigPei.inf
> b/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Tcg/Tcg2Config
> /Tcg2ConfigPei.inf
> index f34c5f7277..e1530fb874 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Tcg/Tcg2Config
> /Tcg2ConfigPei.inf
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Tcg/Tcg2Config
> /Tcg2ConfigPei.inf
> @@ -1,26 +1,12 @@
> -## @file
> -# TCG 2.0 Config PEI Module INF file
> -#
> -# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -# SPDX-License-Identifier: BSD-2-Clause-Patent
> -#
> -##
> -
> -# This file includes code originally published under the following license.
> -
> ## @file
> # Set TPM device type
> #
> # This module initializes TPM device type based on variable and detection.
> # NOTE: This module is only for reference only, each platform should have
> its own setup page.
> #
> +# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> # Copyright (c) 2015 - 2016, 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
> -# which 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.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Tcg/Tcg2Config
> /Tcg2ConfigPei.uni
> b/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Tcg/Tcg2Config
> /Tcg2ConfigPei.uni
> index 5c1a4b6e8f..4d1e7ae6ac 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Tcg/Tcg2Config
> /Tcg2ConfigPei.uni
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Tcg/Tcg2Config
> /Tcg2ConfigPei.uni
> @@ -1,31 +1,11 @@
> -// /** @file
> -// TCG 2.0 Config PEI uni file
> -//
> -// Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -//
> -// SPDX-License-Identifier: BSD-2-Clause-Patent
> -//
> -// **/
> -// This file includes code originally published under the following license.
> -// */
> -
> // /** @file
> // Set TPM device type
> //
> -// This module initializes TPM device type based on variable and detection.
> -// NOTE: This module is only for reference only, each platform should have
> its own setup page.
> -//
> +// Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> // Copyright (c) 2015, 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
> -// which 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.
> +// SPDX-License-Identifier: BSD-2-Clause-Patent
> //
> -// **/
> -
>
> #string STR_MODULE_ABSTRACT #language en-US "Set TPM device
> type"
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Tcg/Tcg2Config
> /Tcg2ConfigPeiExtra.uni
> b/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Tcg/Tcg2Config
> /Tcg2ConfigPeiExtra.uni
> index e8b036e061..0e79ee614a 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Tcg/Tcg2Config
> /Tcg2ConfigPeiExtra.uni
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Tcg/Tcg2Config
> /Tcg2ConfigPeiExtra.uni
> @@ -1,25 +1,10 @@
> -// /** @file
> -// TCG 2.0 Config PEI extra uni file
> -//
> -// Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -//
> -// SPDX-License-Identifier: BSD-2-Clause-Patent
> -//
> -// **/
> -// This file includes code originally published under the following license.
> -// */
> -
> // /** @file
> // Tcg2ConfigDxe Localized Strings and Content
> //
> +// Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> // Copyright (c) 2015, 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
> -// which 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.
> +// SPDX-License-Identifier: BSD-2-Clause-Patent
> //
> // **/
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Tcg/Tcg2Config
> /Tcg2ConfigPeim.c
> b/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Tcg/Tcg2Config
> /Tcg2ConfigPeim.c
> index bbbcba6e8b..9d90581388 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Tcg/Tcg2Config
> /Tcg2ConfigPeim.c
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Tcg/Tcg2Config
> /Tcg2ConfigPeim.c
> @@ -1,27 +1,12 @@
> /** @file
> - Implements Tcg2ConfigPeim.C
> + The module entry point for Tcg2 configuration module.
>
> Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> + Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> -/* This file includes code originally published under the following license. */
> -
> -/** @file
> - The module entry point for Tcg2 configuration module.
> -
> -Copyright (c) 2015, 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
> -which 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.
> -
> -**/
> -
> #include <PiPei.h>
> #include <Guid/TpmInstance.h>
> #include <Library/BaseLib.h>
> @@ -113,11 +98,11 @@ Tcg2ConfigPeimEntryPoint (
> //
> // Although we have SetupVariable info, we still need detect TPM device
> manually.
> //
> - DEBUG ((EFI_D_INFO, "Tcg2Configuration.TpmDevice from Setup: %x\n",
> Tcg2Configuration.TpmDevice));
> + DEBUG ((DEBUG_INFO, "Tcg2Configuration.TpmDevice from Setup: %x\n",
> Tcg2Configuration.TpmDevice));
>
> if (PcdGetBool (PcdTpmAutoDetection)) {
> TpmDevice = DetectTpmDevice (Tcg2Configuration.TpmDevice);
> - DEBUG ((EFI_D_INFO, "TpmDevice final: %x\n", TpmDevice));
> + DEBUG ((DEBUG_INFO, "TpmDevice final: %x\n", TpmDevice));
> if (TpmDevice != TPM_DEVICE_NULL) {
> Tcg2Configuration.TpmDevice = TpmDevice;
> }
> @@ -138,7 +123,7 @@ Tcg2ConfigPeimEntryPoint (
> Size = sizeof (mTpmInstanceId[Index].TpmInstanceGuid);
> Status = PcdSetPtrS (PcdTpmInstanceGuid, &Size,
> &mTpmInstanceId[Index].TpmInstanceGuid);
> ASSERT_EFI_ERROR (Status);
> - DEBUG ((EFI_D_INFO, "TpmDevice PCD: %g\n",
> &mTpmInstanceId[Index].TpmInstanceGuid));
> + DEBUG ((DEBUG_INFO, "TpmDevice PCD: %g\n",
> &mTpmInstanceId[Index].TpmInstanceGuid));
> break;
> }
> }
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Tcg/Tcg2Config
> /TpmDetection.c
> b/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Tcg/Tcg2Config
> /TpmDetection.c
> index e301295256..4a31738b13 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Tcg/Tcg2Config
> /TpmDetection.c
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/SecurityPkg/Tcg/Tcg2Config
> /TpmDetection.c
> @@ -1,27 +1,12 @@
> /** @file
> - Implements TpmDetection.C
> + fTPM2.0/dTPM2.0 auto detection.
>
> Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> + Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> -/* This file includes code originally published under the following license. */
> -
> -/** @file
> - fTPM2.0/dTPM2.0 auto detection.
> -
> -Copyright (c) 2015 - 2016, 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
> -which 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.
> -
> -**/
> -
> #include <PiPei.h>
> #include <Ppi/ReadOnlyVariable2.h>
> #include <Library/BaseLib.h>
> @@ -65,12 +50,11 @@ DetectTpmDevice (
> Status = PeiServicesGetBootMode (&BootMode);
> ASSERT_EFI_ERROR (Status);
>
> -
> //
> // In S3, we rely on normal boot Detection, because we save to ReadOnly
> Variable in normal boot.
> //
> if (BootMode == BOOT_ON_S3_RESUME) {
> - DEBUG ((EFI_D_INFO, "DetectTpmDevice: S3 mode\n"));
> + DEBUG ((DEBUG_INFO, "DetectTpmDevice: S3 mode\n"));
>
> Status = PeiServicesLocatePpi (&gEfiPeiReadOnlyVariable2PpiGuid, 0, NULL,
> (VOID **)&VariablePpi);
> ASSERT_EFI_ERROR (Status);
> @@ -89,13 +73,13 @@ DetectTpmDevice (
> (Tcg2DeviceDetection.TpmDeviceDetected >= TPM_DEVICE_MIN) &&
> (Tcg2DeviceDetection.TpmDeviceDetected <= TPM_DEVICE_MAX))
> {
> - DEBUG ((EFI_D_INFO, "TpmDevice from DeviceDetection: %x\n",
> Tcg2DeviceDetection.TpmDeviceDetected));
> + DEBUG ((DEBUG_INFO, "TpmDevice from DeviceDetection: %x\n",
> Tcg2DeviceDetection.TpmDeviceDetected));
> Status = Tpm2Startup (TPM_SU_STATE);
> return Tcg2DeviceDetection.TpmDeviceDetected;
> }
> }
>
> - DEBUG ((EFI_D_INFO, "DetectTpmDevice:\n"));
> + DEBUG ((DEBUG_INFO, "DetectTpmDevice:\n"));
>
> Status = Tpm2RequestUseTpm ();
> if (EFI_ERROR (Status)) {
> @@ -106,7 +90,7 @@ DetectTpmDevice (
> }
>
> Status = Tpm2Startup (TPM_SU_CLEAR);
> - DEBUG ((EFI_D_INFO, "Tpm2Startup: %r\n", Status));
> + DEBUG ((DEBUG_INFO, "Tpm2Startup: %r\n", Status));
> if (EFI_ERROR (Status)) {
> return TPM_DEVICE_NULL;
> }
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/SignedCapsulePkg/Universa
> l/SystemFirmwareUpdate/SystemFirmwareCommonDxe.c
> b/Platform/AMD/VanGoghBoard/Override/edk2/SignedCapsulePkg/Univers
> al/SystemFirmwareUpdate/SystemFirmwareCommonDxe.c
> index d3640cb3d9..05a36162d3 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/SignedCapsulePkg/Universa
> l/SystemFirmwareUpdate/SystemFirmwareCommonDxe.c
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/SignedCapsulePkg/Univers
> al/SystemFirmwareUpdate/SystemFirmwareCommonDxe.c
> @@ -1,24 +1,9 @@
> -/** @file
> - Implements SystemFirmwareCommonDxe.C
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> Produce FMP instance for system firmware.
>
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2016 - 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
> - which 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.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/SignedCapsulePkg/Universa
> l/SystemFirmwareUpdate/SystemFirmwareDxe.h
> b/Platform/AMD/VanGoghBoard/Override/edk2/SignedCapsulePkg/Univers
> al/SystemFirmwareUpdate/SystemFirmwareDxe.h
> index 8164f66958..b1aab4c41e 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/SignedCapsulePkg/Universa
> l/SystemFirmwareUpdate/SystemFirmwareDxe.h
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/SignedCapsulePkg/Univers
> al/SystemFirmwareUpdate/SystemFirmwareDxe.h
> @@ -1,28 +1,14 @@
> -/** @file
> - Implementation of SystemFirmwareDxe.h
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> System Firmware update header file.
>
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2016 - 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
> - which 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.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> -#ifndef _SYSTEM_FIRMWARE_UPDATE_H_
> -#define _SYSTEM_FIRMWARE_UPDATE_H_
> +#ifndef SYSTEM_FIRMWARE_UPDATE_H__
> +#define SYSTEM_FIRMWARE_UPDATE_H__
>
> #include <PiDxe.h>
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/SignedCapsulePkg/Universa
> l/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.c
> b/Platform/AMD/VanGoghBoard/Override/edk2/SignedCapsulePkg/Univers
> al/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.c
> index 61e23b4564..894d363de0 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/SignedCapsulePkg/Universa
> l/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.c
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/SignedCapsulePkg/Univers
> al/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.c
> @@ -1,31 +1,9 @@
> -/** @file
> - Implements SystemFirmwareUpdateDxe.c
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> SetImage instance to update system firmware.
>
> - Caution: This module requires additional review when modified.
> - This module will have external input - capsule image.
> - This external input must be validated carefully to avoid security issue like
> - buffer overflow, integer overflow.
> -
> - FmpSetImage() will receive untrusted input and do basic validation.
> -
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2016 - 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
> - which 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.
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/SignedCapsulePkg/Universa
> l/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.uni
> b/Platform/AMD/VanGoghBoard/Override/edk2/SignedCapsulePkg/Univers
> al/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.uni
> index 3b96e42e14..e6bd18b249 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/SignedCapsulePkg/Universa
> l/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.uni
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/SignedCapsulePkg/Univers
> al/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.uni
> @@ -1,31 +1,15 @@
> -// /** @file
> -// SystemFirmwareUpdateDxe Localized Strings and Content
> -//
> -// Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -//
> -// SPDX-License-Identifier: BSD-2-Clause-Patent
> -//
> -// **/
> -// This file includes code originally published under the following license.
> -
> // /** @file
> // SystemFirmware FMP update driver.
> //
> // Produce FMP instance to update system firmware.
> //
> +// Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> // Copyright (c) 2016, 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
> -// which 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.
> +// SPDX-License-Identifier: BSD-2-Clause-Patent
> //
> // **/
>
> -
> #string STR_MODULE_ABSTRACT #language en-US "SystemFirmware
> FMP update driver."
>
> #string STR_MODULE_DESCRIPTION #language en-US "Produce FMP
> instance to update system firmware."
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/SignedCapsulePkg/Universa
> l/SystemFirmwareUpdate/SystemFirmwareUpdateDxeExtra.uni
> b/Platform/AMD/VanGoghBoard/Override/edk2/SignedCapsulePkg/Univers
> al/SystemFirmwareUpdate/SystemFirmwareUpdateDxeExtra.uni
> index 68206af750..c549f017a4 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/SignedCapsulePkg/Universa
> l/SystemFirmwareUpdate/SystemFirmwareUpdateDxeExtra.uni
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/SignedCapsulePkg/Univers
> al/SystemFirmwareUpdate/SystemFirmwareUpdateDxeExtra.uni
> @@ -2,24 +2,9 @@
> // SystemFirmwareUpdateDxeExtra Localized Strings and Content
> //
> // Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -//
> -// SPDX-License-Identifier: BSD-2-Clause-Patent
> -//
> -// **/
> -// This file includes code originally published under the following license.
> -
> -// /** @file
> -// SystemFirmwareUpdateDxe Localized Strings and Content
> -//
> // Copyright (c) 2016, 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
> -// which 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.
> +// SPDX-License-Identifier: BSD-2-Clause-Patent
> //
> // **/
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/Library/SmmC
> puFeaturesLib/SmmCpuFeaturesLibCommon.c
> b/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/Library/SmmC
> puFeaturesLib/SmmCpuFeaturesLibCommon.c
> index 7b07425336..f3615e2d9e 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/Library/SmmC
> puFeaturesLib/SmmCpuFeaturesLibCommon.c
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/Library/SmmC
> puFeaturesLib/SmmCpuFeaturesLibCommon.c
> @@ -1,15 +1,7 @@
> -/** @file
> - Implements AMD SmmCpuFeaturesLibCommon.c
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> /** @file
> Implementation shared across all library instances.
>
> +Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.<BR>
> Copyright (c) Microsoft Corporation.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
> @@ -215,12 +207,13 @@ SmmCpuFeaturesInitializeProcessor (
> //
> // Configure SMBASE.
> //
> - CpuState = (SMRAM_SAVE_STATE_MAP
> *)(UINTN)(SMM_DEFAULT_SMBASE + SMRAM_SAVE_STATE_MAP_OFFSET);
> + CpuState = (SMRAM_SAVE_STATE_MAP
> *)(UINTN)(SMM_DEFAULT_SMBASE + SMRAM_SAVE_STATE_MAP_OFFSET);
> if (mSmmSaveStateRegisterLma ==
> EFI_SMM_SAVE_STATE_REGISTER_LMA_32BIT) {
> CpuState->x86.SMBASE = (UINT32)CpuHotPlugData->SmBase[CpuIndex];
> } else {
> CpuState->x64.SMBASE = (UINT32)CpuHotPlugData->SmBase[CpuIndex];
> }
> +
> //
> // Intel(R) 64 and IA-32 Architectures Software Developer's Manual
> // Volume 3C, Section 35.2 MSRs in the Intel(R) Core(TM) 2 Processor
> Family
> @@ -240,6 +233,7 @@ SmmCpuFeaturesInitializeProcessor (
> }
> }
> }
> +
> //
> // If SMRR is supported, then program SMRR base/mask MSRs.
> // The EFI_MSR_SMRR_PHYS_MASK_VALID bit is not set until the first
> normal SMI.
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/PiSmmCpuDxe
> Smm/SmramSaveState.c
> b/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/PiSmmCpuDxe
> Smm/SmramSaveState.c
> index 9e5a7d59fc..ca63de9ba6 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/PiSmmCpuDxe
> Smm/SmramSaveState.c
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/PiSmmCpuDxe
> Smm/SmramSaveState.c
> @@ -1,16 +1,7 @@
> -/** @file
> - Implements SmramSaveState.c
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> Provides services to access SMRAM Save State Map
>
> +Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/Vt
> f0/CommonMacros.inc
> b/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/V
> tf0/CommonMacros.inc
> index add362fc64..5da472faaa 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/Vt
> f0/CommonMacros.inc
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/V
> tf0/CommonMacros.inc
> @@ -1,15 +1,8 @@
> -;/** @file
> -; Common macros used in the ResetVector VTF module.
> -;
> -; Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -; SPDX-License-Identifier: BSD-2-Clause-Patent
> -;
> -;**/
> -; This file includes code originally published under the following license.
> ;------------------------------------------------------------------------------
> ; @file
> ; Common macros used in the ResetVector VTF module.
> ;
> +; Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> ; Copyright (c) 2008, Intel Corporation. All rights reserved.<BR>
> ; SPDX-License-Identifier: BSD-2-Clause-Patent
> ;
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/Vt
> f0/DebugDisabled.asm
> b/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/V
> tf0/DebugDisabled.asm
> index eb3d105bfc..540206a1d0 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/Vt
> f0/DebugDisabled.asm
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/V
> tf0/DebugDisabled.asm
> @@ -1,15 +1,8 @@
> -;/** @file
> -; Debug disabled
> -;
> -; Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -; SPDX-License-Identifier: BSD-2-Clause-Patent
> -;
> -;**/
> -; This file includes code originally published under the following license.
> ;------------------------------------------------------------------------------
> ; @file
> ; Debug disabled
> ;
> +; Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> ; Copyright (c) 2009, Intel Corporation. All rights reserved.<BR>
> ; SPDX-License-Identifier: BSD-2-Clause-Patent
> ;
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/Vt
> f0/Ia16/Init16.asm
> b/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/V
> tf0/Ia16/Init16.asm
> index d2d4e16a4b..36641c578b 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/Vt
> f0/Ia16/Init16.asm
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/V
> tf0/Ia16/Init16.asm
> @@ -1,15 +1,8 @@
> -;/** @file
> -; 16-bit initialization code
> -;
> -; Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -; SPDX-License-Identifier: BSD-2-Clause-Patent
> -;
> -;**/
> -; This file includes code originally published under the following license.
> ;------------------------------------------------------------------------------
> ; @file
> ; 16-bit initialization code
> ;
> +; Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> ; Copyright (c) 2008 - 2009, Intel Corporation. All rights reserved.<BR>
> ; SPDX-License-Identifier: BSD-2-Clause-Patent
> ;
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/Vt
> f0/Ia16/Real16ToFlat32.asm
> b/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/V
> tf0/Ia16/Real16ToFlat32.asm
> index 1cd770f930..f986761488 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/Vt
> f0/Ia16/Real16ToFlat32.asm
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/V
> tf0/Ia16/Real16ToFlat32.asm
> @@ -1,15 +1,8 @@
> -;/** @file
> -; Transition from 16 bit real mode into 32 bit flat protected mode
> -;
> -; Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -; SPDX-License-Identifier: BSD-2-Clause-Patent
> -;
> -;**/
> -; This file includes code originally published under the following license.
> ;------------------------------------------------------------------------------
> ; @file
> ; Transition from 16 bit real mode into 32 bit flat protected mode
> ;
> +; Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> ; Copyright (c) 2008 - 2010, Intel Corporation. All rights reserved.<BR>
> ; SPDX-License-Identifier: BSD-2-Clause-Patent
> ;
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/Vt
> f0/Ia16/ResetVectorVtf0.asm
> b/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/V
> tf0/Ia16/ResetVectorVtf0.asm
> index 8a9620a3ae..8234366b2a 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/Vt
> f0/Ia16/ResetVectorVtf0.asm
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/V
> tf0/Ia16/ResetVectorVtf0.asm
> @@ -1,15 +1,8 @@
> -;/** @file
> -; First code executed by processor after resetting.
> -;
> -; Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -; SPDX-License-Identifier: BSD-2-Clause-Patent
> -;
> -;**/
> -; This file includes code originally published under the following license.
> ;------------------------------------------------------------------------------
> ; @file
> ; First code executed by processor after resetting.
> ;
> +; Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> ; Copyright (c) 2008 - 2014, Intel Corporation. All rights reserved.<BR>
> ; SPDX-License-Identifier: BSD-2-Clause-Patent
> ;
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/Vt
> f0/Ia32/Flat32ToFlat64.asm
> b/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/V
> tf0/Ia32/Flat32ToFlat64.asm
> index fc5c99d944..121046fbaf 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/Vt
> f0/Ia32/Flat32ToFlat64.asm
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/V
> tf0/Ia32/Flat32ToFlat64.asm
> @@ -1,15 +1,8 @@
> -;/** @file
> -; Transition from 32 bit flat protected mode into 64 bit flat protected mode
> -;
> -; Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -; SPDX-License-Identifier: BSD-2-Clause-Patent
> -;
> -;**/
> -; This file includes code originally published under the following license.
> ;------------------------------------------------------------------------------
> ; @file
> ; Transition from 32 bit flat protected mode into 64 bit flat protected mode
> ;
> +; Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> ; Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>
> ; SPDX-License-Identifier: BSD-2-Clause-Patent
> ;
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/Vt
> f0/Ia32/PageTables64.asm
> b/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/V
> tf0/Ia32/PageTables64.asm
> index 5bc2a1cabe..14baa6e987 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/Vt
> f0/Ia32/PageTables64.asm
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/V
> tf0/Ia32/PageTables64.asm
> @@ -1,15 +1,8 @@
> -;/** @file
> -; Sets the CR3 register for 64-bit paging
> -;
> -; Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -; SPDX-License-Identifier: BSD-2-Clause-Patent
> -;
> -;**/
> -; This file includes code originally published under the following license.
> ;------------------------------------------------------------------------------
> ; @file
> ; Sets the CR3 register for 64-bit paging
> ;
> +; Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> ; Copyright (c) 2008 - 2013, Intel Corporation. All rights reserved.<BR>
> ; SPDX-License-Identifier: BSD-2-Clause-Patent
> ;
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/Vt
> f0/Ia32/SearchForBfvBase.asm
> b/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/V
> tf0/Ia32/SearchForBfvBase.asm
> index 8a91389280..533004be7e 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/Vt
> f0/Ia32/SearchForBfvBase.asm
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/V
> tf0/Ia32/SearchForBfvBase.asm
> @@ -1,15 +1,8 @@
> -;/** @file
> -; Search for the Boot Firmware Volume (BFV) base address
> -;
> -; Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -; SPDX-License-Identifier: BSD-2-Clause-Patent
> -;
> -;**/
> -; This file includes code originally published under the following license.
> ;------------------------------------------------------------------------------
> ; @file
> ; Search for the Boot Firmware Volume (BFV) base address
> ;
> +; Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> ; Copyright (c) 2008 - 2022, Intel Corporation. All rights reserved.<BR>
> ; SPDX-License-Identifier: BSD-2-Clause-Patent
> ;
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/Vt
> f0/Ia32/SearchForSecEntry.asm
> b/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/V
> tf0/Ia32/SearchForSecEntry.asm
> index c0ac6ba6c8..5bc83f39e5 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/Vt
> f0/Ia32/SearchForSecEntry.asm
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/V
> tf0/Ia32/SearchForSecEntry.asm
> @@ -1,15 +1,8 @@
> -;/** @file
> -; Search for the SEC Core entry point
> -;
> -; Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -; SPDX-License-Identifier: BSD-2-Clause-Patent
> -;
> -;**/
> -; This file includes code originally published under the following license.
> ;------------------------------------------------------------------------------
> ; @file
> ; Search for the SEC Core entry point
> ;
> +; Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> ; Copyright (c) 2008 - 2011, Intel Corporation. All rights reserved.<BR>
> ; SPDX-License-Identifier: BSD-2-Clause-Patent
> ;
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/Vt
> f0/Main.asm
> b/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/V
> tf0/Main.asm
> index 3762192829..08b6076bb8 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/Vt
> f0/Main.asm
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/V
> tf0/Main.asm
> @@ -1,15 +1,8 @@
> -;/** @file
> -; Main routine of the pre-SEC code up through the jump into SEC
> -;
> -; Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -; SPDX-License-Identifier: BSD-2-Clause-Patent
> -;
> -;**/
> -; This file includes code originally published under the following license.
> ;------------------------------------------------------------------------------
> ; @file
> ; Main routine of the pre-SEC code up through the jump into SEC
> ;
> +; Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> ; Copyright (c) 2008 - 2009, Intel Corporation. All rights reserved.<BR>
> ; SPDX-License-Identifier: BSD-2-Clause-Patent
> ;
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/Vt
> f0/Port80Debug.asm
> b/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/V
> tf0/Port80Debug.asm
> index 88b42e0dde..7cb83244df 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/Vt
> f0/Port80Debug.asm
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/V
> tf0/Port80Debug.asm
> @@ -1,15 +1,8 @@
> -;/** @file
> -; Port 0x80 debug support macros
> -;
> -; Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -; SPDX-License-Identifier: BSD-2-Clause-Patent
> -;
> -;**/
> -; This file includes code originally published under the following license.
> ;------------------------------------------------------------------------------
> ; @file
> ; Port 0x80 debug support macros
> ;
> +; Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> ; Copyright (c) 2009, Intel Corporation. All rights reserved.<BR>
> ; SPDX-License-Identifier: BSD-2-Clause-Patent
> ;
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/Vt
> f0/PostCodes.inc
> b/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/V
> tf0/PostCodes.inc
> index f70e4f8207..326c8621d7 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/Vt
> f0/PostCodes.inc
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/V
> tf0/PostCodes.inc
> @@ -1,15 +1,8 @@
> -;/** @file
> -; Definitions of POST CODES for the reset vector module
> -;
> -; Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -; SPDX-License-Identifier: BSD-2-Clause-Patent
> -;
> -;**/
> -; This file includes code originally published under the following license.
> ;------------------------------------------------------------------------------
> ; @file
> ; Definitions of POST CODES for the reset vector module
> ;
> +; Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> ; Copyright (c) 2009, Intel Corporation. All rights reserved.<BR>
> ; SPDX-License-Identifier: BSD-2-Clause-Patent
> ;
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/Vt
> f0/ResetVector.uni
> b/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/V
> tf0/ResetVector.uni
> index
> dfb891ef0c20963158a9abaab47a48b57d4b8160..b05945351150015ad85feecf
> 680a5dc2cb41f894 100644
> GIT binary patch
> delta 11
> ScmZqU>|vX5Z*v5b9uoi=ssqgc
>
> delta 176
> zcmeBSYvY`7Z*mc1S-
> n1kK7#^72tx)#CPOihl?J497*c_(Oolv$WFWhgAqB_>$t5%7
> zgV_o|x(Fzr4px&0RFlI{36w7Ys!am2K_+DY^`rpBN`a<;^cMlyC16pI9r<8A`3&XK
> iU?b9jk|1r#K!tfg&8ZA}3|tHoncOBS*=+nK#smPr^dvd}
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/Vt
> f0/ResetVectorExtra.uni
> b/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/V
> tf0/ResetVectorExtra.uni
> index
> a5cdb9fcb61815e2059eccf35a4c76722d95418d..332232d2a2aa0cb9abd8e87
> dd1269917382e2af5 100644
> GIT binary patch
> delta 12
> TcmdnNv5Iwr1mosqOp_P^9Yq8u
>
> delta 175
> zcmZ3*x`Shb1mom+jAixu4EhWT3?U2|44DkYKvo)%&S6LevN9R+7?OePQic>D
> A0(H|
> zkPl`n0O=y2d^%W7B2Y~ZLnTnY0H`(z$Of5|0o0QM6e|Uq0@7auWS4+NL3ZS
> W_2e^@
> hOM{I_2TFppB?A@a0X3&G=rM3HOk|q2*?_T%5ddEEBM<-p
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/Vt
> f0/SerialDebug.asm
> b/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/V
> tf0/SerialDebug.asm
> index 303b75de24..eec19a20e7 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/Vt
> f0/SerialDebug.asm
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/V
> tf0/SerialDebug.asm
> @@ -1,15 +1,8 @@
> -;/** @file
> -; Serial port debug support macros
> -;
> -; Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -; SPDX-License-Identifier: BSD-2-Clause-Patent
> -;
> -;**/
> -; This file includes code originally published under the following license.
> ;------------------------------------------------------------------------------
> ; @file
> ; Serial port debug support macros
> ;
> +; Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> ; Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>
> ; SPDX-License-Identifier: BSD-2-Clause-Patent
> ;
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/Vt
> f0/Vtf0.inf
> b/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/V
> tf0/Vtf0.inf
> index 75bfa0d546..6271e7ac7f 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/Vt
> f0/Vtf0.inf
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/V
> tf0/Vtf0.inf
> @@ -1,21 +1,7 @@
> ## @file
> # Reset Vector
> #
> -# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -# SPDX-License-Identifier: BSD-2-Clause-Patent
> -#
> -##
> -
> -## @file
> -# Reset Vector
> -#
> -# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -# SPDX-License-Identifier: BSD-2-Clause-Patent
> -##
> -# This file includes code originally published under the following license.
> -## @file
> -# Reset Vector
> -#
> +# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> # Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
> #
> # SPDX-License-Identifier: BSD-2-Clause-Patent
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/Vt
> f0/Vtf0.nasmb
> b/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/V
> tf0/Vtf0.nasmb
> index f5d4dfcb9e..5eaa95148f 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/Vt
> f0/Vtf0.nasmb
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/V
> tf0/Vtf0.nasmb
> @@ -1,15 +1,8 @@
> -;/** @file
> -; This file includes all other code files to assemble the reset vector code
> -;
> -; Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -; SPDX-License-Identifier: BSD-2-Clause-Patent
> -;
> -;**/
> -; This file includes code originally published under the following license.
> ;------------------------------------------------------------------------------
> ; @file
> ; This file includes all other code files to assemble the reset vector code
> ;
> +; Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> ; Copyright (c) 2008 - 2013, Intel Corporation. All rights reserved.<BR>
> ; SPDX-License-Identifier: BSD-2-Clause-Patent
> ;
> diff --git
> a/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/Vt
> f0/X64/PageTables.asm
> b/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/V
> tf0/X64/PageTables.asm
> index 970b09bf1c..0f085cfa27 100644
> ---
> a/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/Vt
> f0/X64/PageTables.asm
> +++
> b/Platform/AMD/VanGoghBoard/Override/edk2/UefiCpuPkg/ResetVector/V
> tf0/X64/PageTables.asm
> @@ -1,15 +1,8 @@
> -;/** @file
> -; Emits Page Tables for 1:1 mapping of the addresses 0 - 0x100000000 (4GB)
> -;
> -; Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -; SPDX-License-Identifier: BSD-2-Clause-Patent
> -;
> -;**/
> -; This file includes code originally published under the following license.
> ;------------------------------------------------------------------------------
> ; @file
> ; Emits Page Tables for 1:1 mapping of the addresses 0 - 0x100000000 (4GB)
> ;
> +; Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> ; Copyright (c) 2008 - 2014, Intel Corporation. All rights reserved.<BR>
> ; SPDX-License-Identifier: BSD-2-Clause-Patent
> ;
> diff --git a/Platform/AMD/VanGoghBoard/Readme.md
> b/Platform/AMD/VanGoghBoard/Readme.md
> new file mode 100644
> index 0000000000..8901b51b38
> --- /dev/null
> +++ b/Platform/AMD/VanGoghBoard/Readme.md
> @@ -0,0 +1,67 @@
> +This document introduces how AMD create a EDK II based sample platform
> BIOS for AMD Chachani-based reference board.
> +Customer can reference this document to study EDK2 BIOS integration.
> +
> +# How to build
> +
> +## The below steps are verified on Microsoft Windows 10 64-bit.
> +1.Install latest Microsoft Visual Studio 2017 Professional version(15.9.40 or
> newer) in the build machine ,make sure
> + that Desktop development with C++ was selected when installing. And
> selected MSVC & Windows 10 SDK tool when installing.
> +2.Install Python 3.9.x (python-3.9.13-amd64.exe), make sure path is
> "C:\Python39".
> +3.Install NASM (nasm-2.15.05-installer-x64.exe), and make sure path is
> "C:\Nasm". (http://www.nasm.us/)
> +4.Download and extract iasl-win-20130117.zip from
> https://acpica.org/sites/acpica/files/iasl-win-20130117.zip,
> + and copy iasl.exe to C:\ASL.
> +5.Download and install ActivePerl-5.24.3.2404-MSWin32-x64-404865.exe,
> copy folders Perl64\bin and Perl64\lib to correct path
> + at Buildrom.bat.
> +6.Download and install OpenSSL
> https://github.com/openssl/openssl/archive/OpenSSL_1_0_1e.zip. And
> make sure OPENSSL_PATH set
> + the correct path at GenCapsule.bat.
> +
> +## Linux build environment preparation
> +
> +### Common Environment
> +Just like Windows environment, you need to install several common tools:
> IASL & NASM. You may refer to your distribution's
> +instructions. E.g., apt install iasl nasm in Ubuntu, or pacman -S iasl nasm in
> Archlinux/SteamOS.Some distributions lack of
> +developer packages by default. E.g., on Ubuntu, you may install uuid-dev
> explicitly by apt install uuid-dev.Python3 is
> +built-in for most Linux distributions. You may install it manually if your
> distribution lacks of it.
> +
> +### GCC Environment
> +GCC is built-in for most Linux distributions. Use gcc --version to check its
> version and ensure its major version > 5.
> +Also, make sure binutils is installed. Use ld --version to check its version. If
> gcc & binutils are not installed,
> +you may refer to your distribution's instructions.
> +
> +### Clang Environment
> +For license reason, Clang is NOT included in most distributions. You may
> install manually with your distribution's instructions.
> +E.g., apt install llvm clang lld in Ubuntu, or pacman -S llvm clang lld in
> Archlinux/SteamOS.
> +Use clang --version to check Clang's version and ensure its major version > 9.
> +Use lld-link --version to check LLD's version and ensure its major version > 9.
> +
> +## Obtaining source code
> +1. Create a new folder (directory) on your local development machine for
> use as your workspace. This example
> + uses `/work/git/tianocore`, modify as appropriate for your needs.
> + ```
> + $ export WORKSPACE=/work/git/tianocore
> + $ mkdir -p $WORKSPACE
> + $ cd $WORKSPACE
> + ```
> +
> +2. Into that folder, clone:
> + 1. [edk2](https://github.com/tianocore/edk2)
> + 2. [edk2-platforms](https://github.com/tianocore/edk2-platforms)
> + 3. [edk2-non-osi](https://github.com/tianocore/edk2-non-osi)
> + ```
> + $ git clone https://github.com/tianocore/edk2.git
> + $ git checkout <branch name> (Please follow ReleaseNote.txt to checkout
> the specified version)
> + $ git submodule update --init
> + ...
> + $ git clone https://github.com/tianocore/edk2-platforms.git
> + $ git submodule update --init
> + ...
> + $ git clone https://github.com/tianocore/edk2-non-osi.git
> + $ git checkout <branch name> (Please follow ReleaseNote.txt to checkout
> the specified version)
> + ```
> +## Manual building
> +
> +### Windows building
> +Copy GoZ_ChachaniInt.bat to $WORKSPACE and run it , then execute
> command “buildrom.bat†to generate final BIOS binary
> 'ChachaniIntUDK.FD'.
> +
> +### Linux building
> +Copy build.sh to $WORKSPACE and run it to generate final BIOS binary
> 'ChachaniIntUDK.FD'.
> diff --git a/Platform/AMD/VanGoghBoard/ReleaseNote.txt
> b/Platform/AMD/VanGoghBoard/ReleaseNote.txt
> new file mode 100644
> index 0000000000..41122d110a
> --- /dev/null
> +++ b/Platform/AMD/VanGoghBoard/ReleaseNote.txt
> @@ -0,0 +1,14 @@
> +***************************************************************
> *************
> +Chachani reference BIOS Release Notes
> +
> +Version: UCC3B16.3824 for VanGogh
> +ScanID: SWCSD-7813
> +
> +Date: Jan 19 2024
> +
> +tianocore/edk2 version: edk2-stable202208
> +tianocore/edk2-non-osi version:
> 1f4d7849f2344aa770f4de5224188654ae5b0e50
> +----------------------------------------------------------------------------
> +- Description:
> +
> +1. Initial ChachaniBoard reference BIOS.
> \ No newline at end of file
> diff --git
> a/Platform/AMD/VanGoghBoard/Universal/AcpiPlatformDxe/AcpiPlatform.c
> b/Platform/AMD/VanGoghBoard/Universal/AcpiPlatformDxe/AcpiPlatform.c
> index 4ac29ca17e..73a022594e 100644
> ---
> a/Platform/AMD/VanGoghBoard/Universal/AcpiPlatformDxe/AcpiPlatform.c
> +++
> b/Platform/AMD/VanGoghBoard/Universal/AcpiPlatformDxe/AcpiPlatform.c
> @@ -1,14 +1,7 @@
> -/** @file
> - Implements AcpiPlatform in Board Package
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -**/
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> Sample ACPI Platform Driver
>
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Universal/AcpiPlatformDxe/AcpiPlatform.u
> ni
> b/Platform/AMD/VanGoghBoard/Universal/AcpiPlatformDxe/AcpiPlatform.u
> ni
> index f79d718588..2001da520b 100644
> ---
> a/Platform/AMD/VanGoghBoard/Universal/AcpiPlatformDxe/AcpiPlatform.u
> ni
> +++
> b/Platform/AMD/VanGoghBoard/Universal/AcpiPlatformDxe/AcpiPlatform.u
> ni
> @@ -1,18 +1,9 @@
> // /** @file
> -// Acpi Platform uni file
> -//
> -// Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -//
> -// SPDX-License-Identifier: BSD-2-Clause-Patent
> -//
> -// **/
> -// This file includes code originally published under the following license.
> -// */
> -// /** @file
> // Sample ACPI Platform Driver
> //
> // Sample ACPI Platform Driver
> //
> +// Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> // Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>
> //
> // SPDX-License-Identifier: BSD-2-Clause-Patent
> diff --git
> a/Platform/AMD/VanGoghBoard/Universal/AcpiPlatformDxe/AcpiPlatformD
> xe.inf
> b/Platform/AMD/VanGoghBoard/Universal/AcpiPlatformDxe/AcpiPlatformD
> xe.inf
> index b197e2c6e7..044218ff46 100644
> ---
> a/Platform/AMD/VanGoghBoard/Universal/AcpiPlatformDxe/AcpiPlatformD
> xe.inf
> +++
> b/Platform/AMD/VanGoghBoard/Universal/AcpiPlatformDxe/AcpiPlatformD
> xe.inf
> @@ -1,13 +1,7 @@
> ## @file
> -# Acpi Platform Dxe driver
> -#
> -# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -# SPDX-License-Identifier: BSD-2-Clause-Patent
> -##
> -# This file includes code originally published under the following license.
> -## @file
> # Sample ACPI Platform Driver
> #
> +# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> # Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>
> # SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> diff --git
> a/Platform/AMD/VanGoghBoard/Universal/AcpiPlatformDxe/AcpiPlatformE
> xtra.uni
> b/Platform/AMD/VanGoghBoard/Universal/AcpiPlatformDxe/AcpiPlatformE
> xtra.uni
> index b0d84752d6..04a89cf3fb 100644
> ---
> a/Platform/AMD/VanGoghBoard/Universal/AcpiPlatformDxe/AcpiPlatformE
> xtra.uni
> +++
> b/Platform/AMD/VanGoghBoard/Universal/AcpiPlatformDxe/AcpiPlatformE
> xtra.uni
> @@ -1,16 +1,7 @@
> // /** @file
> -// Acpi Platform extra uni file
> -//
> -// Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -//
> -// SPDX-License-Identifier: BSD-2-Clause-Patent
> -//
> -// **/
> -// This file includes code originally published under the following license.
> -// */
> -// /** @file
> // AcpiPlatform Localized Strings and Content
> //
> +// Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> // Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
> //
> // SPDX-License-Identifier: BSD-2-Clause-Patent
> diff --git
> a/Platform/AMD/VanGoghBoard/Universal/AcpiPlatformDxe/AcpiPlatformH
> ooks.c
> b/Platform/AMD/VanGoghBoard/Universal/AcpiPlatformDxe/AcpiPlatformH
> ooks.c
> index 9ac9c15e18..7cf5845772 100644
> ---
> a/Platform/AMD/VanGoghBoard/Universal/AcpiPlatformDxe/AcpiPlatformH
> ooks.c
> +++
> b/Platform/AMD/VanGoghBoard/Universal/AcpiPlatformDxe/AcpiPlatformH
> ooks.c
> @@ -1,14 +1,7 @@
> -/** @file
> - Implements AcpiPlatform Hooks in Board Package
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -**/
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> Sample ACPI Platform Driver
>
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Universal/AcpiPlatformDxe/AcpiPlatformH
> ooks.h
> b/Platform/AMD/VanGoghBoard/Universal/AcpiPlatformDxe/AcpiPlatformH
> ooks.h
> index 5d1b7ac38c..9abab0f9e2 100644
> ---
> a/Platform/AMD/VanGoghBoard/Universal/AcpiPlatformDxe/AcpiPlatformH
> ooks.h
> +++
> b/Platform/AMD/VanGoghBoard/Universal/AcpiPlatformDxe/AcpiPlatformH
> ooks.h
> @@ -1,21 +1,14 @@
> -/** @file
> - Implements AcpiPlatform Hooks head file in Board Package
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -**/
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> Sample ACPI Platform Driver
>
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> -#ifndef _ACPI_PLATFORM_HOOKS_H_
> -#define _ACPI_PLATFORM_HOOKS_H_
> +#ifndef ACPI_PLATFORM_HOOKS_H__
> +#define ACPI_PLATFORM_HOOKS_H__
>
> //
> // Statements that include other header files
> diff --git a/Platform/AMD/VanGoghBoard/Universal/FchSpi/FchSpiProtect.h
> b/Platform/AMD/VanGoghBoard/Universal/FchSpi/FchSpiProtect.h
> index e12246d5a3..1dd57c6f52 100644
> --- a/Platform/AMD/VanGoghBoard/Universal/FchSpi/FchSpiProtect.h
> +++ b/Platform/AMD/VanGoghBoard/Universal/FchSpi/FchSpiProtect.h
> @@ -6,8 +6,8 @@
>
> **/
>
> -#ifndef _FCH_SPI_PROTECT_H_
> -#define _FCH_SPI_PROTECT_H_
> +#ifndef FCH_SPI_PROTECT_H__
> +#define FCH_SPI_PROTECT_H__
>
> /**
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Universal/FchSpi/FchSpiRuntimeDxe.c
> b/Platform/AMD/VanGoghBoard/Universal/FchSpi/FchSpiRuntimeDxe.c
> index f7817838f2..7bb402402c 100644
> --- a/Platform/AMD/VanGoghBoard/Universal/FchSpi/FchSpiRuntimeDxe.c
> +++ b/Platform/AMD/VanGoghBoard/Universal/FchSpi/FchSpiRuntimeDxe.c
> @@ -1,16 +1,7 @@
> -/** @file
> - Implements FchSpiRuntimeDxe.c
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> PCH SPI Runtime Driver implements the SPI Host Controller Compatibility
> Interface.
>
> +Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2013-2015 Intel Corporation.
>
> SPDX-License-Identifier: BSD-2-Clause-Patent
> diff --git
> a/Platform/AMD/VanGoghBoard/Universal/FchSpi/FchSpiRuntimeDxe.h
> b/Platform/AMD/VanGoghBoard/Universal/FchSpi/FchSpiRuntimeDxe.h
> index c63a4b3e31..929e821294 100644
> --- a/Platform/AMD/VanGoghBoard/Universal/FchSpi/FchSpiRuntimeDxe.h
> +++ b/Platform/AMD/VanGoghBoard/Universal/FchSpi/FchSpiRuntimeDxe.h
> @@ -1,24 +1,15 @@
> -/** @file
> - Implements FchSpiRuntimeDxe.h
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> Header file for the PCH SPI Runtime Driver.
>
> +Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2013-2015 Intel Corporation.
>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> -#ifndef _FCH_SPI_RUNTIME_DXE_H
> -#define _FCH_SPI_RUNTIME_DXE_H
> +#ifndef FCH_SPI_RUNTIME_DXE_H_
> +#define FCH_SPI_RUNTIME_DXE_H_
>
> #include <Library/PcdLib.h>
> #include <Library/UefiLib.h>
> diff --git
> a/Platform/AMD/VanGoghBoard/Universal/FchSpi/FchSpiRuntimeDxe.inf
> b/Platform/AMD/VanGoghBoard/Universal/FchSpi/FchSpiRuntimeDxe.inf
> index 00480ff75e..c2af195d05 100644
> --- a/Platform/AMD/VanGoghBoard/Universal/FchSpi/FchSpiRuntimeDxe.inf
> +++
> b/Platform/AMD/VanGoghBoard/Universal/FchSpi/FchSpiRuntimeDxe.inf
> @@ -1,14 +1,7 @@
> ## @file
> -# Fch Spi Runtime
> -#
> -# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -# SPDX-License-Identifier: BSD-2-Clause-Patent
> -#
> -##
> -# This file includes code originally published under the following license.
> -## @file
> # Component description file for the SPI Runtime driver.
> #
> +# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> # Copyright (c) 2013-2015 Intel Corporation.
> #
> # SPDX-License-Identifier: BSD-2-Clause-Patent
> diff --git a/Platform/AMD/VanGoghBoard/Universal/FchSpi/FchSpiSmm.c
> b/Platform/AMD/VanGoghBoard/Universal/FchSpi/FchSpiSmm.c
> index 683d2251df..1f842685a8 100644
> --- a/Platform/AMD/VanGoghBoard/Universal/FchSpi/FchSpiSmm.c
> +++ b/Platform/AMD/VanGoghBoard/Universal/FchSpi/FchSpiSmm.c
> @@ -1,17 +1,8 @@
> -/** @file
> - Implements FchSpiSmm.c
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
>
> PCH SPI SMM Driver implements the SPI Host Controller Compatibility
> Interface.
>
> +Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2013-2015 Intel Corporation.
>
> SPDX-License-Identifier: BSD-2-Clause-Patent
> diff --git a/Platform/AMD/VanGoghBoard/Universal/FchSpi/FchSpiSmm.h
> b/Platform/AMD/VanGoghBoard/Universal/FchSpi/FchSpiSmm.h
> index 5ed9f62914..47dbee9391 100644
> --- a/Platform/AMD/VanGoghBoard/Universal/FchSpi/FchSpiSmm.h
> +++ b/Platform/AMD/VanGoghBoard/Universal/FchSpi/FchSpiSmm.h
> @@ -1,24 +1,15 @@
> -/** @file
> - Implements FchSpiSmm.h
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> Header file for the PCH SPI SMM Driver.
>
> +Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2013-2015 Intel Corporation.
>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> -#ifndef _FCH_SPI_SMM_H_
> -#define _FCH_SPI_SMM_H_
> +#ifndef FCH_SPI_SMM_H__
> +#define FCH_SPI_SMM_H__
>
> #include <Library/PcdLib.h>
> #include <Library/UefiLib.h>
> diff --git a/Platform/AMD/VanGoghBoard/Universal/FchSpi/FchSpiSmm.inf
> b/Platform/AMD/VanGoghBoard/Universal/FchSpi/FchSpiSmm.inf
> index 2288d35b84..b30a17119d 100644
> --- a/Platform/AMD/VanGoghBoard/Universal/FchSpi/FchSpiSmm.inf
> +++ b/Platform/AMD/VanGoghBoard/Universal/FchSpi/FchSpiSmm.inf
> @@ -1,16 +1,9 @@
> ## @file
> # Spi smm driver
> #
> -# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -# SPDX-License-Identifier: BSD-2-Clause-Patent
> -#
> -##
> -# This file includes code originally published under the following license.
> -## @file
> -# Spi smm driver
> -#
> # Component description file for the SPI SMM driver.
> #
> +# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> # Copyright (c) 2013-2015 Intel Corporation.
> #
> # SPDX-License-Identifier: BSD-2-Clause-Patent
> diff --git a/Platform/AMD/VanGoghBoard/Universal/FchSpi/SpiCommon.c
> b/Platform/AMD/VanGoghBoard/Universal/FchSpi/SpiCommon.c
> index 5be5026655..4aab7294cb 100644
> --- a/Platform/AMD/VanGoghBoard/Universal/FchSpi/SpiCommon.c
> +++ b/Platform/AMD/VanGoghBoard/Universal/FchSpi/SpiCommon.c
> @@ -1,16 +1,7 @@
> -/** @file
> - Implements SpiCommon.c
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> PCH SPI Common Driver implements the SPI Host Controller Compatibility
> Interface.
>
> +Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2013-2015 Intel Corporation.
>
> SPDX-License-Identifier: BSD-2-Clause-Patent
> diff --git a/Platform/AMD/VanGoghBoard/Universal/FchSpi/SpiInfo.h
> b/Platform/AMD/VanGoghBoard/Universal/FchSpi/SpiInfo.h
> index fd51b71c83..b3b23842a3 100644
> --- a/Platform/AMD/VanGoghBoard/Universal/FchSpi/SpiInfo.h
> +++ b/Platform/AMD/VanGoghBoard/Universal/FchSpi/SpiInfo.h
> @@ -6,10 +6,8 @@
>
> **/
>
> -/* This file includes code originally published under the following license. */
> -
> -#ifndef _SPI_INFO_H_
> -#define _SPI_INFO_H_
> +#ifndef SPI_INFO_H__
> +#define SPI_INFO_H__
>
> #include <Uefi/UefiBaseType.h>
> #include <Protocol/Spi.h>
> diff --git
> a/Platform/AMD/VanGoghBoard/Universal/PlatformInitPei/BootMode.c
> b/Platform/AMD/VanGoghBoard/Universal/PlatformInitPei/BootMode.c
> index 9102ae2b86..ce6114c1ba 100644
> --- a/Platform/AMD/VanGoghBoard/Universal/PlatformInitPei/BootMode.c
> +++ b/Platform/AMD/VanGoghBoard/Universal/PlatformInitPei/BootMode.c
> @@ -2,27 +2,11 @@
> Implements BootMode.C
>
> Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> + Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> -/* This file includes code originally published under the following license. */
> -
> -/** @file
> -This file provide the function to detect boot mode
> -
> -Copyright (c) 2013 Intel Corporation.
> -
> -This program and the accompanying materials
> -are licensed and made available under the terms and conditions of the BSD
> License
> -which 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.
> -
> -**/
> -
> #include "CommonHeader.h"
>
> EFI_PEI_PPI_DESCRIPTOR mPpiListRecoveryBootMode = {
> @@ -60,7 +44,7 @@ ValidateFvHeader (
> EFI_FIRMWARE_VOLUME_HEADER *FwVolHeader;
>
> if (BOOT_IN_RECOVERY_MODE == *BootMode) {
> - DEBUG ((EFI_D_INFO, "Boot mode recovery\n"));
> + DEBUG ((DEBUG_INFO, "Boot mode recovery\n"));
> return EFI_SUCCESS;
> }
>
> @@ -105,7 +89,6 @@ ValidateFvHeader (
> Peform the boot mode determination logic
>
> @param PeiServices General purpose services available to every PEIM.
> -
> @param BootMode The detected boot mode.
>
> @retval EFI_SUCCESS if the boot mode could be set
> @@ -144,7 +127,7 @@ UpdateBootMode (
> //
> if (ValidateFvHeader (&NewBootMode) != EFI_SUCCESS) {
> NewBootMode = BOOT_IN_RECOVERY_MODE;
> - DEBUG ((EFI_D_ERROR, "RECOVERY from corrupt FV\n"));
> + DEBUG ((DEBUG_ERROR, "RECOVERY from corrupt FV\n"));
> }
>
> if (NewBootMode == BOOT_IN_RECOVERY_MODE) {
> @@ -184,7 +167,7 @@ UpdateBootMode (
> if (Status == EFI_SUCCESS) {
> if (Capsule->CheckCapsuleUpdate ((EFI_PEI_SERVICES **)PeiServices) ==
> EFI_SUCCESS) {
> NewBootMode = BOOT_ON_FLASH_UPDATE;
> - DEBUG ((EFI_D_ERROR, "Setting BootMode to %x\n",
> BOOT_ON_FLASH_UPDATE));
> + DEBUG ((DEBUG_ERROR, "Setting BootMode to %x\n",
> BOOT_ON_FLASH_UPDATE));
>
> (*PeiServices)->InstallPpi (PeiServices, &CapsulePpi);
> }
> @@ -233,7 +216,7 @@ UpdateBootMode (
> strBootMode = L"Unknown boot mode";
> } // switch (BootMode)
>
> - DEBUG ((EFI_D_INFO, "Setting BootMode to %s\n", strBootMode));
> + DEBUG ((DEBUG_INFO, "Setting BootMode to %s\n", strBootMode));
> Status = (*PeiServices)->SetBootMode (
> PeiServices,
> NewBootMode
> diff --git
> a/Platform/AMD/VanGoghBoard/Universal/PlatformInitPei/CommonHeader
> .h
> b/Platform/AMD/VanGoghBoard/Universal/PlatformInitPei/CommonHeader
> .h
> index ffc53cec00..bfee353a9c 100644
> ---
> a/Platform/AMD/VanGoghBoard/Universal/PlatformInitPei/CommonHeader
> .h
> +++
> b/Platform/AMD/VanGoghBoard/Universal/PlatformInitPei/CommonHeader
> .h
> @@ -2,30 +2,13 @@
> Implements CommonHeader.h
>
> Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> + Copyright (c) 2013 - 2016，Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> -/* This file includes code originally published under the following license. */
> -
> -/** @file
> -Common header file shared by all source files.
> -
> -This file includes package header files, library classes and protocol, PPI &
> GUID definitions.
> -
> -Copyright (c) 2013 - 2016 Intel Corporation.
> -
> -This program and the accompanying materials
> -are licensed and made available under the terms and conditions of the BSD
> License
> -which 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.
> -**/
> -
> -#ifndef __COMMON_HEADER_H_
> -#define __COMMON_HEADER_H_
> +#ifndef COMMON_HEADER_H___
> +#define COMMON_HEADER_H___
>
> #include <PiPei.h>
> #include <Ppi/Stall.h>
> @@ -110,7 +93,6 @@ Stall (
> Peform the boot mode determination logic
>
> @param PeiServices General purpose services available to every PEIM.
> -
> @param BootMode The detected boot mode.
>
> @retval EFI_SUCCESS if the boot mode could be set
> diff --git
> a/Platform/AMD/VanGoghBoard/Universal/PlatformInitPei/MemoryCallback
> .c
> b/Platform/AMD/VanGoghBoard/Universal/PlatformInitPei/MemoryCallback
> .c
> index 9ab78b7135..22a19509c3 100644
> ---
> a/Platform/AMD/VanGoghBoard/Universal/PlatformInitPei/MemoryCallback
> .c
> +++
> b/Platform/AMD/VanGoghBoard/Universal/PlatformInitPei/MemoryCallback
> .c
> @@ -1,34 +1,19 @@
> /** @file
> Implements MemoryCallback.C
>
> + This file includes a memory call back function notified when MRC is done,
> + following action is performed in this file,
> + 1. ICH initialization after MRC.
> + 2. SIO initialization.
> + 3. Install ResetSystem and FinvFv PPI.
> + 4. Set MTRR for PEI
> + 5. Create FV HOB and Flash HOB
> Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> + Copyright (c) 2013 - 2016, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> -/* This file includes code originally published under the following license. */
> -
> -/** @file
> -This file includes a memory call back function notified when MRC is done,
> -following action is performed in this file,
> - 1. ICH initialization after MRC.
> - 2. SIO initialization.
> - 3. Install ResetSystem and FinvFv PPI.
> - 4. Set MTRR for PEI
> - 5. Create FV HOB and Flash HOB
> -
> -Copyright (c) 2013 - 2016, Intel Corporation.
> -
> -This program and the accompanying materials
> -are licensed and made available under the terms and conditions of the BSD
> License
> -which 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.
> -
> -**/
> -
> #include "CommonHeader.h"
> #include <Ppi/SmmControl.h>
>
> @@ -93,12 +78,12 @@ S3PostScriptTableCallback (
> );
> ASSERT_EFI_ERROR (Status);
> if (EFI_ERROR (Status)) {
> - DEBUG ((EFI_D_ERROR, "PeiServicesLocatePpi gPeiSmmControlPpiGuid: %r
> \n", Status));
> + DEBUG ((DEBUG_ERROR, "PeiServicesLocatePpi
> gPeiSmmControlPpiGuid: %r \n", Status));
> return Status;
> }
>
> SmiCommand = PcdGet8 (PcdFchOemBeforePciRestoreSwSmi);
> - DEBUG ((EFI_D_INFO, "Trigger SW SMI PcdFchOemBeforePciRestoreSwSmi:
> 0x%X\n", SmiCommand));
> + DEBUG ((DEBUG_INFO, "Trigger SW SMI
> PcdFchOemBeforePciRestoreSwSmi: 0x%X\n", SmiCommand));
> SmiCommandSize = sizeof (SmiCommand);
> Status = SmmControl->Trigger (
> (EFI_PEI_SERVICES **)GetPeiServicesTablePointer (),
> @@ -146,12 +131,12 @@ S3EndOfPeiSignalCallback (
>
> ASSERT_EFI_ERROR (Status);
> if (EFI_ERROR (Status)) {
> - DEBUG ((EFI_D_ERROR, "PeiServicesLocatePpi gPeiSmmControlPpiGuid: %r
> \n", Status));
> + DEBUG ((DEBUG_ERROR, "PeiServicesLocatePpi
> gPeiSmmControlPpiGuid: %r \n", Status));
> return Status;
> }
>
> SmiCommand = PcdGet8 (AcpiRestoreSwSmi);
> - DEBUG ((EFI_D_INFO, "Trigger SW SMI AcpiRestoreSwSmi: 0x%X\n",
> SmiCommand));
> + DEBUG ((DEBUG_INFO, "Trigger SW SMI AcpiRestoreSwSmi: 0x%X\n",
> SmiCommand));
> SmiCommandSize = sizeof (SmiCommand);
> Status = SmmControl->Trigger (
> (EFI_PEI_SERVICES **)GetPeiServicesTablePointer (),
> @@ -164,7 +149,7 @@ S3EndOfPeiSignalCallback (
> ASSERT_EFI_ERROR (Status);
>
> SmiCommand = PcdGet8 (PcdFchOemAfterPciRestoreSwSmi);
> - DEBUG ((EFI_D_INFO, "Trigger SW SMI PcdFchOemAfterPciRestoreSwSmi:
> 0x%X\n", SmiCommand));
> + DEBUG ((DEBUG_INFO, "Trigger SW SMI PcdFchOemAfterPciRestoreSwSmi:
> 0x%X\n", SmiCommand));
> SmiCommandSize = sizeof (SmiCommand);
> Status = SmmControl->Trigger (
> (EFI_PEI_SERVICES **)GetPeiServicesTablePointer (),
> @@ -253,7 +238,7 @@ MemoryDiscoveredPpiNotifyCallback (
> AsmCpuid (0x80000001, &RegEax, NULL, NULL, NULL);
> if (((RegEax >> 20) & 0xFF) == 0x8) {
> // For F17: Reserved memory from BootFvBase - (BootFvBase+BootFvSize-
> 1)
> - DEBUG ((EFI_D_INFO, "Family 17: Reserved memory for BFV\n"));
> + DEBUG ((DEBUG_INFO, "Family 17: Reserved memory for BFV\n"));
> BuildMemoryAllocationHob (
> PcdGet32 (PcdMemoryFvRecoveryBase),
> PcdGet32 (PcdFlashFvRecoverySize),
> @@ -261,7 +246,7 @@ MemoryDiscoveredPpiNotifyCallback (
> );
> }
>
> - DEBUG ((EFI_D_INFO,
> "PcdMemoryFvRecoveryBase: %x,PcdFlashFvMainBase: %x\n", PcdGet32
> (PcdMemoryFvRecoveryBase), PcdGet32 (PcdFlashFvMainBase)));
> + DEBUG ((DEBUG_INFO,
> "PcdMemoryFvRecoveryBase: %x,PcdFlashFvMainBase: %x\n", PcdGet32
> (PcdMemoryFvRecoveryBase), PcdGet32 (PcdFlashFvMainBase)));
>
> if ((BootMode != BOOT_ON_S3_RESUME) && (BootMode !=
> BOOT_IN_RECOVERY_MODE)) {
> #ifndef FV_RECOVERY_MAIN_COMBINE_SUPPORT
> @@ -294,7 +279,7 @@ MemoryDiscoveredPpiNotifyCallback (
> FixedPcdGet32 (PcdFlashAreaBaseAddress),
> FixedPcdGet32 (PcdFlashAreaSize)
> );
> - DEBUG ((EFI_D_INFO, "FLASH_BASE_ADDRESS : 0x%x\n", FixedPcdGet32
> (PcdFlashAreaBaseAddress)));
> + DEBUG ((DEBUG_INFO, "FLASH_BASE_ADDRESS : 0x%x\n", FixedPcdGet32
> (PcdFlashAreaBaseAddress)));
>
> //
> // Create a CPU hand-off information
> diff --git
> a/Platform/AMD/VanGoghBoard/Universal/PlatformInitPei/MemoryInstall.c
> b/Platform/AMD/VanGoghBoard/Universal/PlatformInitPei/MemoryInstall.c
> index f58645f2cd..c1b766afc0 100644
> ---
> a/Platform/AMD/VanGoghBoard/Universal/PlatformInitPei/MemoryInstall.c
> +++
> b/Platform/AMD/VanGoghBoard/Universal/PlatformInitPei/MemoryInstall.c
> @@ -1,28 +1,13 @@
> /** @file
> Implements MemoryInstall.C
> + Framework PEIM to initialize memory on a Quark Memory Controller.
>
> Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> + Copyright (c) 2013 - 2016, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> -/* This file includes code originally published under the following license. */
> -
> -/** @file
> -Framework PEIM to initialize memory on a Quark Memory Controller.
> -
> -Copyright (c) 2013 - 2016, Intel Corporation.
> -
> -This program and the accompanying materials
> -are licensed and made available under the terms and conditions of the BSD
> License
> -which 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.
> -
> -**/
> -
> #include "CommonHeader.h"
>
> EFI_MEMORY_TYPE_INFORMATION mDefaultMemoryTypeInformation[] = {
> @@ -280,15 +265,15 @@ InstallEfiMemory (
> );
> ASSERT_EFI_ERROR (Status);
>
> - DEBUG ((EFI_D_INFO, "NumRanges: %d\n", NumRanges));
> + DEBUG ((DEBUG_INFO, "NumRanges: %d\n", NumRanges));
>
> - DEBUG ((EFI_D_INFO, "GetMemoryMap:\n"));
> + DEBUG ((DEBUG_INFO, "GetMemoryMap:\n"));
> for (Index = 0; Index < NumRanges; Index++) {
> - DEBUG ((EFI_D_INFO, "Index: %d ", Index));
> - DEBUG ((EFI_D_INFO, "RangeLength: 0x%016lX\t",
> MemoryMap[Index].RangeLength));
> - DEBUG ((EFI_D_INFO, "PhysicalAddress: 0x%016lX\t",
> MemoryMap[Index].PhysicalAddress));
> - DEBUG ((EFI_D_INFO, "CpuAddress: 0x%016lX\t",
> MemoryMap[Index].CpuAddress));
> - DEBUG ((EFI_D_INFO, "Type: %d\n", MemoryMap[Index].Type));
> + DEBUG ((DEBUG_INFO, "Index: %d ", Index));
> + DEBUG ((DEBUG_INFO, "RangeLength: 0x%016lX\t",
> MemoryMap[Index].RangeLength));
> + DEBUG ((DEBUG_INFO, "PhysicalAddress: 0x%016lX\t",
> MemoryMap[Index].PhysicalAddress));
> + DEBUG ((DEBUG_INFO, "CpuAddress: 0x%016lX\t",
> MemoryMap[Index].CpuAddress));
> + DEBUG ((DEBUG_INFO, "Type: %d\n", MemoryMap[Index].Type));
> }
>
> //
> @@ -313,9 +298,9 @@ InstallEfiMemory (
> PeiMemoryIndex = 0;
>
> for (Index = 0; Index < NumRanges; Index++) {
> - DEBUG ((EFI_D_INFO, "Found 0x%lx bytes at ",
> MemoryMap[Index].RangeLength));
> - DEBUG ((EFI_D_INFO, "0x%lx.\t", MemoryMap[Index].PhysicalAddress));
> - DEBUG ((EFI_D_INFO, "Type: %d.\n", MemoryMap[Index].Type));
> + DEBUG ((DEBUG_INFO, "Found 0x%lx bytes at ",
> MemoryMap[Index].RangeLength));
> + DEBUG ((DEBUG_INFO, "0x%lx.\t", MemoryMap[Index].PhysicalAddress));
> + DEBUG ((DEBUG_INFO, "Type: %d.\n", MemoryMap[Index].Type));
>
> if ((MemoryMap[Index].Type == DualChannelDdrMainMemory) &&
> (MemoryMap[Index].PhysicalAddress +
> MemoryMap[Index].RangeLength < MAX_ADDRESS) &&
> @@ -367,7 +352,7 @@ InstallEfiMemory (
> if (Status == EFI_SUCCESS) {
> CapsuleBuffer = LargeMemRangeBuf;
> CapsuleBufferLength = LargeMemRangeBufLen;
> - DEBUG ((EFI_D_INFO, "CapsuleBuffer: %x, CapsuleBufferLength: %x\n",
> CapsuleBuffer, CapsuleBufferLength));
> + DEBUG ((DEBUG_INFO, "CapsuleBuffer: %x, CapsuleBufferLength: %x\n",
> CapsuleBuffer, CapsuleBufferLength));
>
> //
> // Call the Capsule PPI Coalesce function to coalesce the capsule data.
> @@ -568,7 +553,7 @@ InstallEfiMemory (
> //
> CopyMem (&DescriptorAcpiVariable, &SmramHobDescriptorBlock-
> >Descriptor[SmramRanges-1], sizeof (EFI_SMRAM_DESCRIPTOR));
> DescriptorAcpiVariable.CpuStart += RESERVED_CPU_S3_SAVE_OFFSET;
> - DEBUG ((EFI_D_INFO, "gEfiAcpiVariableGuid CpuStart: 0x%X\n",
> (UINTN)DescriptorAcpiVariable.CpuStart));
> + DEBUG ((DEBUG_INFO, "gEfiAcpiVariableGuid CpuStart: 0x%X\n",
> (UINTN)DescriptorAcpiVariable.CpuStart));
> BuildGuidDataHob (
> &gEfiAcpiVariableGuid,
> &DescriptorAcpiVariable,
> @@ -630,19 +615,19 @@ InstallS3Memory (
> &NumRanges
> );
> ASSERT_EFI_ERROR (Status);
> - DEBUG ((EFI_D_INFO, "NumRanges = 0x%x\n", NumRanges));
> + DEBUG ((DEBUG_INFO, "NumRanges = 0x%x\n", NumRanges));
>
> //
> // Install physical memory descriptor hobs for each memory range.
> //
> SmramRanges = 0;
> - DEBUG ((EFI_D_INFO, "GetMemoryMap:\n"));
> + DEBUG ((DEBUG_INFO, "GetMemoryMap:\n"));
> for (Index = 0; Index < NumRanges; Index++) {
> - DEBUG ((EFI_D_INFO, "Index: %d ", Index));
> - DEBUG ((EFI_D_INFO, "RangeLength: 0x%016lX\t",
> MemoryMap[Index].RangeLength));
> - DEBUG ((EFI_D_INFO, "PhysicalAddress: 0x%016lX\t",
> MemoryMap[Index].PhysicalAddress));
> - DEBUG ((EFI_D_INFO, "CpuAddress: 0x%016lX\t",
> MemoryMap[Index].CpuAddress));
> - DEBUG ((EFI_D_INFO, "Type: %d\n", MemoryMap[Index].Type));
> + DEBUG ((DEBUG_INFO, "Index: %d ", Index));
> + DEBUG ((DEBUG_INFO, "RangeLength: 0x%016lX\t",
> MemoryMap[Index].RangeLength));
> + DEBUG ((DEBUG_INFO, "PhysicalAddress: 0x%016lX\t",
> MemoryMap[Index].PhysicalAddress));
> + DEBUG ((DEBUG_INFO, "CpuAddress: 0x%016lX\t",
> MemoryMap[Index].CpuAddress));
> + DEBUG ((DEBUG_INFO, "Type: %d\n", MemoryMap[Index].Type));
> if ((MemoryMap[Index].PhysicalAddress > 0x100000) &&
> ((MemoryMap[Index].Type == DualChannelDdrSmramCacheable) ||
> (MemoryMap[Index].Type == DualChannelDdrSmramNonCacheable)))
> @@ -652,7 +637,7 @@ InstallS3Memory (
> }
>
> ASSERT (SmramRanges > 0);
> - DEBUG ((EFI_D_INFO, "SmramRanges = 0x%x\n", SmramRanges));
> + DEBUG ((DEBUG_INFO, "SmramRanges = 0x%x\n", SmramRanges));
>
> //
> // Allocate one extra EFI_SMRAM_DESCRIPTOR to describe a page of
> SMRAM memory that contains a pointer
> @@ -663,22 +648,22 @@ InstallS3Memory (
> BufferSize += ((SmramRanges) * sizeof (EFI_SMRAM_DESCRIPTOR));
> }
>
> - DEBUG ((EFI_D_INFO, "BufferSize = 0x%x\n", BufferSize));
> + DEBUG ((DEBUG_INFO, "BufferSize = 0x%x\n", BufferSize));
>
> Hob.Raw = BuildGuidHob (
> &gEfiSmmPeiSmramMemoryReserveGuid,
> BufferSize
> );
> ASSERT (Hob.Raw);
> - DEBUG ((EFI_D_INFO,
> "gEfiSmmPeiSmramMemoryReserveGuid/SmramHobDescriptorBlock: 0x%X
> \n", (UINTN)Hob.Raw));
> + DEBUG ((DEBUG_INFO,
> "gEfiSmmPeiSmramMemoryReserveGuid/SmramHobDescriptorBlock: 0x%X
> \n", (UINTN)Hob.Raw));
>
> SmramHobDescriptorBlock =
> (EFI_SMRAM_HOB_DESCRIPTOR_BLOCK *)(Hob.Raw);
> SmramHobDescriptorBlock->NumberOfSmmReservedRegions =
> SmramRanges + 1;
>
> SmramIndex = 0;
> for (Index = 0; Index < NumRanges; Index++) {
> - DEBUG ((EFI_D_INFO, "Index: 0x%X \t", Index));
> - DEBUG ((EFI_D_INFO, "SmramIndex: 0x%X \n", SmramIndex));
> + DEBUG ((DEBUG_INFO, "Index: 0x%X \t", Index));
> + DEBUG ((DEBUG_INFO, "SmramIndex: 0x%X \n", SmramIndex));
> if ((MemoryMap[Index].PhysicalAddress > 0x100000) &&
> ((MemoryMap[Index].Type == DualChannelDdrSmramCacheable) ||
> (MemoryMap[Index].Type == DualChannelDdrSmramNonCacheable))
> @@ -696,11 +681,11 @@ InstallS3Memory (
> SmramHobDescriptorBlock->Descriptor[SmramIndex].RegionState =
> EFI_SMRAM_CLOSED;
> }
>
> - DEBUG ((EFI_D_INFO, "SmramIndex: 0x%X \n", SmramIndex));
> - DEBUG ((EFI_D_INFO, "PhysicalStart: 0x%X\n",
> (UINTN)SmramHobDescriptorBlock->Descriptor[SmramIndex].PhysicalStart));
> - DEBUG ((EFI_D_INFO, "CpuStart : 0x%X\n",
> (UINTN)SmramHobDescriptorBlock->Descriptor[SmramIndex].CpuStart));
> - DEBUG ((EFI_D_INFO, "PhysicalSize : 0x%X\n",
> (UINTN)SmramHobDescriptorBlock->Descriptor[SmramIndex].PhysicalSize));
> - DEBUG ((EFI_D_INFO, "RegionState : 0x%X\n",
> (UINTN)SmramHobDescriptorBlock->Descriptor[SmramIndex].RegionState));
> + DEBUG ((DEBUG_INFO, "SmramIndex: 0x%X \n", SmramIndex));
> + DEBUG ((DEBUG_INFO, "PhysicalStart: 0x%X\n",
> (UINTN)SmramHobDescriptorBlock->Descriptor[SmramIndex].PhysicalStart));
> + DEBUG ((DEBUG_INFO, "CpuStart : 0x%X\n",
> (UINTN)SmramHobDescriptorBlock->Descriptor[SmramIndex].CpuStart));
> + DEBUG ((DEBUG_INFO, "PhysicalSize : 0x%X\n",
> (UINTN)SmramHobDescriptorBlock->Descriptor[SmramIndex].PhysicalSize));
> + DEBUG ((DEBUG_INFO, "RegionState : 0x%X\n",
> (UINTN)SmramHobDescriptorBlock->Descriptor[SmramIndex].RegionState));
> if ( SmramIndex == SmramRanges - 1) {
> //
> // one extra EFI_SMRAM_DESCRIPTOR for a page of SMRAM memory
> @@ -712,14 +697,14 @@ InstallS3Memory (
> SmramHobDescriptorBlock->Descriptor[SmramIndex].PhysicalSize =
> MemoryMap[Index].RangeLength - EFI_PAGE_SIZE;
> SmramHobDescriptorBlock->Descriptor[SmramIndex].RegionState =
> SmramHobDescriptorBlock->Descriptor[SmramIndex-1].RegionState;
> SmramHobDescriptorBlock->Descriptor[SmramIndex-1].RegionState |=
> EFI_ALLOCATED;
> - DEBUG ((EFI_D_INFO, "SmramIndex: 0x%X \n", SmramIndex));
> - DEBUG ((EFI_D_INFO, "PhysicalStart: 0x%X\n",
> (UINTN)SmramHobDescriptorBlock->Descriptor[SmramIndex].PhysicalStart));
> - DEBUG ((EFI_D_INFO, "CpuStart : 0x%X\n",
> (UINTN)SmramHobDescriptorBlock->Descriptor[SmramIndex].CpuStart));
> - DEBUG ((EFI_D_INFO, "PhysicalSize : 0x%X\n",
> (UINTN)SmramHobDescriptorBlock->Descriptor[SmramIndex].PhysicalSize));
> - DEBUG ((EFI_D_INFO, "RegionState : 0x%X\n\n",
> (UINTN)SmramHobDescriptorBlock->Descriptor[SmramIndex].RegionState));
> -
> - DEBUG ((EFI_D_INFO, "PhysicalSize : 0x%X\n",
> (UINTN)SmramHobDescriptorBlock->Descriptor[SmramIndex-
> 1].PhysicalSize));
> - DEBUG ((EFI_D_INFO, "RegionState : 0x%X\n",
> (UINTN)SmramHobDescriptorBlock->Descriptor[SmramIndex-
> 1].RegionState));
> + DEBUG ((DEBUG_INFO, "SmramIndex: 0x%X \n", SmramIndex));
> + DEBUG ((DEBUG_INFO, "PhysicalStart: 0x%X\n",
> (UINTN)SmramHobDescriptorBlock->Descriptor[SmramIndex].PhysicalStart));
> + DEBUG ((DEBUG_INFO, "CpuStart : 0x%X\n",
> (UINTN)SmramHobDescriptorBlock->Descriptor[SmramIndex].CpuStart));
> + DEBUG ((DEBUG_INFO, "PhysicalSize : 0x%X\n",
> (UINTN)SmramHobDescriptorBlock->Descriptor[SmramIndex].PhysicalSize));
> + DEBUG ((DEBUG_INFO, "RegionState : 0x%X\n\n",
> (UINTN)SmramHobDescriptorBlock->Descriptor[SmramIndex].RegionState));
> +
> + DEBUG ((DEBUG_INFO, "PhysicalSize : 0x%X\n",
> (UINTN)SmramHobDescriptorBlock->Descriptor[SmramIndex-
> 1].PhysicalSize));
> + DEBUG ((DEBUG_INFO, "RegionState : 0x%X\n",
> (UINTN)SmramHobDescriptorBlock->Descriptor[SmramIndex-
> 1].RegionState));
> }
>
> SmramIndex++;
> @@ -731,7 +716,7 @@ InstallS3Memory (
> //
> CopyMem (&DescriptorAcpiVariable, &SmramHobDescriptorBlock-
> >Descriptor[SmramRanges-1], sizeof (EFI_SMRAM_DESCRIPTOR));
> DescriptorAcpiVariable.CpuStart += RESERVED_CPU_S3_SAVE_OFFSET;
> - DEBUG ((EFI_D_INFO, "gEfiAcpiVariableGuid CpuStart: 0x%X\n",
> (UINTN)DescriptorAcpiVariable.CpuStart));
> + DEBUG ((DEBUG_INFO, "gEfiAcpiVariableGuid CpuStart: 0x%X\n",
> (UINTN)DescriptorAcpiVariable.CpuStart));
> BuildGuidDataHob (
> &gEfiAcpiVariableGuid,
> &DescriptorAcpiVariable,
> @@ -743,20 +728,20 @@ InstallS3Memory (
> // install it as PEI Memory.
> //
>
> - DEBUG ((EFI_D_INFO, "TSEG Base = 0x%08x\n",
> SmramHobDescriptorBlock->Descriptor[SmramRanges].PhysicalStart));
> - DEBUG ((EFI_D_INFO, "SmramRanges = 0x%x\n", SmramRanges));
> + DEBUG ((DEBUG_INFO, "TSEG Base = 0x%08x\n",
> SmramHobDescriptorBlock->Descriptor[SmramRanges].PhysicalStart));
> + DEBUG ((DEBUG_INFO, "SmramRanges = 0x%x\n", SmramRanges));
> S3MemoryRangeData = (RESERVED_ACPI_S3_RANGE *)(UINTN)
> (SmramHobDescriptorBlock-
> >Descriptor[SmramRanges].PhysicalStart +
> RESERVED_ACPI_S3_RANGE_OFFSET);
> - DEBUG ((EFI_D_INFO, "S3MemoryRangeData = 0x%08x\n",
> (UINTN)S3MemoryRangeData));
> + DEBUG ((DEBUG_INFO, "S3MemoryRangeData = 0x%08x\n",
> (UINTN)S3MemoryRangeData));
>
> - DEBUG ((EFI_D_INFO, "S3MemoryRangeData->AcpiReservedMemoryBase =
> 0x%X\n", (UINTN)S3MemoryRangeData->AcpiReservedMemoryBase));
> - DEBUG ((EFI_D_INFO, "S3MemoryRangeData->AcpiReservedMemorySize =
> 0x%X\n", (UINTN)S3MemoryRangeData->AcpiReservedMemorySize));
> - DEBUG ((EFI_D_INFO, "S3MemoryRangeData->SystemMemoryLength =
> 0x%X\n", (UINTN)S3MemoryRangeData->SystemMemoryLength));
> + DEBUG ((DEBUG_INFO, "S3MemoryRangeData-
> >AcpiReservedMemoryBase = 0x%X\n", (UINTN)S3MemoryRangeData-
> >AcpiReservedMemoryBase));
> + DEBUG ((DEBUG_INFO, "S3MemoryRangeData->AcpiReservedMemorySize
> = 0x%X\n", (UINTN)S3MemoryRangeData->AcpiReservedMemorySize));
> + DEBUG ((DEBUG_INFO, "S3MemoryRangeData->SystemMemoryLength =
> 0x%X\n", (UINTN)S3MemoryRangeData->SystemMemoryLength));
>
> S3MemoryBase = (UINTN)(S3MemoryRangeData-
> >AcpiReservedMemoryBase);
> - DEBUG ((EFI_D_INFO, "S3MemoryBase = 0x%08x\n", S3MemoryBase));
> + DEBUG ((DEBUG_INFO, "S3MemoryBase = 0x%08x\n", S3MemoryBase));
> S3MemorySize = (UINTN)(S3MemoryRangeData-
> >AcpiReservedMemorySize);
> - DEBUG ((EFI_D_INFO, "S3MemorySize = 0x%08x\n", S3MemorySize));
> + DEBUG ((DEBUG_INFO, "S3MemorySize = 0x%08x\n", S3MemorySize));
>
> Status = PeiServicesInstallPeiMemory (S3MemoryBase, S3MemorySize);
> ASSERT_EFI_ERROR (Status);
> @@ -781,7 +766,7 @@ InstallS3Memory (
> S3MemoryRangeData->SystemMemoryLength - 0x100000
> );
>
> - DEBUG ((EFI_D_INFO, "MemoryBegin: 0x%lX, MemoryLength: 0x%lX\n",
> 0x100000, S3MemoryRangeData->SystemMemoryLength - 0x100000));
> + DEBUG ((DEBUG_INFO, "MemoryBegin: 0x%lX, MemoryLength: 0x%lX\n",
> 0x100000, S3MemoryRangeData->SystemMemoryLength - 0x100000));
>
> for (Index = 0; Index < NumRanges; Index++) {
> if ((MemoryMap[Index].Type == DualChannelDdrMainMemory) &&
> @@ -800,10 +785,10 @@ InstallS3Memory (
> MemoryMap[Index].PhysicalAddress,
> MemoryMap[Index].RangeLength
> );
> - DEBUG ((EFI_D_INFO, "MemoryBegin: 0x%lX, MemoryLength: 0x%lX\n",
> MemoryMap[Index].PhysicalAddress, MemoryMap[Index].RangeLength));
> + DEBUG ((DEBUG_INFO, "MemoryBegin: 0x%lX, MemoryLength: 0x%lX\n",
> MemoryMap[Index].PhysicalAddress, MemoryMap[Index].RangeLength));
>
> - DEBUG ((EFI_D_INFO, "Build resource HOB for Legacy Region on S3
> patch :"));
> - DEBUG ((EFI_D_INFO, " Memory Base:0x%lX Length:0x%lX\n",
> MemoryMap[Index].PhysicalAddress, MemoryMap[Index].RangeLength));
> + DEBUG ((DEBUG_INFO, "Build resource HOB for Legacy Region on S3
> patch :"));
> + DEBUG ((DEBUG_INFO, " Memory Base:0x%lX Length:0x%lX\n",
> MemoryMap[Index].PhysicalAddress, MemoryMap[Index].RangeLength));
> }
> }
>
> @@ -890,7 +875,7 @@ GetPlatformMemorySize (
>
> *MemorySize = PEI_MIN_MEMORY_SIZE;
> for (Index = 0; Index < DataSize / sizeof
> (EFI_MEMORY_TYPE_INFORMATION); Index++) {
> - DEBUG ((EFI_D_INFO, "Index %d, Page: %d\n", Index,
> MemoryData[Index].NumberOfPages));
> + DEBUG ((DEBUG_INFO, "Index %d, Page: %d\n", Index,
> MemoryData[Index].NumberOfPages));
> *MemorySize += MemoryData[Index].NumberOfPages * EFI_PAGE_SIZE;
> }
>
> @@ -904,7 +889,7 @@ GetPlatformMemorySize (
> );
> }
>
> - DEBUG ((EFI_D_INFO, "GetPlatformMemorySize, MemorySize: 0x%lX\n",
> *MemorySize));
> + DEBUG ((DEBUG_INFO, "GetPlatformMemorySize, MemorySize: 0x%lX\n",
> *MemorySize));
> return EFI_SUCCESS;
> }
>
> @@ -937,7 +922,7 @@ MemoryInfoHobPpiNotifyCallback (
> ASSERT_EFI_ERROR (Status);
>
> if (BootMode == BOOT_ON_S3_RESUME) {
> - DEBUG ((EFI_D_INFO, "Following BOOT_ON_S3_RESUME boot path.\n"));
> + DEBUG ((DEBUG_INFO, "Following BOOT_ON_S3_RESUME boot
> path.\n"));
>
> Status = InstallS3Memory (PeiServices, BootMode);
> ASSERT_EFI_ERROR (Status);
> diff --git
> a/Platform/AMD/VanGoghBoard/Universal/PlatformInitPei/MemoryInstall.h
> b/Platform/AMD/VanGoghBoard/Universal/PlatformInitPei/MemoryInstall.h
> index a9a24677ad..63b78638c4 100644
> ---
> a/Platform/AMD/VanGoghBoard/Universal/PlatformInitPei/MemoryInstall.h
> +++
> b/Platform/AMD/VanGoghBoard/Universal/PlatformInitPei/MemoryInstall.h
> @@ -1,30 +1,15 @@
> /** @file
> Implements MemoryInstall.h
> + Framework PEIM to initialize memory on an DDR2 SDRAM Memory
> Controller.
>
> Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> + Copyright (c) 2013 - 2016，Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> -/* This file includes code originally published under the following license. */
> -
> -/** @file
> -Framework PEIM to initialize memory on an DDR2 SDRAM Memory
> Controller.
> -
> -Copyright (c) 2013 - 2016 Intel Corporation.
> -
> -This program and the accompanying materials
> -are licensed and made available under the terms and conditions of the BSD
> License
> -which 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.
> -
> -**/
> -
> -#ifndef _MRC_WRAPPER_H
> -#define _MRC_WRAPPER_H
> +#ifndef MRC_WRAPPER_H_
> +#define MRC_WRAPPER_H_
>
> //
> // Maximum number of memory ranges supported by the memory
> controller
> diff --git
> a/Platform/AMD/VanGoghBoard/Universal/PlatformInitPei/MemoryPeim.c
> b/Platform/AMD/VanGoghBoard/Universal/PlatformInitPei/MemoryPeim.c
> index 5f6aefa9b1..82adb38cfb 100644
> ---
> a/Platform/AMD/VanGoghBoard/Universal/PlatformInitPei/MemoryPeim.c
> +++
> b/Platform/AMD/VanGoghBoard/Universal/PlatformInitPei/MemoryPeim.c
> @@ -1,47 +1,14 @@
> /** @file
> Implements MemoryPeim.C
> + Tiano PEIM to provide the platform support functionality.
> + This file implements the Platform Memory Range PPI
>
> Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> + Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> -/* This file includes code originally published under the following license. */
> -
> -/** @file
> -
> - Copyright (c) 2004 - 2016, 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.
> -
> -
> -
> - 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:
> -
> -
> - MemoryPeim.c
> -
> -Abstract:
> -
> - Tiano PEIM to provide the platform support functionality.
> - This file implements the Platform Memory Range PPI
> -
> ---*/
> -
> #include "CommonHeader.h"
>
> #define MTRR_LIB_CACHE_MTRR_ENABLED 0x800
> @@ -178,7 +145,7 @@ SetPeiCacheMode (
> break;
> }
>
> - DEBUG ((EFI_D_INFO, "Base=%lx, Mask=%lx\n",
> MtrrSetting.Variables.Mtrr[Index].Base,
> MtrrSetting.Variables.Mtrr[Index].Mask));
> + DEBUG ((DEBUG_INFO, "Base=%lx, Mask=%lx\n",
> MtrrSetting.Variables.Mtrr[Index].Base,
> MtrrSetting.Variables.Mtrr[Index].Mask));
> }
>
> //
> @@ -291,7 +258,7 @@ GetAvailableMemoryRanges (
> AMD_MEMORY_RANGE_DESCRIPTOR *Range;
> UINT32 Index;
>
> - DEBUG ((EFI_D_INFO, "GetAvailableMemoryRanges++\n"));
> + DEBUG ((DEBUG_INFO, "GetAvailableMemoryRanges++\n"));
> if ((*NumRanges) < MAX_RANGES) {
> return EFI_BUFFER_TOO_SMALL;
> }
> @@ -312,7 +279,7 @@ GetAvailableMemoryRanges (
> MemoryMap[*NumRanges].RangeLength = Range->Size;
> MemoryMap[*NumRanges].Type = DualChannelDdrMainMemory;
> (*NumRanges)++;
> - DEBUG ((EFI_D_INFO, " Base:0x%016lX, Size: 0x%016lX\n", Range->Base,
> Range->Size));
> + DEBUG ((DEBUG_INFO, " Base:0x%016lX, Size: 0x%016lX\n", Range-
> >Base, Range->Size));
> }
> }
> }
> @@ -344,7 +311,7 @@ GetReservedMemoryRanges (
> AMD_MEMORY_RANGE_DESCRIPTOR *Range;
> UINT32 Index;
>
> - DEBUG ((EFI_D_INFO, "GetReservedMemoryRanges\n"));
> + DEBUG ((DEBUG_INFO, "GetReservedMemoryRanges\n"));
> if ((*NumRanges) < MAX_RANGES) {
> return EFI_BUFFER_TOO_SMALL;
> }
> @@ -366,7 +333,7 @@ GetReservedMemoryRanges (
> MemoryMap[*NumRanges].RangeLength = Range->Size;
> MemoryMap[*NumRanges].Type =
> DualChannelDdrReservedMemory;
> (*NumRanges)++;
> - DEBUG ((EFI_D_INFO, " GetReservedMemoryRanges Base:0x%016lX,
> Size: 0x%016lX\n", Range->Base, Range->Size));
> + DEBUG ((DEBUG_INFO, " GetReservedMemoryRanges Base:0x%016lX,
> Size: 0x%016lX\n", Range->Base, Range->Size));
> }
>
> if (Range->Attribute == AMD_MEMORY_ATTRIBUTE_UMA) {
> @@ -375,7 +342,7 @@ GetReservedMemoryRanges (
> MemoryMap[*NumRanges].RangeLength = Range->Size;
> MemoryMap[*NumRanges].Type =
> DualChannelDdrReservedMemory;
> (*NumRanges)++;
> - DEBUG ((EFI_D_INFO, " GetReservedMemoryRanges Base:0x%016lX,
> Size: 0x%016lX\n", Range->Base, Range->Size));
> + DEBUG ((DEBUG_INFO, " GetReservedMemoryRanges Base:0x%016lX,
> Size: 0x%016lX\n", Range->Base, Range->Size));
> }
> }
> }
> diff --git
> a/Platform/AMD/VanGoghBoard/Universal/PlatformInitPei/PlatformInit.c
> b/Platform/AMD/VanGoghBoard/Universal/PlatformInitPei/PlatformInit.c
> index 4ff57dfca1..7823d31e2c 100644
> --- a/Platform/AMD/VanGoghBoard/Universal/PlatformInitPei/PlatformInit.c
> +++
> b/Platform/AMD/VanGoghBoard/Universal/PlatformInitPei/PlatformInit.c
> @@ -1,33 +1,18 @@
> /** @file
> Implements Platforminit.C
> + This PEIM initialize platform for MRC, following action is performed,
> + 1. Initizluize GMCH
> + 2. Detect boot mode
> + 3. Detect video adapter to determine whether we need pre allocated
> memory
> + 4. Calls MRC to initialize memory and install a PPI notify to do post
> memory initialization.
> + This file contains the main entrypoint of the PEIM.
>
> Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> + Copyright (c) 2013 - 2016，Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> -/* This file includes code originally published under the following license. */
> -
> -/** @file
> -This PEIM initialize platform for MRC, following action is performed,
> -1. Initizluize GMCH
> -2. Detect boot mode
> -3. Detect video adapter to determine whether we need pre allocated
> memory
> -4. Calls MRC to initialize memory and install a PPI notify to do post memory
> initialization.
> -This file contains the main entrypoint of the PEIM.
> -
> -Copyright (c) 2013 - 2016 Intel Corporation.
> -
> -This program and the accompanying materials
> -are licensed and made available under the terms and conditions of the BSD
> License
> -which 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.
> -
> -**/
> -
> #include "CommonHeader.h"
> #define PEI_STALL_RESOLUTION 1
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Universal/PlatformInitPei/PlatformInit.inf
> b/Platform/AMD/VanGoghBoard/Universal/PlatformInitPei/PlatformInit.inf
> index 0941b09de3..8415eadb60 100644
> ---
> a/Platform/AMD/VanGoghBoard/Universal/PlatformInitPei/PlatformInit.inf
> +++
> b/Platform/AMD/VanGoghBoard/Universal/PlatformInitPei/PlatformInit.inf
> @@ -1,24 +1,12 @@
> ## @file
> # Platform Init Module
> +# This is the Platform PEIM to initialize whole platform on PEI phase.
> #
> # Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> +# Copyright (c) 2013 - 2016，Intel Corporation. All rights reserved.<BR>
> # SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
> -# This file includes code originally published under the following license.
> -## @file
> -# This is the Platform PEIM to initialize whole platform on PEI phase.
> -# Copyright (c) 2013 - 2016 Intel Corporation.
> -#
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the
> BSD License
> -# which 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.
> -#
> -##
>
> [Defines]
> INF_VERSION = 0x00010005
> diff --git a/Platform/AMD/VanGoghBoard/Universal/PlatformInitPei/Stall.c
> b/Platform/AMD/VanGoghBoard/Universal/PlatformInitPei/Stall.c
> index 3c7ef4e965..77c239e287 100644
> --- a/Platform/AMD/VanGoghBoard/Universal/PlatformInitPei/Stall.c
> +++ b/Platform/AMD/VanGoghBoard/Universal/PlatformInitPei/Stall.c
> @@ -1,46 +1,13 @@
> /** @file
> Implements Stall.C
> + Produce Stall Ppi.
>
> Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> + Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> -/* This file includes code originally published under the following license. */
> -
> -/** @file
> -
> - Copyright (c) 2004 - 2014, 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.
> -
> -
> -
> - 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:
> -
> - Stall.c
> -
> -Abstract:
> -
> - Produce Stall Ppi.
> -
> ---*/
> #include <PiPei.h>
> #include <Ppi/Stall.h>
> #include <Library/IoLib.h>
> diff --git
> a/Platform/AMD/VanGoghBoard/Universal/PlatformSmbiosDxe/PlatformSm
> biosDxe.c
> b/Platform/AMD/VanGoghBoard/Universal/PlatformSmbiosDxe/PlatformSm
> biosDxe.c
> index 141325c346..c4de6ca133 100644
> ---
> a/Platform/AMD/VanGoghBoard/Universal/PlatformSmbiosDxe/PlatformSm
> biosDxe.c
> +++
> b/Platform/AMD/VanGoghBoard/Universal/PlatformSmbiosDxe/PlatformSm
> biosDxe.c
> @@ -1,15 +1,7 @@
> -/** @file
> - Implements VanGogh board Smbios information
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -**/
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> Static SMBIOS Table for platform
>
> -
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2012, Apple Inc. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> diff --git
> a/Platform/AMD/VanGoghBoard/Universal/PlatformSmbiosDxe/PlatformSm
> biosDxe.inf
> b/Platform/AMD/VanGoghBoard/Universal/PlatformSmbiosDxe/PlatformSm
> biosDxe.inf
> index 058813496d..e16a448d7a 100644
> ---
> a/Platform/AMD/VanGoghBoard/Universal/PlatformSmbiosDxe/PlatformSm
> biosDxe.inf
> +++
> b/Platform/AMD/VanGoghBoard/Universal/PlatformSmbiosDxe/PlatformSm
> biosDxe.inf
> @@ -1,14 +1,7 @@
> -## @file
> -# Platform Smbios Dxe driver
> -#
> -# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -# SPDX-License-Identifier: BSD-2-Clause-Patent
> -##
> -# This file includes code originally published under the following license.
> -
> ## @file
> # Platform SMBIOS driver that fills in SMBIOS table entries.
> #
> +# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> # Copyright (c) 2012, Apple Inc. All rights reserved.
> # Portions copyright (c) 2006 - 2010, Intel Corporation. All rights
> reserved.<BR>
> #
> diff --git
> a/Platform/AMD/VanGoghBoard/Universal/PlatformSmbiosDxe/SmbiosTabl
> e.c
> b/Platform/AMD/VanGoghBoard/Universal/PlatformSmbiosDxe/SmbiosTabl
> e.c
> index 29b16380a1..2770cd23f3 100644
> ---
> a/Platform/AMD/VanGoghBoard/Universal/PlatformSmbiosDxe/SmbiosTabl
> e.c
> +++
> b/Platform/AMD/VanGoghBoard/Universal/PlatformSmbiosDxe/SmbiosTabl
> e.c
> @@ -1,12 +1,5 @@
> /** @file
> Implements VanGogh board Smbios tables
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -**/
> -/* This file includes code originally published under the following license. */
> -
> -/** @file
> Static SMBIOS Table for platform
>
> Note SMBIOS 2.7.1 Required structures:
> @@ -21,9 +14,9 @@
> Memory Array Mapped Address (Type 19) - One per contiguous block per
> Physical Memroy Array
> System Boot Information (Type 32)
>
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2012, Apple Inc. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> **/
>
> #include <PiDxe.h>
> @@ -166,7 +159,7 @@ SMBIOS_TABLE_TYPE3 gSmbiosType3Template = {
> ChassisStateSafe, // PowerSupplyState;
> ChassisStateSafe, // ThermalState;
> ChassisSecurityStatusNone, // SecurityStatus;
> - { 0, 0, 0, 0 }, // OemDefined[4];
> + { 0, 0, 0, 0}, // OemDefined[4];
> 0, // Height;
> 0, // NumberofPowerCords;
> 0, // ContainedElementCount;
> @@ -362,7 +355,7 @@ SMBIOS_TABLE_TYPE23 gSmbiosType23Template = {
>
> SMBIOS_TABLE_TYPE32 gSmbiosType32Template = {
> { EFI_SMBIOS_TYPE_SYSTEM_BOOT_INFORMATION, sizeof
> (SMBIOS_TABLE_TYPE32), 0 },
> - { 0, 0, 0, 0, 0, 0 }, // Reserved[6];
> + { 0, 0, 0, 0, 0, 0}, // Reserved[6];
> BootInformationStatusNoError // BootStatus
> };
>
> diff --git
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Application/UDKFlas
> hUpdate/SpiFlashDevice.h
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Application/UDKFla
> shUpdate/SpiFlashDevice.h
> index 8846eb5381..fe4d99e82c 100644
> ---
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Application/UDKFlas
> hUpdate/SpiFlashDevice.h
> +++
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Application/UDKFla
> shUpdate/SpiFlashDevice.h
> @@ -6,8 +6,8 @@
>
> **/
>
> -#ifndef _SPI_FLASH_DEVICE_H_
> -#define _SPI_FLASH_DEVICE_H_
> +#ifndef SPI_FLASH_DEVICE_H__
> +#define SPI_FLASH_DEVICE_H__
>
> #include <PiDxe.h>
> #include <Protocol/Spi.h>
> diff --git
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Application/UDKFlas
> hUpdate/UDKFlashUpdate.c
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Application/UDKFla
> shUpdate/UDKFlashUpdate.c
> index 0f3bb149f9..0497509d03 100644
> ---
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Application/UDKFlas
> hUpdate/UDKFlashUpdate.c
> +++
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Application/UDKFla
> shUpdate/UDKFlashUpdate.c
> @@ -1,15 +1,7 @@
> -/** @file
> - Implements UDKFlashUpdate.c
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -// This file includes code originally published under the following license.
> -
> /** @file
> Platform Flash Access library.
>
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> diff --git
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Application/UDKFlas
> hUpdate/UDKFlashUpdate.h
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Application/UDKFla
> shUpdate/UDKFlashUpdate.h
> index a0904fb863..ed15a4489a 100644
> ---
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Application/UDKFlas
> hUpdate/UDKFlashUpdate.h
> +++
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Application/UDKFla
> shUpdate/UDKFlashUpdate.h
> @@ -6,8 +6,8 @@
>
> **/
>
> -#ifndef _UDK_FLASH_UPDATE_H
> -#define _UDK_FLASH_UPDATE_H
> +#ifndef UDK_FLASH_UPDATE_H_
> +#define UDK_FLASH_UPDATE_H_
>
> #include <Uefi.h>
>
> diff --git
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/FlashUpdate/FlashU
> pdateCommon.h
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/FlashUpdate/FlashU
> pdateCommon.h
> index 593a44b61a..616035b82d 100644
> ---
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/FlashUpdate/FlashU
> pdateCommon.h
> +++
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/FlashUpdate/FlashU
> pdateCommon.h
> @@ -6,8 +6,8 @@
>
> **/
>
> -#ifndef _FLASH_UPDATE_COMMON_H_
> -#define _FLASH_UPDATE_COMMON_H_
> +#ifndef FLASH_UPDATE_COMMON_H__
> +#define FLASH_UPDATE_COMMON_H__
>
> #include <Library/DebugLib.h>
> #include <Library/UefiBootServicesTableLib.h>
> diff --git
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/FlashUpdate/FlashU
> pdateSmm.h
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/FlashUpdate/FlashU
> pdateSmm.h
> index d52b1245b8..14bd37ed2e 100644
> ---
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/FlashUpdate/FlashU
> pdateSmm.h
> +++
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/FlashUpdate/FlashU
> pdateSmm.h
> @@ -6,8 +6,8 @@
>
> **/
>
> -#ifndef _FLASH_UPDATE_SMM_H_
> -#define _FLASH_UPDATE_SMM_H_
> +#ifndef FLASH_UPDATE_SMM_H__
> +#define FLASH_UPDATE_SMM_H__
>
> #include <Library/SmmServicesTableLib.h>
> #include <Library/DebugLib.h>
> diff --git
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/FlashUpdate/PcRtc.
> h
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/FlashUpdate/PcRtc.
> h
> index 30e9e168cd..08caf4257b 100644
> ---
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/FlashUpdate/PcRtc.
> h
> +++
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/FlashUpdate/PcRtc.
> h
> @@ -1,30 +1,15 @@
> /** @file
> Implements AMD PcRtc
> + Header file for real time clock driver.
>
> Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> + Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> -**/
> -// This file includes code originally published under the following license.
> -
> -/** @file
> - Header file for real time clock driver.
> -
> -Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
> -Copyright (c) 2017, AMD Inc. All rights reserved.<BR>
> -
> -This program and the accompanying materials
> -are licensed and made available under the terms and conditions of the BSD
> License
> -which 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.
> -
> **/
>
> -#ifndef _RTC_H_
> -#define _RTC_H_
> +#ifndef RTC_H__
> +#define RTC_H__
>
> #include <Uefi.h>
>
> diff --git
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/FvbServices/FvbInfo
> .c
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/FvbServices/FvbInfo
> .c
> index d980bb6653..c0be635864 100644
> ---
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/FvbServices/FvbInfo
> .c
> +++
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/FvbServices/FvbInfo
> .c
> @@ -1,17 +1,9 @@
> -/** @file
> - Implements FvbInfo
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -// This file includes code originally published under the following license.
> -
> /** @file
> Defines data structure that is the volume header found.These data is intent
> to decouple FVB driver with FV header.
>
> -Copyright (c) 2013 Intel Corporation.
> +Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> +Copyright (c) 2013 Intel Corporation. All rights reserved.<BR>
>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> diff --git
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/FvbServices/FwBloc
> kService.c
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/FvbServices/FwBloc
> kService.c
> index 5565b69de5..f514ad772a 100644
> ---
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/FvbServices/FwBloc
> kService.c
> +++
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/FvbServices/FwBloc
> kService.c
> @@ -2,18 +2,9 @@
> Implements FvbServicesSmm
>
> Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> + Copyright (c) 2013-2016 Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> -**/
> -// This file includes code originally published under the following license.
> -
> -/** @file
> -
> -Copyright (c) 2013-2016 Intel Corporation.
> -
> -SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -
> **/
>
> #ifdef _MSC_VER
> @@ -348,7 +339,6 @@ FvbReadBlock (
> IN BOOLEAN Virtual
> )
>
> -
> {
> EFI_FVB_ATTRIBUTES_2 Attributes;
> UINTN LbaAddress;
> @@ -730,7 +720,6 @@ FvbProtocolGetBlockSize (
> OUT UINTN *NumOfBlocks
> )
>
> -
> {
> EFI_FW_VOL_BLOCK_DEVICE *FvbDevice;
>
> @@ -1211,24 +1200,25 @@ FlashFdWrite (
> )
> {
> EFI_STATUS Status;
> +
> Status = EFI_SUCCESS;
>
> //
> // TODO: Suggested that this code be "critical section"
> //
> WriteAddress -= (PcdGet32 (PcdFlashAreaBaseAddress));
> - Status = mFvbModuleGlobal->SpiProtocol->Execute (
> - mFvbModuleGlobal->SpiProtocol,
> - SPI_OPCODE_WRITE_INDEX, // OpcodeIndex
> - 0, // PrefixOpcodeIndex
> - TRUE, // DataCycle
> - TRUE, // Atomic
> - TRUE, // ShiftOut
> - WriteAddress, // Address
> - (UINT32)(*NumBytes), // Data Number
> - Buffer,
> - EnumSpiRegionBios
> - );
> + Status = mFvbModuleGlobal->SpiProtocol->Execute (
> + mFvbModuleGlobal->SpiProtocol,
> + SPI_OPCODE_WRITE_INDEX, // OpcodeIndex
> + 0, // PrefixOpcodeIndex
> + TRUE, // DataCycle
> + TRUE, // Atomic
> + TRUE, // ShiftOut
> + WriteAddress, // Address
> + (UINT32)(*NumBytes), // Data Number
> + Buffer,
> + EnumSpiRegionBios
> + );
>
> AsmWbinvd ();
>
> diff --git
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/FvbServices/FwBloc
> kService.h
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/FvbServices/FwBloc
> kService.h
> index 224ac23113..a604f3be4b 100644
> ---
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/FvbServices/FwBloc
> kService.h
> +++
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/FvbServices/FwBloc
> kService.h
> @@ -1,24 +1,15 @@
> /** @file
> Implements FvbServicesSmm
> + Firmware volume block driver for SPI device
>
> Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> + Copyright (c) 2013-2015 Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> -// This file includes code originally published under the following license.
>
> -/** @file
> -Firmware volume block driver for SPI device
> -
> -Copyright (c) 2013-2015 Intel Corporation.
> -
> -SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -
> -**/
> -
> -#ifndef _FW_BLOCK_SERVICE_SMM_H
> -#define _FW_BLOCK_SERVICE_SMM_H
> +#ifndef FW_BLOCK_SERVICE_SMM_H_
> +#define FW_BLOCK_SERVICE_SMM_H_
>
> //
> // The Library classes this module consumes
> diff --git
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/FvbServices/Platfor
> mSmmSpi.inf
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/FvbServices/Platfor
> mSmmSpi.inf
> index e179f99f2a..0a620662d2 100644
> ---
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/FvbServices/Platfor
> mSmmSpi.inf
> +++
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/FvbServices/Platfor
> mSmmSpi.inf
> @@ -1,22 +1,13 @@
> ## @file
> # FvbServicesSmm
> +# Component description file for SpiFvbServices Module
> #
> # Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> +# Copyright (c) 2013-2015 Intel Corporation. All rights reserved.<BR>
> # SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> -# This file includes code originally published under the following license.
> -## @file
> -# Component description file for SpiFvbServices Module
> -#
> -# Copyright (c) 2013-2015 Intel Corporation.
> -#
> -# SPDX-License-Identifier: BSD-2-Clause-Patent
> -#
> -##
> -
> -
> [Defines]
> INF_VERSION = 0x00010005
> BASE_NAME = FvbServicesSmm
> diff --git
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Include/Library/Sm
> biosLib.h
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Include/Library/Sm
> biosLib.h
> index 5880eac36e..314f0448fd 100644
> ---
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Include/Library/Sm
> biosLib.h
> +++
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Include/Library/Sm
> biosLib.h
> @@ -1,24 +1,16 @@
> /** @file
> Implements AMD SmbiosLib.h
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -// This file includes code originally published under the following license.
> -/** @file
> Provides library functions for common SMBIOS operations. Only available
> to DXE
> and UEFI module types.
>
> -
> -Copyright (c) 2012, Apple Inc. All rights reserved.
> -Portitions Copyright (c) 2006 - 2011, Intel Corporation. All rights
> reserved.<BR>
> -SPDX-License-Identifier: BSD-2-Clause-Patent
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> + Copyright (c) 2012, Apple Inc. All rights reserved. All rights reserved.<BR>
> + SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> -#ifndef _SMBIOS_LIB_H__
> -#define _SMBIOS_LIB_H__
> +#ifndef SMBIOS_LIB_H___
> +#define SMBIOS_LIB_H___
>
> #include <IndustryStandard/SmBios.h>
> #include <Protocol/Smbios.h>
> diff --git
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Include/Library/SpiF
> lashDeviceLib.h
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Include/Library/SpiF
> lashDeviceLib.h
> index e1fb1c31d9..a6ec077f05 100644
> ---
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Include/Library/SpiF
> lashDeviceLib.h
> +++
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Include/Library/SpiF
> lashDeviceLib.h
> @@ -6,8 +6,8 @@
>
> **/
>
> -#ifndef _SPI_FLASH_DEVICE_LIB_H_
> -#define _SPI_FLASH_DEVICE_LIB_H_
> +#ifndef SPI_FLASH_DEVICE_LIB_H__
> +#define SPI_FLASH_DEVICE_LIB_H__
>
> #include <Protocol/Spi.h>
>
> diff --git
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Include/OtaCapsule
> Update.h
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Include/OtaCapsule
> Update.h
> index 6f10bc9c82..0b3ba20ceb 100644
> ---
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Include/OtaCapsule
> Update.h
> +++
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Include/OtaCapsule
> Update.h
> @@ -5,8 +5,8 @@
>
> **/
>
> -#ifndef _OTA_CAPSULE_UPDATE_H_
> -#define _OTA_CAPSULE_UPDATE_H_
> +#ifndef OTA_CAPSULE_UPDATE_H__
> +#define OTA_CAPSULE_UPDATE_H__
>
> #pragma pack (1)
> //
> diff --git
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Include/Protocol/Sp
> i.h
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Include/Protocol/Sp
> i.h
> index 0487946a70..c7c3591479 100644
> ---
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Include/Protocol/Sp
> i.h
> +++
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Include/Protocol/Sp
> i.h
> @@ -1,31 +1,16 @@
> /** @file
> Implements AMD Spi
> + This file defines the EFI SPI Protocol which implements the
> + Intel(R) ICH SPI Host Controller Compatibility Interface.
>
> Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> + Copyright (c) 2013-2015 Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> -// This file includes code originally published under the following license.
>
> -/** @file
> -This file defines the EFI SPI Protocol which implements the
> -Intel(R) ICH SPI Host Controller Compatibility Interface.
> -
> -Copyright (c) 2013-2015 Intel Corporation.
> -
> -This program and the accompanying materials
> -are licensed and made available under the terms and conditions of the BSD
> License
> -which 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.
> -
> -
> -**/
> -
> -#ifndef _SPI_H_
> -#define _SPI_H_
> +#ifndef SPI_H__
> +#define SPI_H__
>
> #include <Uefi/UefiBaseType.h>
>
> diff --git
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Include/Protocol/Sp
> iCommon.h
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Include/Protocol/Sp
> iCommon.h
> index 254b4b0e87..832669bbf4 100644
> ---
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Include/Protocol/Sp
> iCommon.h
> +++
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Include/Protocol/Sp
> iCommon.h
> @@ -1,29 +1,15 @@
> /** @file
> Implements AMD SpiCommon
> + Header file for the PCH SPI Common Driver.
>
> Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> + Copyright (c) 2013-2015 Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
> -// This file includes code originally published under the following license.
>
> -/** @file
> -Header file for the PCH SPI Common Driver.
> -
> -Copyright (c) 2013-2015 Intel Corporation.
> -
> -This program and the accompanying materials
> -are licensed and made available under the terms and conditions of the BSD
> License
> -which 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.
> -
> -**/
> -
> -#ifndef _SPI_COMMON_H_
> -#define _SPI_COMMON_H_
> +#ifndef SPI_COMMON_H__
> +#define SPI_COMMON_H__
>
> #include "Protocol/Spi.h"
>
> diff --git
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Include/Protocol/Sp
> iFlashUpdate.h
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Include/Protocol/Sp
> iFlashUpdate.h
> index a0a967b838..3689a3bae3 100644
> ---
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Include/Protocol/Sp
> iFlashUpdate.h
> +++
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Include/Protocol/Sp
> iFlashUpdate.h
> @@ -6,8 +6,8 @@
>
> **/
>
> -#ifndef _SPI_FLASH_UPDATE_H_
> -#define _SPI_FLASH_UPDATE_H_
> +#ifndef SPI_FLASH_UPDATE_H__
> +#define SPI_FLASH_UPDATE_H__
>
> #include <Uefi/UefiBaseType.h>
>
> diff --git
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Library/BaseSerialP
> ortLib16550AmdFchUart/BaseSerialPortLib16550AmdFchUart.c
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Library/BaseSerialP
> ortLib16550AmdFchUart/BaseSerialPortLib16550AmdFchUart.c
> index cf97e4109d..665f47f703 100644
> ---
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Library/BaseSerialP
> ortLib16550AmdFchUart/BaseSerialPortLib16550AmdFchUart.c
> +++
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Library/BaseSerialP
> ortLib16550AmdFchUart/BaseSerialPortLib16550AmdFchUart.c
> @@ -1,19 +1,9 @@
> -/** @file
> - Implements BaseSerialPortLib16550AmdFchUart.c
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> 16550 UART Serial Port library functions
>
> - (C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> + Copyright (C) 2014 Hewlett-Packard Development Company, L.P.<BR>
> Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>
> - Copyright (c) 2018, AMD Incorporated. All rights reserved.<BR>
> Copyright (c) 2020, ARM Limited. All rights reserved.
>
> SPDX-License-Identifier: BSD-2-Clause-Patent
> diff --git
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Library/BaseSerialP
> ortLib16550AmdFchUart/BaseSerialPortLib16550AmdFchUart.inf
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Library/BaseSerialP
> ortLib16550AmdFchUart/BaseSerialPortLib16550AmdFchUart.inf
> index e0eb5c0caf..e6f824401d 100644
> ---
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Library/BaseSerialP
> ortLib16550AmdFchUart/BaseSerialPortLib16550AmdFchUart.inf
> +++
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Library/BaseSerialP
> ortLib16550AmdFchUart/BaseSerialPortLib16550AmdFchUart.inf
> @@ -1,16 +1,7 @@
> -## @file
> -# Platform SerialPortLib
> -#
> -# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -# SPDX-License-Identifier: BSD-2-Clause-Patent
> -#
> -##
> -
> -#This file includes code originally published under the following license.
> -
> ## @file
> # SerialPortLib instance for 16550 UART.
> #
> +# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> # Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>
> # Copyright (c) 2020, ARM Limited. All rights reserved.
> #
> diff --git
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Library/PlatformFlas
> hAccessLib/PlatformFlashAccessLib.c
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Library/PlatformFla
> shAccessLib/PlatformFlashAccessLib.c
> index 5a668203b2..61c5983c44 100644
> ---
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Library/PlatformFlas
> hAccessLib/PlatformFlashAccessLib.c
> +++
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Library/PlatformFla
> shAccessLib/PlatformFlashAccessLib.c
> @@ -1,26 +1,13 @@
> /** @file
> Implements PlatformFlashAccessLib.c
> + Platform Flash Access library.
>
> Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> + Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> -/* This file includes code originally published under the following license. */
> -
> -/** @file
> - Platform Flash Access library.
> -
> - Copyright (c) 2016 - 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
> - which 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.
> -
> -**/
> #include <Uefi.h>
>
> #include <PiDxe.h>
> diff --git
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Library/SmbiosLib/S
> mbiosLib.c
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Library/SmbiosLib/S
> mbiosLib.c
> index 97a45c286d..52d5e2d131 100644
> ---
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Library/SmbiosLib/S
> mbiosLib.c
> +++
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Library/SmbiosLib/S
> mbiosLib.c
> @@ -1,18 +1,8 @@
> -/** @file
> - Implements AMD Smbioslib.c
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> Provides library functions for common SMBIOS operations. Only available
> to DXE
> and UEFI module types.
>
> -
> +Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2012, Apple Inc. All rights reserved.
> Portitions Copyright (c) 2006 - 2019, Intel Corporation. All rights
> reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
> diff --git
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Library/SmbiosLib/S
> mbiosLib.inf
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Library/SmbiosLib/S
> mbiosLib.inf
> index 4ed4691b36..c1829d6f2d 100644
> ---
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Library/SmbiosLib/S
> mbiosLib.inf
> +++
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Library/SmbiosLib/S
> mbiosLib.inf
> @@ -1,20 +1,10 @@
> -## @file
> # SMBIOS Library
> #
> # Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -# SPDX-License-Identifier: BSD-2-Clause-Patent
> -#
> -##
> -
> -## @file
> -# This file includes code originally published under the following license.
> -# SMBIOS Library
> -#
> # Copyright (c) 2012, Apple Inc. All rights reserved.
> # Portions copyright (c) 2006 - 2010, Intel Copyright (c) 2006 - 2018, Intel
> Corporation. All rights reserved.<BR>
> #
> -# SPDX-License-Identifier: BSD-2-Clause-Patent
> -#
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Library/TscTimerLib
> /BaseTscTimerLib.c
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Library/TscTimerLib
> /BaseTscTimerLib.c
> index a4e37da22e..7dfef490e9 100644
> ---
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Library/TscTimerLib
> /BaseTscTimerLib.c
> +++
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Library/TscTimerLib
> /BaseTscTimerLib.c
> @@ -1,16 +1,7 @@
> -/** @file
> - Implements AMD BaseTscTimerLib.c
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> ACPI Timer implements one instance of Timer Library.
>
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> diff --git
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Library/TscTimerLib
> /BaseTscTimerLib.inf
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Library/TscTimerLib
> /BaseTscTimerLib.inf
> index 7dc29cef40..d6c4e2e1d6 100644
> ---
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Library/TscTimerLib
> /BaseTscTimerLib.inf
> +++
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Library/TscTimerLib
> /BaseTscTimerLib.inf
> @@ -1,23 +1,11 @@
> ## @file
> # BaseTscTimerLib
> -#
> -# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -# SPDX-License-Identifier: BSD-2-Clause-Patent
> -#
> -##
> -
> -# This file includes code originally published under the following license.
> -## @file
> -# Base ACPI Timer Library
> -#
> # Provides basic timer support using the ACPI timer hardware. The
> performance
> # counter features are provided by the processors time stamp counter.
> #
> -# Note: The implementation uses the lower 24-bits of the ACPI timer and
> -# is compatible with both 24-bit and 32-bit ACPI timers.
> -#
> -# Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
> -# SPDX-License-Identifier: BSD-2-Clause-Patent
> +# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> +# Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> ##
>
> diff --git
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Library/TscTimerLib
> /DxeTscTimerLib.c
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Library/TscTimerLib
> /DxeTscTimerLib.c
> index e0616565fc..5a374665c3 100644
> ---
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Library/TscTimerLib
> /DxeTscTimerLib.c
> +++
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Library/TscTimerLib
> /DxeTscTimerLib.c
> @@ -1,16 +1,7 @@
> -/** @file
> - Implements AMD DxeTscTimerLib.c
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> ACPI Timer implements one instance of Timer Library.
>
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
> Copyright (c) Microsoft Corporation.
> SPDX-License-Identifier: BSD-2-Clause-Patent
> diff --git
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Library/TscTimerLib
> /PeiTscTimerLib.c
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Library/TscTimerLib
> /PeiTscTimerLib.c
> index d2a562197a..338821b5d7 100644
> ---
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Library/TscTimerLib
> /PeiTscTimerLib.c
> +++
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Library/TscTimerLib
> /PeiTscTimerLib.c
> @@ -1,16 +1,7 @@
> -/** @file
> - Implements AMD PeiTscTimerLib.c
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> ACPI Timer implements one instance of Timer Library.
>
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> diff --git
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Library/TscTimerLib
> /TscTimerLibInternal.h
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Library/TscTimerLib
> /TscTimerLibInternal.h
> index 68d0949cbd..cd4fc9db14 100644
> ---
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Library/TscTimerLib
> /TscTimerLibInternal.h
> +++
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Library/TscTimerLib
> /TscTimerLibInternal.h
> @@ -1,23 +1,14 @@
> -/** @file
> - Implements AMD TscTimerLibInternal.h
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> Header file internal to ACPI TimerLib.
>
> -Copyright (c) Microsoft Corporation.
> +Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> +Copyright (c) Microsoft Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> **/
>
> -#ifndef _TSC_TIMER_LIB_INTERNAL_H_
> -#define _TSC_TIMER_LIB_INTERNAL_H_
> +#ifndef TSC_TIMER_LIB_INTERNAL_H__
> +#define TSC_TIMER_LIB_INTERNAL_H__
>
> #include <Library/TimerLib.h>
> #include <Library/BaseLib.h>
> diff --git
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Library/TscTimerLib
> /TscTimerLibShare.c
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Library/TscTimerLib
> /TscTimerLibShare.c
> index 39eff36abc..a49a2db2b3 100644
> ---
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Library/TscTimerLib
> /TscTimerLibShare.c
> +++
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Library/TscTimerLib
> /TscTimerLibShare.c
> @@ -1,16 +1,7 @@
> -/** @file
> - Implements AMD TscTimerLibShare.c
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> ACPI Timer implements one instance of Timer Library.
>
> + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> diff --git
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Smm/AcpiSmm/Acp
> iSmmPlatform.c
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Smm/AcpiSmm/Acp
> iSmmPlatform.c
> index 383bcec471..20a0ed6cb7 100644
> ---
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Smm/AcpiSmm/Acp
> iSmmPlatform.c
> +++
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Smm/AcpiSmm/Acp
> iSmmPlatform.c
> @@ -1,23 +1,13 @@
> -/** @file
> - Implements AMD AcpiSmmPlatform.c
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> ACPISMM Driver implementation file.
>
> This is QNC Smm platform driver
>
> -Copyright (c) 2013-2019 Intel Corporation.
> +Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> +Copyright (c) 2013-2019 Intel Corporation. All rights reserved.<BR>
>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> -
> **/
>
> #include <AcpiSmmPlatform.h>
> @@ -153,7 +143,6 @@ InitAcpiSmmPlatform (
> IN EFI_SYSTEM_TABLE *SystemTable
> )
>
> -
> {
> EFI_STATUS Status;
> EFI_GLOBAL_NVS_AREA_PROTOCOL *AcpiNvsProtocol = NULL;
> diff --git
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Smm/AcpiSmm/Acp
> iSmmPlatform.h
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Smm/AcpiSmm/Acp
> iSmmPlatform.h
> index ad519bca3b..31ab4f083d 100644
> ---
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Smm/AcpiSmm/Acp
> iSmmPlatform.h
> +++
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Smm/AcpiSmm/Acp
> iSmmPlatform.h
> @@ -1,25 +1,15 @@
> -/** @file
> - Implements AMD AcpiSmmPlatform.h
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> Header file for SMM S3 Handler Driver.
>
> -Copyright (c) 2013-2019 Intel Corporation.
> +Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> +Copyright (c) 2013-2019 Intel Corporation. All rights reserved.<BR>
>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> -
> **/
>
> -#ifndef _ACPI_SMM_DRIVER_H
> -#define _ACPI_SMM_DRIVER_H
> +#ifndef ACPI_SMM_DRIVER_H_
> +#define ACPI_SMM_DRIVER_H_
> //
> // Include files
> //
> diff --git
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Smm/AcpiSmm/Acp
> iSmmPlatform.inf
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Smm/AcpiSmm/Acp
> iSmmPlatform.inf
> index be252c4851..428e04b7d2 100644
> ---
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Smm/AcpiSmm/Acp
> iSmmPlatform.inf
> +++
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Smm/AcpiSmm/Acp
> iSmmPlatform.inf
> @@ -1,16 +1,8 @@
> ## @file
> -# AcpiSmmPlatform
> -#
> -# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -# SPDX-License-Identifier: BSD-2-Clause-Patent
> -#
> -##
> -
> -# This file includes code originally published under the following license.
> -## @file
> # Component description file for ACPI SMM Platform handler module
> #
> # This is QNC Smm platform driver .
> +# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> # Copyright (c) 2013-2019 Intel Corporation.
> #
> # SPDX-License-Identifier: BSD-2-Clause-Patent
> diff --git
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Smm/SmmAccessPe
> i/SmmAccessPei.c
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Smm/SmmAccessPe
> i/SmmAccessPei.c
> index 200aebf59c..7880acc2f3 100644
> ---
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Smm/SmmAccessPe
> i/SmmAccessPei.c
> +++
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Smm/SmmAccessPe
> i/SmmAccessPei.c
> @@ -1,18 +1,9 @@
> -/** @file
> - Implements AMD SmmAccessPei.c
> -
> - Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -/* This file includes code originally published under the following license. */
> -
> /** @file
> This is the driver that publishes the SMM Access Ppi
> instance for the Quark SOC.
>
> -Copyright (c) 2013-2019 Intel Corporation.
> +Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> +Copyright (c) 2013-2019 Intel Corporation. All rights reserved.<BR>
>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> @@ -142,7 +133,6 @@ LockSmm (
> AsmWriteMsr64 (HWCR, Data64);
> }
>
> -
> /**
> This routine accepts a request to "open" a region of SMRAM. The
> region could be legacy ABSEG, HSEG, or TSEG near top of physical memory.
> @@ -301,7 +291,6 @@ Lock (
> return EFI_SUCCESS;
> }
>
> -
> /**
> This routine services a user request to discover the SMRAM
> capabilities of this platform. This will report the possible
> diff --git
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Smm/SmmAccessPe
> i/SmmAccessPei.inf
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Smm/SmmAccessPe
> i/SmmAccessPei.inf
> index 1572741d8e..741eddd43c 100644
> ---
> a/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Smm/SmmAccessPe
> i/SmmAccessPei.inf
> +++
> b/Platform/AMD/VanGoghBoard/VanGoghCommonPkg/Smm/SmmAccessPe
> i/SmmAccessPei.inf
> @@ -1,16 +1,8 @@
> ## @file
> -# SmmAccessPei
> -#
> -# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> -# SPDX-License-Identifier: BSD-2-Clause-Patent
> -#
> -##
> -
> -# This file includes code originally published under the following license.
> -## @file
> # Component description file for SmmAccessPei module
> #
> -# Copyright (c) 2013-2019 Intel Corporation.
> +# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
> +# Copyright (c) 2013-2019 Intel Corporation. All rights reserved.<BR>
> #
> # SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> --
> 2.31.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#114371): https://edk2.groups.io/g/devel/message/114371
Mute This Topic: https://groups.io/mt/103950361/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply [flat|nested] 2+ messages in thread