From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail05.groups.io (mail05.groups.io [45.79.224.7]) by spool.mail.gandi.net (Postfix) with ESMTPS id CA53A7803CD for ; Wed, 4 Sep 2024 11:39:36 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=Z/Y18kKylbvQpU+f04Y2i8+u8+xZmDJy5KKyvA/D8uU=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Resent-Date:Resent-From:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20240830; t=1725449976; v=1; x=1725709175; b=I89KwdIkg67Pi998gRsMRdEsbz+B1OQvPa+rC2OEWIgbO1qMOIdRg7bYW9XEVjTlmDXSXna/ Dr6hAFwFEhwOxG7el0VkRRID5usUm5y6+aRwM1UNPnsNMM6q2c8VWgL4hMAqrPNQqAzCCUfebS4 +hHERESaLsnkuBFL7O9yKEgESwv2rbQ6sG+A9KYhGzR9rHl4GaqEwvEBNhAsNqca/8B2EUlRGHq OIeFlQKv6Wj/h55BDKCak9S/SazaEN75af9PLW9aEPr6vwSmFMMKDIrRFLqR+xEn0dgbkFJ3ezc rTWhEm+xmEeiXw8MAS5koziwThsq8n/0QqdD915X6rNfg== X-Received: by 127.0.0.2 with SMTP id Zn90YY7687511xVLYEoGACks; Wed, 04 Sep 2024 04:39:35 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.47867.1725449974342530055 for ; Wed, 04 Sep 2024 04:39:34 -0700 X-Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 61A561063; Wed, 4 Sep 2024 04:40:00 -0700 (PDT) X-Received: from e126645.arm.com (unknown [10.57.75.149]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 80B833F73F; Wed, 4 Sep 2024 04:39:32 -0700 (PDT) From: "PierreGondois" To: devel@edk2.groups.io Cc: ardb+tianocore@kernel.org, sami.mujawar@arm.com, Thomas Abraham , Pierre Gondois Subject: [edk2-devel] [PATCH 1/3] Platform/ARM: Place MdeLibs.dsc.inc as the first include Date: Wed, 4 Sep 2024 13:39:03 +0200 Message-Id: <20240904113905.1736428-2-Pierre.Gondois@arm.com> In-Reply-To: <20240904113905.1736428-1-Pierre.Gondois@arm.com> References: <20240904113905.1736428-1-Pierre.Gondois@arm.com> MIME-Version: 1.0 Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Resent-Date: Wed, 04 Sep 2024 04:39:34 -0700 Resent-From: pierre.gondois@arm.com Reply-To: devel@edk2.groups.io,pierre.gondois@arm.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: ERLq59KgceDtOgeys0KThqa0x7686176AA= Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20240830 header.b=I89KwdIk; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=arm.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 45.79.224.7 as permitted sender) smtp.mailfrom=bounce@groups.io From: Pierre Gondois For a same MODELE_TYPE/ARCH LibraryClasses section, multiple libraries can be defined. E.g.: [LibraryClasses.AARCH64.DXE_DRIVER] ArmTrngLib|ArmPkg/Library/ArmTrngLib/ArmTrngLib.inf ArmTrngLib|MdePkg/Library/BaseArmTrngLibNull/BaseArmTrngLibNull.inf In such case, the latest defined library is used. DSC files can include other files. MdeLibs.dsc.inc is included after other .dsc.inc files in some ARM platforms, even though it provides NULL libraries and only aims to satisfy dependencies. For the Juno, not having MdeLibs.dsc.inc as the fist included file leads to overriding the ArmTrngLib with its NULL instance. Place MdeLibs.dsc.inc as the first file included for all ARM platforms. Signed-off-by: Pierre Gondois --- Platform/ARM/JunoPkg/ArmJuno.dsc | 3 ++- Platform/ARM/Morello/MorelloPlatformFvp.dsc | 6 +++--- Platform/ARM/N1Sdp/N1SdpPlatform.dsc | 2 +- Platform/ARM/SgiPkg/RdE1Edge/RdE1Edge.dsc | 6 +++--- Platform/ARM/SgiPkg/RdN1Edge/RdN1Edge.dsc | 6 +++--- Platform/ARM/SgiPkg/RdN1EdgeX2/RdN1EdgeX2.dsc | 6 +++--- Platform/ARM/SgiPkg/RdN2/RdN2.dsc | 6 +++--- Platform/ARM/SgiPkg/RdN2Cfg1/RdN2Cfg1.dsc | 6 +++--- Platform/ARM/SgiPkg/RdN2Cfg2/RdN2Cfg2.dsc | 6 +++--- Platform/ARM/SgiPkg/RdN2Cfg3/RdN2Cfg3.dsc | 6 +++--- Platform/ARM/SgiPkg/RdV1/RdV1.dsc | 6 +++--- Platform/ARM/SgiPkg/RdV1Mc/RdV1Mc.dsc | 6 +++--- Platform/ARM/SgiPkg/RdV3/RdV3.dsc | 6 +++--- Platform/ARM/SgiPkg/Sgi575/Sgi575.dsc | 6 +++--- Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc | 2 +- 15 files changed, 40 insertions(+), 39 deletions(-) diff --git a/Platform/ARM/JunoPkg/ArmJuno.dsc b/Platform/ARM/JunoPkg/ArmJ= uno.dsc index cf8de7e0a75f..89ce9abb240b 100644 --- a/Platform/ARM/JunoPkg/ArmJuno.dsc +++ b/Platform/ARM/JunoPkg/ArmJuno.dsc @@ -25,9 +25,10 @@ [Defines] SKUID_IDENTIFIER =3D DEFAULT FLASH_DEFINITION =3D Platform/ARM/JunoPkg/ArmJuno.fdf =20 +!include MdePkg/MdeLibs.dsc.inc + # On RTSM, most peripherals are VExpress Motherboard peripherals !include Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc -!include MdePkg/MdeLibs.dsc.inc =20 !ifdef DYNAMIC_TABLES_FRAMEWORK !include DynamicTablesPkg/DynamicTables.dsc.inc diff --git a/Platform/ARM/Morello/MorelloPlatformFvp.dsc b/Platform/ARM/M= orello/MorelloPlatformFvp.dsc index ee612296a80e..9421755d1e36 100644 --- a/Platform/ARM/Morello/MorelloPlatformFvp.dsc +++ b/Platform/ARM/Morello/MorelloPlatformFvp.dsc @@ -30,14 +30,14 @@ [Defines] # Network definition DEFINE NETWORK_ISCSI_ENABLE =3D FALSE =20 +# include common/basic libraries from MdePkg. +!include MdePkg/MdeLibs.dsc.inc + !include Platform/ARM/Morello/MorelloPlatform.dsc.inc !include Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc !include DynamicTablesPkg/DynamicTables.dsc.inc !include Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerF= vp.dsc.inc =20 -# include common/basic libraries from MdePkg. -!include MdePkg/MdeLibs.dsc.inc - [LibraryClasses.common] # Virtio Support VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf diff --git a/Platform/ARM/N1Sdp/N1SdpPlatform.dsc b/Platform/ARM/N1Sdp/N1= SdpPlatform.dsc index ba8b624fde38..f44dae4afdd6 100644 --- a/Platform/ARM/N1Sdp/N1SdpPlatform.dsc +++ b/Platform/ARM/N1Sdp/N1SdpPlatform.dsc @@ -27,8 +27,8 @@ [Defines] FLASH_DEFINITION =3D Platform/ARM/N1Sdp/N1SdpPlatform.fd= f BUILD_NUMBER =3D 1 =20 -!include Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc !include MdePkg/MdeLibs.dsc.inc +!include Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc =20 !include DynamicTablesPkg/DynamicTables.dsc.inc =20 diff --git a/Platform/ARM/SgiPkg/RdE1Edge/RdE1Edge.dsc b/Platform/ARM/Sgi= Pkg/RdE1Edge/RdE1Edge.dsc index c7463da5203e..80432ac3ebae 100644 --- a/Platform/ARM/SgiPkg/RdE1Edge/RdE1Edge.dsc +++ b/Platform/ARM/SgiPkg/RdE1Edge/RdE1Edge.dsc @@ -24,13 +24,13 @@ [Defines] =20 DEFINE PCIE_ENABLE =3D TRUE =20 +# include common/basic libraries from MdePkg. +!include MdePkg/MdeLibs.dsc.inc + # include common definitions from SgiPlatform.dsc !include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc !include Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc =20 -# include common/basic libraries from MdePkg. -!include MdePkg/MdeLibs.dsc.inc - ########################################################################= ######## # # Pcd Section - list of all EDK II PCD Entries defined by this Platform diff --git a/Platform/ARM/SgiPkg/RdN1Edge/RdN1Edge.dsc b/Platform/ARM/Sgi= Pkg/RdN1Edge/RdN1Edge.dsc index 77efec9d9533..a11e74cfb5d3 100644 --- a/Platform/ARM/SgiPkg/RdN1Edge/RdN1Edge.dsc +++ b/Platform/ARM/SgiPkg/RdN1Edge/RdN1Edge.dsc @@ -24,13 +24,13 @@ [Defines] =20 DEFINE PCIE_ENABLE =3D TRUE =20 +# include common/basic libraries from MdePkg. +!include MdePkg/MdeLibs.dsc.inc + # include common definitions from SgiPlatform.dsc !include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc !include Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc =20 -# include common/basic libraries from MdePkg. -!include MdePkg/MdeLibs.dsc.inc - ########################################################################= ######## # # Pcd Section - list of all EDK II PCD Entries defined by this Platform diff --git a/Platform/ARM/SgiPkg/RdN1EdgeX2/RdN1EdgeX2.dsc b/Platform/ARM= /SgiPkg/RdN1EdgeX2/RdN1EdgeX2.dsc index 521d88925059..705dedccbc46 100644 --- a/Platform/ARM/SgiPkg/RdN1EdgeX2/RdN1EdgeX2.dsc +++ b/Platform/ARM/SgiPkg/RdN1EdgeX2/RdN1EdgeX2.dsc @@ -24,13 +24,13 @@ [Defines] =20 DEFINE PCIE_ENABLE =3D TRUE =20 +# include common/basic libraries from MdePkg. +!include MdePkg/MdeLibs.dsc.inc + # include common definitions from SgiPlatform.dsc !include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc !include Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc =20 -# include common/basic libraries from MdePkg. -!include MdePkg/MdeLibs.dsc.inc - ########################################################################= ######## # # Pcd Section - list of all EDK II PCD Entries defined by this Platform diff --git a/Platform/ARM/SgiPkg/RdN2/RdN2.dsc b/Platform/ARM/SgiPkg/RdN2= /RdN2.dsc index 49a317a930e0..7bc9a8186b8d 100644 --- a/Platform/ARM/SgiPkg/RdN2/RdN2.dsc +++ b/Platform/ARM/SgiPkg/RdN2/RdN2.dsc @@ -22,13 +22,13 @@ [Defines] BOARD_DXE_FV_COMPONENTS =3D Platform/ARM/SgiPkg/RdN2/RdN2.fdf.i= nc BUILD_NUMBER =3D 1 =20 +# include common/basic libraries from MdePkg. +!include MdePkg/MdeLibs.dsc.inc + # include common definitions from SgiPlatform.dsc !include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc !include Platform/ARM/SgiPkg/SgiMemoryMap2.dsc.inc =20 -# include common/basic libraries from MdePkg. -!include MdePkg/MdeLibs.dsc.inc - ########################################################################= ######## # # Pcd Section - list of all EDK II PCD Entries defined by this Platform diff --git a/Platform/ARM/SgiPkg/RdN2Cfg1/RdN2Cfg1.dsc b/Platform/ARM/Sgi= Pkg/RdN2Cfg1/RdN2Cfg1.dsc index c26f652cb9e9..5e5a776606c3 100644 --- a/Platform/ARM/SgiPkg/RdN2Cfg1/RdN2Cfg1.dsc +++ b/Platform/ARM/SgiPkg/RdN2Cfg1/RdN2Cfg1.dsc @@ -24,13 +24,13 @@ [Defines] BOARD_DXE_FV_COMPONENTS =3D Platform/ARM/SgiPkg/RdN2Cfg1/RdN2Cf= g1.fdf.inc BUILD_NUMBER =3D 1 =20 +# include common/basic libraries from MdePkg. +!include MdePkg/MdeLibs.dsc.inc + # include common definitions from SgiPlatform.dsc !include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc !include Platform/ARM/SgiPkg/SgiMemoryMap2.dsc.inc =20 -# include common/basic libraries from MdePkg. -!include MdePkg/MdeLibs.dsc.inc - ########################################################################= ######## # # Pcd Section - list of all EDK II PCD Entries defined by this Platform diff --git a/Platform/ARM/SgiPkg/RdN2Cfg2/RdN2Cfg2.dsc b/Platform/ARM/Sgi= Pkg/RdN2Cfg2/RdN2Cfg2.dsc index 0a7991e77b78..a52966b30cca 100644 --- a/Platform/ARM/SgiPkg/RdN2Cfg2/RdN2Cfg2.dsc +++ b/Platform/ARM/SgiPkg/RdN2Cfg2/RdN2Cfg2.dsc @@ -22,13 +22,13 @@ [Defines] BOARD_DXE_FV_COMPONENTS =3D Platform/ARM/SgiPkg/RdN2Cfg2/RdN2Cf= g2.fdf.inc BUILD_NUMBER =3D 1 =20 +# include common/basic libraries from MdePkg. +!include MdePkg/MdeLibs.dsc.inc + # include common definitions from SgiPlatform.dsc !include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc !include Platform/ARM/SgiPkg/SgiMemoryMap2.dsc.inc =20 -# include common/basic libraries from MdePkg. -!include MdePkg/MdeLibs.dsc.inc - ########################################################################= ######## # # Pcd Section - list of all EDK II PCD Entries defined by this Platform diff --git a/Platform/ARM/SgiPkg/RdN2Cfg3/RdN2Cfg3.dsc b/Platform/ARM/Sgi= Pkg/RdN2Cfg3/RdN2Cfg3.dsc index 88293b236a32..94fe46b8d477 100644 --- a/Platform/ARM/SgiPkg/RdN2Cfg3/RdN2Cfg3.dsc +++ b/Platform/ARM/SgiPkg/RdN2Cfg3/RdN2Cfg3.dsc @@ -22,13 +22,13 @@ [Defines] BOARD_DXE_FV_COMPONENTS =3D Platform/ARM/SgiPkg/RdN2Cfg3/RdN2Cf= g3.fdf.inc BUILD_NUMBER =3D 1 =20 +# include common/basic libraries from MdePkg. +!include MdePkg/MdeLibs.dsc.inc + # include common definitions from SgiPlatform.dsc !include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc !include Platform/ARM/SgiPkg/SgiMemoryMap2.dsc.inc =20 -# include common/basic libraries from MdePkg. -!include MdePkg/MdeLibs.dsc.inc - ########################################################################= ######## # # Pcd Section - list of all EDK II PCD Entries defined by this Platform diff --git a/Platform/ARM/SgiPkg/RdV1/RdV1.dsc b/Platform/ARM/SgiPkg/RdV1= /RdV1.dsc index 2a4bb019fe7a..50726cb0cee2 100644 --- a/Platform/ARM/SgiPkg/RdV1/RdV1.dsc +++ b/Platform/ARM/SgiPkg/RdV1/RdV1.dsc @@ -24,13 +24,13 @@ [Defines] =20 DEFINE PCIE_ENABLE =3D TRUE =20 +# include common/basic libraries from MdePkg. +!include MdePkg/MdeLibs.dsc.inc + # include common definitions from SgiPlatform.dsc !include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc !include Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc =20 -# include common/basic libraries from MdePkg. -!include MdePkg/MdeLibs.dsc.inc - ########################################################################= ######## # # Pcd Section - list of all EDK II PCD Entries defined by this Platform diff --git a/Platform/ARM/SgiPkg/RdV1Mc/RdV1Mc.dsc b/Platform/ARM/SgiPkg/= RdV1Mc/RdV1Mc.dsc index 971e2ccca367..6ed99cf080b9 100644 --- a/Platform/ARM/SgiPkg/RdV1Mc/RdV1Mc.dsc +++ b/Platform/ARM/SgiPkg/RdV1Mc/RdV1Mc.dsc @@ -24,13 +24,13 @@ [Defines] =20 DEFINE PCIE_ENABLE =3D TRUE =20 +# include common/basic libraries from MdePkg. +!include MdePkg/MdeLibs.dsc.inc + # include common definitions from SgiPlatform.dsc !include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc !include Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc =20 -# include common/basic libraries from MdePkg. -!include MdePkg/MdeLibs.dsc.inc - ########################################################################= ######## # # Pcd Section - list of all EDK II PCD Entries defined by this Platform diff --git a/Platform/ARM/SgiPkg/RdV3/RdV3.dsc b/Platform/ARM/SgiPkg/RdV3= /RdV3.dsc index cf7606a5d147..3b62edb13f2f 100644 --- a/Platform/ARM/SgiPkg/RdV3/RdV3.dsc +++ b/Platform/ARM/SgiPkg/RdV3/RdV3.dsc @@ -22,13 +22,13 @@ [Defines] BOARD_DXE_FV_COMPONENTS =3D Platform/ARM/SgiPkg/RdV3/RdV3.fdf.i= nc BUILD_NUMBER =3D 1 =20 +# include common/basic libraries from MdePkg. +!include MdePkg/MdeLibs.dsc.inc + # include common definitions from SgiPlatform.dsc !include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc !include Platform/ARM/SgiPkg/SgiMemoryMap3.dsc.inc =20 -# include common/basic libraries from MdePkg. -!include MdePkg/MdeLibs.dsc.inc - ########################################################################= ######## # # Pcd Section - list of all EDK II PCD Entries defined by this Platform diff --git a/Platform/ARM/SgiPkg/Sgi575/Sgi575.dsc b/Platform/ARM/SgiPkg/= Sgi575/Sgi575.dsc index 4ed64abecd31..f29272778d73 100644 --- a/Platform/ARM/SgiPkg/Sgi575/Sgi575.dsc +++ b/Platform/ARM/SgiPkg/Sgi575/Sgi575.dsc @@ -24,13 +24,13 @@ [Defines] =20 DEFINE PCIE_ENABLE =3D TRUE =20 +# include common/basic libraries from MdePkg. +!include MdePkg/MdeLibs.dsc.inc + # include common definitions from SgiPlatform.dsc !include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc !include Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc =20 -# include common/basic libraries from MdePkg. -!include MdePkg/MdeLibs.dsc.inc - ########################################################################= ######## # # Pcd Section - list of all EDK II PCD Entries defined by this Platform diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc b/Platf= orm/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc index 3db99e3ba501..58d1530d84c7 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc +++ b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc @@ -40,8 +40,8 @@ [Defines] =20 DT_SUPPORT =3D FALSE =20 -!include Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc !include MdePkg/MdeLibs.dsc.inc +!include Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc !include DynamicTablesPkg/DynamicTables.dsc.inc =20 [LibraryClasses.common] --=20 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#120491): https://edk2.groups.io/g/devel/message/120491 Mute This Topic: https://groups.io/mt/108262992/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-