From 66c69871e7ea729aa46ac288c5ed4b501db7e091 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Mon, 13 May 2024 18:46:35 +0200 Subject: ArmVirtPkg: Reverse inclusion order of MdeLibs.inc and ArmVirt.dsc.inc MdeLibs.inc sets default library class resolutions which are much more general than the ones that might be specified in ArmVirt.dsc.inc. So the latter should be included *after* MdeLibs.inc to ensure that its definitions take precedence. Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Sami Mujawar Cc: Gerd Hoffmann Committed-by: Ard Biesheuvel Signed-off-by: Doug Flick [MSFT] Reviewed-by: Ard Biesheuvel --- ArmVirtPkg/ArmVirtQemu.dsc | 4 ++-- ArmVirtPkg/ArmVirtQemuKernel.dsc | 4 ++-- ArmVirtPkg/ArmVirtXen.dsc | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index 80dd4fbb14..e40ade230c 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -49,10 +49,10 @@ !include NetworkPkg/NetworkDefines.dsc.inc -!include ArmVirtPkg/ArmVirt.dsc.inc - !include MdePkg/MdeLibs.dsc.inc +!include ArmVirtPkg/ArmVirt.dsc.inc + [LibraryClasses.common] ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc index 2700b97d09..6f1b81427e 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -46,10 +46,10 @@ !include NetworkPkg/NetworkDefines.dsc.inc -!include ArmVirtPkg/ArmVirt.dsc.inc - !include MdePkg/MdeLibs.dsc.inc +!include ArmVirtPkg/ArmVirt.dsc.inc + [LibraryClasses.common] ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc index ceb37f8a2d..1505709a29 100644 --- a/ArmVirtPkg/ArmVirtXen.dsc +++ b/ArmVirtPkg/ArmVirtXen.dsc @@ -23,10 +23,10 @@ SKUID_IDENTIFIER = DEFAULT FLASH_DEFINITION = ArmVirtPkg/ArmVirtXen.fdf -!include ArmVirtPkg/ArmVirt.dsc.inc - !include MdePkg/MdeLibs.dsc.inc +!include ArmVirtPkg/ArmVirt.dsc.inc + [LibraryClasses] SerialPortLib|OvmfPkg/Library/XenConsoleSerialPortLib/XenConsoleSerialPortLib.inf !if $(TARGET) != RELEASE -- cgit