commit 66c69871e7ea729aa46ac288c5ed4b501db7e091
author Ard Biesheuvel <ardb@kernel.org> Mon May 13 18:46:35 2024 +0200
committer mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Fri May 24 15:48:52 2024 +0000
tree 2c04681a5ae8e36a25c8d45f5e033a5071292f23
parent c98f7f75508912c086158892fc56b0c3b85abcf1

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 <ardb+tianocore@kernel.org>
Cc: Leif Lindholm <quic_llindhol@quicinc.com>
Cc: Sami Mujawar <sami.mujawar@arm.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>

Committed-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Doug Flick [MSFT] <doug.edk2@gmail.com>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>

ArmVirtPkg/ArmVirtQemu.dsc

diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index 80dd4fb..e40ade2 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

ArmVirtPkg/ArmVirtQemuKernel.dsc

diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index 2700b97..6f1b814 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

ArmVirtPkg/ArmVirtXen.dsc

diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc
index ceb37f8..1505709 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