Changeset 108794 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/PrmPkg/PrmPkg.dsc

Timestamp:

Mar 31, 2025 11:31:09 AM (2 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:

• . (modified) (1 prop)
• PrmPkg/PrmPkg.dsc (modified) (3 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/PrmPkg/PrmPkg.dsc

@@ -13 +13 @@
   DSC_SPECIFICATION              = 0x00010005
   OUTPUT_DIRECTORY               = Build/$(PLATFORM_NAME)
-  SUPPORTED_ARCHITECTURES        = IA32|X64|AARCH64
+  SUPPORTED_ARCHITECTURES        = X64|AARCH64
   BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
 
   DEFINE  PLATFORM_PACKAGE       = $(PLATFORM_NAME)Pkg
+
+!include MdePkg/MdeLibs.dsc.inc
 
 [LibraryClasses.common]
@@ -39 +41 @@
   UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
 
-[LibraryClasses.IA32, LibraryClasses.X64]
+[LibraryClasses.X64]
   MtrrLib|UefiCpuPkg/Library/MtrrLib/MtrrLib.inf
-
-[LibraryClasses.AARCH64]
-  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
-  NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
 
 [LibraryClasses.common.DXE_DRIVER, LibraryClasses.common.DXE_RUNTIME_DRIVER, LibraryClasses.common.UEFI_APPLICATION]
@@ -143 +141 @@
   $(PLATFORM_PACKAGE)/Application/PrmInfo/PrmInfo.inf
 
-[Components.IA32, Components.X64]
+[Components.X64]
   #
-  # PRM Sample Modules for IA32 and X64
+  # PRM Sample Modules for X64
   #
   $(PLATFORM_PACKAGE)/Samples/PrmSampleHardwareAccessModule/PrmSampleHardwareAccessModule.inf
-
-[Components.AARCH64]
-  ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
-
-  # Add support for GCC stack protector
-  MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
 
 [BuildOptions]