From nobody Tue Feb 10 01:36:02 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+80868+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+80868+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1632146690; cv=none; d=zohomail.com; s=zohoarc; b=KdicfrpyRXtwiWtJxN6YGjDrnabfBjuMrrFPDLr0cIm5hKcuqhfJ4lHxIyzpQssGtI3ezI8KIleITt+R3i5seW1cyGogeT8zOJEKSQm82BLfvQD/PgZd5rjEBIEXEfu+OXxWcFK6gw+8q0afwRpRmWY3WfDvW8+932F6PBXvpYA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632146690; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=tRuo5U9ecMa/1BwPjYkIYYyj+cwkOpwEW9T/hXmShqM=; b=Sc3/s9T8Nj3muthCuS73Mcc49TSIe1BBpH3TuUiobhNzBEbSUgCNrYLsCymWMTpA/hGF1BGP38pL9V5KF12VZE3GNo4dBMkUTu5/r1N1PPECibD3mKropXCQZIXqQrHqLPEtaYDNYz/c/szQu7angva4KmXVNLe82h5br+9ka8g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+80868+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1632146690641816.6030444419606; Mon, 20 Sep 2021 07:04:50 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id lsqjYY1788612xV13t3zd7ZK; Mon, 20 Sep 2021 07:04:50 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web09.12177.1632146689443870664 for ; Mon, 20 Sep 2021 07:04:49 -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 1E21F139F; Mon, 20 Sep 2021 07:04:49 -0700 (PDT) X-Received: from e120189.arm.com (unknown [10.57.94.101]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 7C5CB3F718; Mon, 20 Sep 2021 07:04:47 -0700 (PDT) From: "PierreGondois" To: devel@edk2.groups.io, Sean Brogan , Ard Biesheuvel , Leif Lindholm , Sami Mujawar Cc: Liming Gao , Thomas Abraham Subject: [edk2-devel] [RFC PATCH edk2-platforms v1 2/7] Platform/ARM: Create ArmCommonPkg.dec from ARM.dec Date: Mon, 20 Sep 2021 15:04:03 +0100 Message-Id: <20210920140408.16190-3-Pierre.Gondois@arm.com> In-Reply-To: <20210920140408.16190-1-Pierre.Gondois@arm.com> References: <20210920140408.16190-1-Pierre.Gondois@arm.com> Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,pierre.gondois@arm.com X-Gm-Message-State: oHtRtEEXJSNfdzpIi6RwWNYDx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1632146690; bh=zaNa9dWJ88yN2XXFXuuY0z8TqhKdPC9f043OgQ4LayE=; h=Cc:Date:From:Reply-To:Subject:To; b=iVjbNs9olMNxMgW5xzJFgI02VyH/0jmz7plyVP/VFgPFSopHMzI1cJohxC6GeMYQ1A/ A2hyNHqkz0XZz9ZjZ2qQiw41qxcx2M8+dtSK4M5yBoEcSlgbQ6z+fjuXfeb8TO2l5CvSi 8vsp3Ihb+Fy4Y05eCsSyLt+fTE+P3ijbRZU= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1632146701410100010 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=3D3259) Signed-off-by: Pierre Gondois --- Platform/ARM/{ARM.dec =3D> 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 =3D> 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 @@ =20 [Defines] DEC_SPECIFICATION =3D 0x0001001A - PACKAGE_NAME =3D ARM + PACKAGE_NAME =3D ArmCommonPkg PACKAGE_GUID =3D 2a905d2b-30c9-4408-86a2-c0b328876aee PACKAGE_VERSION =3D 0.1 =20 diff --git a/Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFs.inf b/Pl= atform/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 =20 [LibraryClasses] diff --git a/Platform/ARM/ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDx= e.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 =20 diff --git a/Platform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/ArmShellCm= dRunAxf.inf b/Platform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/ArmShellC= mdRunAxf.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 =20 [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 =20 [LibraryClasses] ArmLib diff --git a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf b/Platf= orm/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf index d016967c3c37..8b3a159ebe20 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 + ArmCommonPkg/ArmCommonPkg.dec Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.dec Platform/ARM/JunoPkg/ArmJuno.dec =20 diff --git a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.inf = b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.inf index c5f417953101..14e02ad51d90 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 + ArmCommonPkg/ArmCommonPkg.dec Platform/ARM/VExpressPkg/ArmVExpressPkg.dec =20 [LibraryClasses] diff --git a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.inf b= /Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.inf index ddaa3f52cce8..93a51de12368 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 + ArmCommonPkg/ArmCommonPkg.dec =20 [LibraryClasses] ArmShellCmdRunAxfLib --=20 2.17.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#80868): https://edk2.groups.io/g/devel/message/80868 Mute This Topic: https://groups.io/mt/85741388/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-