From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web09.12178.1632146695698529720 for ; Mon, 20 Sep 2021 07:04:56 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: pierre.gondois@arm.com) 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 637FF142F; Mon, 20 Sep 2021 07:04:55 -0700 (PDT) Received: from e120189.arm.com (unknown [10.57.94.101]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 9F8A13F718; Mon, 20 Sep 2021 07:04:53 -0700 (PDT) From: "PierreGondois" To: devel@edk2.groups.io, Sean Brogan , Ard Biesheuvel , Leif Lindholm , Sami Mujawar Cc: Liming Gao , Thomas Abraham Subject: [RFC PATCH edk2-platforms v1 5/7] Platform/ARM: Resolve ArmCommonPkg library references Date: Mon, 20 Sep 2021 15:04:06 +0100 Message-Id: <20210920140408.16190-6-Pierre.Gondois@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210920140408.16190-1-Pierre.Gondois@arm.com> References: <20210920140408.16190-1-Pierre.Gondois@arm.com> From: Pierre Gondois The Platform/ARM/ARM.dec file implies that the Platform/ARM/ folder is a package. This folder however hosts other packages describing platforms (JunoPkg, SgiPkg, ...) and packages describing drivers (BootMonFs, FdtPlatformDxe). As the Dec specification mention: "EDK II Packages cannot be nested within other EDK II Packages." Also, CI modules are based on packages. Having non-nested packages allows to have distinct entities each CI module must check. To remove the nested structure: 1- Create a Platform/ARM/ArmCommonPkg package containing code shared among platforms. It will contains the following folders: Platform/ARM/[Drivers/ | Include/ | Library/] 2- Remove the BootMonFs and FdtPlatformDxe packages and resolve the broken dependencies to these drivers 3- Resolve the broken dependencies to the libraries from Platform/ARM/Library As part of 3, this patch updates references to the libraries previously in Platform/ARM/Library. Bugzilla: 3259 (https://bugzilla.tianocore.org/show_bug.cgi?id=3259) Signed-off-by: Pierre Gondois --- Platform/ARM/JunoPkg/ArmJuno.dsc | 2 +- Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc | 2 +- Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Platform/ARM/JunoPkg/ArmJuno.dsc b/Platform/ARM/JunoPkg/ArmJuno.dsc index 93d78597930d..c208415f3602 100644 --- a/Platform/ARM/JunoPkg/ArmJuno.dsc +++ b/Platform/ARM/JunoPkg/ArmJuno.dsc @@ -377,7 +377,7 @@ [Components.common] # ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf { - BdsLib|Platform/ARM/Library/BdsLib/BdsLib.inf + BdsLib|ArmCommonPkg/Library/BdsLib/BdsLib.inf } # SCMI Driver diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc index ee75fc472ec6..79ce9658fefa 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc +++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc @@ -283,5 +283,5 @@ [Components.common] # ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf { - BdsLib|Platform/ARM/Library/BdsLib/BdsLib.inf + BdsLib|ArmCommonPkg/Library/BdsLib/BdsLib.inf } diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc index e45e5a610f4c..1381867ac055 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc +++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc @@ -118,7 +118,7 @@ [LibraryClasses.common] # RunAxf support via Dynamic Shell Command protocol # It uses the Shell libraries. - ArmShellCmdRunAxfLib|Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf + ArmShellCmdRunAxfLib|ArmCommonPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf -- 2.17.1