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.web10.8025.1634639125148679640 for ; Tue, 19 Oct 2021 03:25:25 -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 83581D6E; Tue, 19 Oct 2021 03:25:20 -0700 (PDT) Received: from e120189.arm.com (unknown [10.57.73.233]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 177E43F70D; Tue, 19 Oct 2021 03:25:18 -0700 (PDT) From: "PierreGondois" To: devel@edk2.groups.io, Sean Brogan , Sami Mujawar , Leif Lindholm Cc: Ard Biesheuvel Subject: [RFC PATCH edk2-platforms v1 2/5] Platform/ARM: Create ArmCommonPkg.dec from ARM.dec Date: Tue, 19 Oct 2021 11:24:59 +0100 Message-Id: <20211019102502.3765-3-Pierre.Gondois@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211019102502.3765-1-Pierre.Gondois@arm.com> References: <20211019102502.3765-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 1, this patch moves: Platform/ARM/ARM.dec to: Platform/ARM/ArmCommonPkg/ArmCommonPkg.dec and updates references to ARM.dec. Bugzilla: 3259 (https://bugzilla.tianocore.org/show_bug.cgi?id=3259) Signed-off-by: Pierre Gondois --- Platform/ARM/{ARM.dec => ArmCommonPkg/ArmCommonPkg.dec} | 2 +- Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFs.inf | 2 +- .../ARM/ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf | 2 +- .../Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf | 2 +- Platform/ARM/ArmCommonPkg/Library/BdsLib/BdsLib.inf | 2 +- Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf | 2 +- Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.inf | 2 +- Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.inf | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) rename Platform/ARM/{ARM.dec => ArmCommonPkg/ArmCommonPkg.dec} (88%) diff --git a/Platform/ARM/ARM.dec b/Platform/ARM/ArmCommonPkg/ArmCommonPkg.dec similarity index 88% rename from Platform/ARM/ARM.dec rename to Platform/ARM/ArmCommonPkg/ArmCommonPkg.dec index 5175b313f95a..cce497c27fa5 100644 --- a/Platform/ARM/ARM.dec +++ b/Platform/ARM/ArmCommonPkg/ArmCommonPkg.dec @@ -8,7 +8,7 @@ [Defines] DEC_SPECIFICATION = 0x0001001A - PACKAGE_NAME = ARM + PACKAGE_NAME = ArmCommonPkg PACKAGE_GUID = 2a905d2b-30c9-4408-86a2-c0b328876aee PACKAGE_VERSION = 0.1 diff --git a/Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFs.inf b/Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFs.inf index 7c2e2161869e..10efa919e2f6 100644 --- a/Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFs.inf +++ b/Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFs.inf @@ -28,7 +28,7 @@ [Packages] ArmPlatformPkg/ArmPlatformPkg.dec MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - Platform/ARM/ARM.dec + Platform/ARM/ArmCommonPkg/ArmCommonPkg.dec Platform/ARM/Drivers/BootMonFs/BootMonFs.dec [LibraryClasses] diff --git a/Platform/ARM/ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf b/Platform/ARM/ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf index d307e2ddca22..b844c0dc5233 100644 --- a/Platform/ARM/ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf +++ b/Platform/ARM/ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf @@ -25,7 +25,7 @@ [Packages] EmbeddedPkg/EmbeddedPkg.dec MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec - Platform/ARM/ARM.dec + Platform/ARM/ArmCommonPkg/ArmCommonPkg.dec Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.dec ShellPkg/ShellPkg.dec diff --git a/Platform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf b/Platform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf index 7c27a765bd5c..22926f4f2314 100644 --- a/Platform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf +++ b/Platform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf @@ -37,7 +37,7 @@ [Packages] ArmPkg/ArmPkg.dec MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec - Platform/ARM/ARM.dec + Platform/ARM/ArmCommonPkg/ArmCommonPkg.dec ShellPkg/ShellPkg.dec [LibraryClasses] diff --git a/Platform/ARM/ArmCommonPkg/Library/BdsLib/BdsLib.inf b/Platform/ARM/ArmCommonPkg/Library/BdsLib/BdsLib.inf index 658e9280ff5d..b7248624659c 100644 --- a/Platform/ARM/ArmCommonPkg/Library/BdsLib/BdsLib.inf +++ b/Platform/ARM/ArmCommonPkg/Library/BdsLib/BdsLib.inf @@ -23,7 +23,7 @@ [Packages] MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec NetworkPkg/NetworkPkg.dec - Platform/ARM/ARM.dec + Platform/ARM/ArmCommonPkg/ArmCommonPkg.dec [LibraryClasses] ArmLib diff --git a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf b/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf index d016967c3c37..d2e136baec48 100644 --- a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf +++ b/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf @@ -22,7 +22,7 @@ [Packages] EmbeddedPkg/EmbeddedPkg.dec MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - Platform/ARM/ARM.dec + Platform/ARM/ArmCommonPkg/ArmCommonPkg.dec Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.dec Platform/ARM/JunoPkg/ArmJuno.dec diff --git a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.inf b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.inf index c5f417953101..263abaad1f40 100644 --- a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.inf +++ b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.inf @@ -22,7 +22,7 @@ [Packages] ArmPkg/ArmPkg.dec ArmPlatformPkg/ArmPlatformPkg.dec OvmfPkg/OvmfPkg.dec - Platform/ARM/ARM.dec + Platform/ARM/ArmCommonPkg/ArmCommonPkg.dec Platform/ARM/VExpressPkg/ArmVExpressPkg.dec [LibraryClasses] diff --git a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.inf b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.inf index ddaa3f52cce8..de30a0d5c321 100644 --- a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.inf +++ b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.inf @@ -20,7 +20,7 @@ [Sources.common] [Packages] ArmPlatformPkg/ArmPlatformPkg.dec MdePkg/MdePkg.dec - Platform/ARM/ARM.dec + Platform/ARM/ArmCommonPkg/ArmCommonPkg.dec [LibraryClasses] ArmShellCmdRunAxfLib -- 2.17.1