OvmfPkg/PlatformInitLib: Corrects initializers to fix NOOPT build

Fixes OvmfPkg build using XCODE5, CLANGPDB and CLANGDWARF toolchains
for NOOPT target

Signed-off-by: Savva Mitrofanov <savvamtr@gmail.com>
This commit is contained in:
Savva Mitrofanov 2022-12-14 16:29:41 +06:00
parent dc249ba42d
commit 57f8489c5a
No known key found for this signature in database
GPG Key ID: 774924031750BF64
2 changed files with 8 additions and 6 deletions

View File

@ -154,9 +154,9 @@ BspAcceptMemoryResourceRange (
BOOLEAN BOOLEAN
EFIAPI EFIAPI
IsInValidList ( IsInValidList (
IN UINT32 Value, IN UINT32 Value,
IN UINT32 *ValidList, IN CONST UINT32 *ValidList,
IN UINT32 ValidListLength IN UINT32 ValidListLength
) )
{ {
UINT32 index; UINT32 index;
@ -190,7 +190,7 @@ ValidateHobList (
) )
{ {
EFI_PEI_HOB_POINTERS Hob; EFI_PEI_HOB_POINTERS Hob;
UINT32 EFI_BOOT_MODE_LIST[] = { STATIC CONST UINT32 EFI_BOOT_MODE_LIST[] = {
BOOT_WITH_FULL_CONFIGURATION, BOOT_WITH_FULL_CONFIGURATION,
BOOT_WITH_MINIMAL_CONFIGURATION, BOOT_WITH_MINIMAL_CONFIGURATION,
BOOT_ASSUMING_NO_CONFIGURATION_CHANGES, BOOT_ASSUMING_NO_CONFIGURATION_CHANGES,
@ -205,7 +205,7 @@ ValidateHobList (
BOOT_IN_RECOVERY_MODE BOOT_IN_RECOVERY_MODE
}; };
UINT32 EFI_RESOURCE_TYPE_LIST[] = { STATIC CONST UINT32 EFI_RESOURCE_TYPE_LIST[] = {
EFI_RESOURCE_SYSTEM_MEMORY, EFI_RESOURCE_SYSTEM_MEMORY,
EFI_RESOURCE_MEMORY_MAPPED_IO, EFI_RESOURCE_MEMORY_MAPPED_IO,
EFI_RESOURCE_IO, EFI_RESOURCE_IO,

View File

@ -535,10 +535,12 @@ PlatformAddressWidthFromCpuid (
{ {
UINT32 RegEax, RegEbx, RegEcx, RegEdx, Max; UINT32 RegEax, RegEbx, RegEcx, RegEdx, Max;
UINT8 PhysBits; UINT8 PhysBits;
CHAR8 Signature[13] = { 0 }; CHAR8 Signature[13];
BOOLEAN Valid = FALSE; BOOLEAN Valid = FALSE;
BOOLEAN Page1GSupport = FALSE; BOOLEAN Page1GSupport = FALSE;
ZeroMem (Signature, sizeof (Signature));
AsmCpuid (0x80000000, &RegEax, &RegEbx, &RegEcx, &RegEdx); AsmCpuid (0x80000000, &RegEax, &RegEbx, &RegEcx, &RegEdx);
*(UINT32 *)(Signature + 0) = RegEbx; *(UINT32 *)(Signature + 0) = RegEbx;
*(UINT32 *)(Signature + 4) = RegEdx; *(UINT32 *)(Signature + 4) = RegEdx;