From nobody Mon Feb 9 22:20:31 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+80869+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+80869+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1632146692; cv=none; d=zohomail.com; s=zohoarc; b=XkfnacuWaoUFWO2UwpL9YK9ddiqEQdoxSGr5tssbMKSPtQ/icAnl4RgtwdJwAi7OZE04PFkGxp6IbnYHCRc5ubXVpuUFXpKXqQOiCSR3UW1Squ24mTyAZeXc6c+0sJYUw5vK8BT6eNQ7vbZQRwySGNqfPFOir2e9dtJWH8kR9bQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632146692; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=JMiNoQvwJSBXyGaPC/hEsoLIuW+n38tUOeWzEZF1JXw=; b=FcdZqb4SUnxLF4RIKRJir6OYnypBtxdQQwGmCJtjxRtWCfUa2juc+qJ3NwyqHzhlItsI4xzRC1Ln22nGh/Wkvulqvq6Dd3+Wt5YAat5lgxpO2sXZ6ra6Zxd5tb6sFHZa82Ld7pa2C8yt4FGYuUEO42O2Z9dZSLVka2Lb8rvu34I= 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+80869+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 1632146692952700.6718810318622; Mon, 20 Sep 2021 07:04:52 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id MpJ9YY1788612xA7ZcU3XU0J; Mon, 20 Sep 2021 07:04:52 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web08.12138.1632146691576408240 for ; Mon, 20 Sep 2021 07:04:51 -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 3359913A1; Mon, 20 Sep 2021 07:04:51 -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 6F3003F718; Mon, 20 Sep 2021 07:04:49 -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 3/7] Platform/ARM: Move BootMonFs package to ArmCommonPkg Date: Mon, 20 Sep 2021 15:04:04 +0100 Message-Id: <20210920140408.16190-4-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: T1zA6A9p9vEWXyOOXb3ooC0Kx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1632146692; bh=/wPo8zICdS96wY/0RFIXxBGzPHNOIdxnaS3q/YLoFS8=; h=Cc:Date:From:Reply-To:Subject:To; b=Vq5ZKFsGMwbrWcbljVHpK1jenDEMTW9t97ZtqXqtf/sl03G8AtBjrh+3Px7bSmZqt2w Qmn9qYGgRxh/x/Kxj69CHsI65h9nf7tKIIHjmTHjfinLbhO0iHORU6mc0TUEqxHd15RO+ 7/9UGx41fdMpP1xCv6p0hXMDHSJ2J583HB8= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1632146703488100014 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 2, this patch removes the BootMonFs.dec package to ArmCommonPkg.dec and updates references to BootMonFs accordingly. Bugzilla: 3259 (https://bugzilla.tianocore.org/show_bug.cgi?id=3D3259) Signed-off-by: Pierre Gondois --- Platform/ARM/ArmCommonPkg/ArmCommonPkg.dec | 7 +++++++ .../Drivers/BootMonFs/BootMonFs.dec | 20 ------------------- .../Drivers/BootMonFs/BootMonFs.inf | 1 - Platform/ARM/JunoPkg/ArmJuno.fdf | 2 +- Platform/ARM/Morello/MorelloPlatformFvp.fdf | 2 +- Platform/ARM/N1Sdp/N1SdpPlatform.fdf | 2 +- Platform/ARM/SgiPkg/SgiPlatform.fdf | 2 +- .../ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf | 2 +- Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 2 +- 9 files changed, 13 insertions(+), 27 deletions(-) delete mode 100644 Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFs.d= ec diff --git a/Platform/ARM/ArmCommonPkg/ArmCommonPkg.dec b/Platform/ARM/ArmC= ommonPkg/ArmCommonPkg.dec index cce497c27fa5..dac54b9f9ed8 100644 --- a/Platform/ARM/ArmCommonPkg/ArmCommonPkg.dec +++ b/Platform/ARM/ArmCommonPkg/ArmCommonPkg.dec @@ -20,3 +20,10 @@ [LibraryClasses] =20 [Guids] gArmBootMonFsFileInfoGuid =3D { 0x41e26b9c, 0xada6, 0x45b3, { 0x80, 0x= 8e, 0x23, 0x57, 0xa3, 0x5b, 0x60, 0xd6 } } + +[Guids.common] + gArmBootMonFsTokenSpaceGuid =3D { 0xeb76a201, 0x69b4, 0x491f, { 0x9b, 0x= de, 0xbf, 0x30, 0xbd, 0x03, 0x82, 0xb4 } } + +[PcdsFixedAtBuild.common] + # Boot Monitor FileSystem + gArmBootMonFsTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L""|VOID*|0= x0000003A diff --git a/Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFs.dec b/Pl= atform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFs.dec deleted file mode 100644 index 1819e2f46d9c..000000000000 --- a/Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFs.dec +++ /dev/null @@ -1,20 +0,0 @@ -#/** @file -# -# Copyright (c) 2011-2017, ARM Limited. All rights reserved. -# -# SPDX-License-Identifier: BSD-2-Clause-Patent -# -#**/ - -[Defines] - DEC_SPECIFICATION =3D 0x0001001A - PACKAGE_NAME =3D BootMonFs - PACKAGE_GUID =3D 41f14aba-452f-4204-a435-25242973c5b1 - PACKAGE_VERSION =3D 0.1 - -[Guids.common] - gArmBootMonFsTokenSpaceGuid =3D { 0xeb76a201, 0x69b4, 0x491f, { 0x9b, 0x= de, 0xbf, 0x30, 0xbd, 0x03, 0x82, 0xb4 } } - -[PcdsFixedAtBuild.common] - # Boot Monitor FileSystem - gArmBootMonFsTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L""|VOID*|0= x0000003A diff --git a/Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFs.inf b/Pl= atform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFs.inf index 10efa919e2f6..791e6fae0126 100644 --- a/Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFs.inf +++ b/Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFs.inf @@ -29,7 +29,6 @@ [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec Platform/ARM/ArmCommonPkg/ArmCommonPkg.dec - Platform/ARM/Drivers/BootMonFs/BootMonFs.dec =20 [LibraryClasses] BaseLib diff --git a/Platform/ARM/JunoPkg/ArmJuno.fdf b/Platform/ARM/JunoPkg/ArmJun= o.fdf index f70d30c6a9d9..4e9cbee52932 100644 --- a/Platform/ARM/JunoPkg/ArmJuno.fdf +++ b/Platform/ARM/JunoPkg/ArmJuno.fdf @@ -139,7 +139,7 @@ [FV.FvMain] INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf =20 # Versatile Express FileSystem - INF Platform/ARM/Drivers/BootMonFs/BootMonFs.inf + INF ArmCommonPkg/Drivers/BootMonFs/BootMonFs.inf =20 # # FAT filesystem + GPT/MBR partitioning diff --git a/Platform/ARM/Morello/MorelloPlatformFvp.fdf b/Platform/ARM/Mor= ello/MorelloPlatformFvp.fdf index 851ee3159b3d..8bdb7f0d0f5f 100644 --- a/Platform/ARM/Morello/MorelloPlatformFvp.fdf +++ b/Platform/ARM/Morello/MorelloPlatformFvp.fdf @@ -114,7 +114,7 @@ [FV.FvMain] INF ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.inf INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf =20 - INF Platform/ARM/Drivers/BootMonFs/BootMonFs.inf + INF ArmCommonPkg/Drivers/BootMonFs/BootMonFs.inf INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf =20 # Virtio Block Device support diff --git a/Platform/ARM/N1Sdp/N1SdpPlatform.fdf b/Platform/ARM/N1Sdp/N1Sd= pPlatform.fdf index c4e1f7b4b8fc..af6a76470c71 100644 --- a/Platform/ARM/N1Sdp/N1SdpPlatform.fdf +++ b/Platform/ARM/N1Sdp/N1SdpPlatform.fdf @@ -126,7 +126,7 @@ [FV.FvMain] INF ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.inf INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf =20 - INF Platform/ARM/Drivers/BootMonFs/BootMonFs.inf + INF ArmCommonPkg/Drivers/BootMonFs/BootMonFs.inf INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf =20 # FAT filesystem + GPT/MBR partitioning diff --git a/Platform/ARM/SgiPkg/SgiPlatform.fdf b/Platform/ARM/SgiPkg/SgiP= latform.fdf index 8227ae03330c..1e72c1d0544c 100644 --- a/Platform/ARM/SgiPkg/SgiPlatform.fdf +++ b/Platform/ARM/SgiPkg/SgiPlatform.fdf @@ -157,7 +157,7 @@ [FV.FvMain] INF ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.inf !endif =20 - INF Platform/ARM/Drivers/BootMonFs/BootMonFs.inf + INF ArmCommonPkg/Drivers/BootMonFs/BootMonFs.inf INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf =20 # diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf b/Platform/A= RM/VExpressPkg/ArmVExpress-CTA15-A7.fdf index f98de162e634..4dd01308554c 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf +++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf @@ -121,7 +121,7 @@ [FV.FvMain] INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.i= nf =20 # Versatile Express FileSystem - INF Platform/ARM/Drivers/BootMonFs/BootMonFs.inf + INF ArmCommonPkg/Drivers/BootMonFs/BootMonFs.inf =20 # # USB support diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VE= xpressPkg/ArmVExpress.dsc.inc index d6f31ecda42f..e45e5a610f4c 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc +++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc @@ -417,7 +417,7 @@ [Components.common] } =20 # Versatile Express FileSystem - Platform/ARM/Drivers/BootMonFs/BootMonFs.inf + ArmCommonPkg/Drivers/BootMonFs/BootMonFs.inf =20 # # Networking stack --=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 (#80869): https://edk2.groups.io/g/devel/message/80869 Mute This Topic: https://groups.io/mt/85741389/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-