VirtualBox

Ignore:
Timestamp:
Mar 31, 2025 11:31:09 AM (5 weeks ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
168237
Message:

Devices/EFI/FirmwareNew: Merge edk2-stable202502 from the vendor branch and make it build for the important platforms, bugref:4643

Location:
trunk/src/VBox/Devices/EFI/FirmwareNew
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Devices/EFI/FirmwareNew

  • trunk/src/VBox/Devices/EFI/FirmwareNew/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.inf

    r99465 r108794  
    4848  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesData
    4949  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesCode
    50   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiBootServicesCode
    51   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiBootServicesData
    52   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderCode
    53   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderData
    5450
    5551[Pcd]
  • trunk/src/VBox/Devices/EFI/FirmwareNew/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c

    r99465 r108794  
    3838  )
    3939{
    40   EFI_MEMORY_TYPE_INFORMATION  Info[10];
     40  EFI_MEMORY_TYPE_INFORMATION  Info[6];
    4141
    4242  Info[0].Type          = EfiACPIReclaimMemory;
     
    5050  Info[4].Type          = EfiRuntimeServicesCode;
    5151  Info[4].NumberOfPages = PcdGet32 (PcdMemoryTypeEfiRuntimeServicesCode);
    52   Info[5].Type          = EfiBootServicesCode;
    53   Info[5].NumberOfPages = PcdGet32 (PcdMemoryTypeEfiBootServicesCode);
    54   Info[6].Type          = EfiBootServicesData;
    55   Info[6].NumberOfPages = PcdGet32 (PcdMemoryTypeEfiBootServicesData);
    56   Info[7].Type          = EfiLoaderCode;
    57   Info[7].NumberOfPages = PcdGet32 (PcdMemoryTypeEfiLoaderCode);
    58   Info[8].Type          = EfiLoaderData;
    59   Info[8].NumberOfPages = PcdGet32 (PcdMemoryTypeEfiLoaderData);
    60 
    6152  // Terminator for the list
    62   Info[9].Type          = EfiMaxMemoryType;
    63   Info[9].NumberOfPages = 0;
     53  Info[5].Type          = EfiMaxMemoryType;
     54  Info[5].NumberOfPages = 0;
    6455
    6556  BuildGuidDataHob (&gEfiMemoryTypeInformationGuid, &Info, sizeof (Info));
  • trunk/src/VBox/Devices/EFI/FirmwareNew/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf

    r99465 r108794  
    5757  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesData
    5858  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesCode
    59   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiBootServicesCode
    60   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiBootServicesData
    61   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderCode
    62   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderData
    6359
    6460[Pcd]
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette