From nobody Mon Feb 9 21:00:05 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+80870+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+80870+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1632146694; cv=none; d=zohomail.com; s=zohoarc; b=HdR/e+K336Th0tqNN4MPyRB/J8ZgizG5HIcLH15vZGFZ/Fli8lfe12VyAKHTtlrwVp+JpVAmmxLH+iAM4YWGwT6XXfMYAbU1vzb9cVVBTCQ+ejN0UxFPDAP8etjlxxjuA/YpnCcISpXfWcVrPov9pV5tbRFKJYvFyNgchSDIl8I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632146694; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=qQ8pbGn4Al7vE1ohN2qCv7/xm7BXBLVjcvsu7ogTZvQ=; b=edlAN1ltlQye/wyY83Be8FUxzMmNvjWFQ+xkbGcXUUI2uO6giQkqzlI23KeTA60c/xpeaJ6EoNJQJLQfOmR4kMd8qRTXWpTHbbwZg8gqe7aIjOnlaxEOqh1az76IVAPB5GSEMHfnnUIhz4WffiqLCyuVAvYqhl130qoiyvrRvbM= 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+80870+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 1632146694877641.9450548904455; Mon, 20 Sep 2021 07:04:54 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 9rTPYY1788612xpIIxXL6uOt; Mon, 20 Sep 2021 07:04:54 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.12130.1632146693625110057 for ; Mon, 20 Sep 2021 07:04:54 -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 3F3E113D5; Mon, 20 Sep 2021 07:04:53 -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 748A53F718; Mon, 20 Sep 2021 07:04:51 -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 4/7] Platform/ARM: Move FdtPlatformDxe package to ArmCommonPkg Date: Mon, 20 Sep 2021 15:04:05 +0100 Message-Id: <20210920140408.16190-5-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: K7mGnZYd64SsPnmvPzBeQiYzx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1632146694; bh=+F8MOKlHfX3mumDHeS9ohmeDs0HjQtgUyYBEjLWFeH4=; h=Cc:Date:From:Reply-To:Subject:To; b=FEYa8KYK1PneiQuj4DvLViOICxxNX52b5HEV+ZP6Z92OXUUm6YBRY1Aadc0Q1aoMf/B TonKbAEckQTgD2yoHcionRouDNy2EAfla0c/DVTDT0Tl1Rl57vfUhqr0BB1MiteFTxYYy bT0gh9QJ5ilXui/tV2rSp8iNjyJblcwyhjE= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1632146704920100018 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 FdtPlatformDxe.dec package to ArmCommonPkg.dec and updates references to FdtPlatformDxe accordingly. Bugzilla: 3259 (https://bugzilla.tianocore.org/show_bug.cgi?id=3D3259) Signed-off-by: Pierre Gondois --- Platform/ARM/ArmCommonPkg/ArmCommonPkg.dec | 10 ++++++++ .../Drivers/FdtPlatformDxe/FdtPlatformDxe.dec | 25 ------------------- .../Drivers/FdtPlatformDxe/FdtPlatformDxe.inf | 1 - Platform/ARM/JunoPkg/ArmJuno.dsc | 2 +- Platform/ARM/JunoPkg/ArmJuno.fdf | 2 +- .../JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf | 1 - .../ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc | 2 +- .../ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf | 2 +- 8 files changed, 14 insertions(+), 31 deletions(-) delete mode 100644 Platform/ARM/ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPla= tformDxe.dec diff --git a/Platform/ARM/ArmCommonPkg/ArmCommonPkg.dec b/Platform/ARM/ArmC= ommonPkg/ArmCommonPkg.dec index dac54b9f9ed8..12bf49d769e5 100644 --- a/Platform/ARM/ArmCommonPkg/ArmCommonPkg.dec +++ b/Platform/ARM/ArmCommonPkg/ArmCommonPkg.dec @@ -20,6 +20,7 @@ [LibraryClasses] =20 [Guids] gArmBootMonFsFileInfoGuid =3D { 0x41e26b9c, 0xada6, 0x45b3, { 0x80, 0x= 8e, 0x23, 0x57, 0xa3, 0x5b, 0x60, 0xd6 } } + gFdtPlatformDxeTokenSpaceGuid =3D { 0xbfcaa0af, 0xedd4, 0x4ce7, { 0xbd, = 0xb3, 0x39, 0x15, 0x07, 0x28, 0x65, 0x77 } } =20 [Guids.common] gArmBootMonFsTokenSpaceGuid =3D { 0xeb76a201, 0x69b4, 0x491f, { 0x9b, 0x= de, 0xbf, 0x30, 0xbd, 0x03, 0x82, 0xb4 } } @@ -27,3 +28,12 @@ [Guids.common] [PcdsFixedAtBuild.common] # Boot Monitor FileSystem gArmBootMonFsTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L""|VOID*|0= x0000003A + +[PcdsFeatureFlag.common] + # Enable the development specific features + gFdtPlatformDxeTokenSpaceGuid.PcdOverridePlatformFdt|TRUE|BOOLEAN|0x0000= 0001 + # Add 'dumpfdt' EFI Shell command + gFdtPlatformDxeTokenSpaceGuid.PcdDumpFdtShellCommand|TRUE|BOOLEAN|0x0000= 0002 + +[PcdsFixedAtBuild.common, PcdsDynamic.common] + gFdtPlatformDxeTokenSpaceGuid.PcdFdtDevicePaths|L""|VOID*|0x00000055 diff --git a/Platform/ARM/ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDx= e.dec b/Platform/ARM/ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.dec deleted file mode 100644 index 550156938f0c..000000000000 --- a/Platform/ARM/ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.dec +++ /dev/null @@ -1,25 +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 FdtPlatformDxe - PACKAGE_GUID =3D ed22c1e5-71cb-48d6-a9d8-c20f8d6b909f - PACKAGE_VERSION =3D 0.1 - -[Guids] - gFdtPlatformDxeTokenSpaceGuid =3D { 0xbfcaa0af, 0xedd4, 0x4ce7, { 0xbd, = 0xb3, 0x39, 0x15, 0x07, 0x28, 0x65, 0x77 } } - -[PcdsFeatureFlag.common] - # Enable the development specific features - gFdtPlatformDxeTokenSpaceGuid.PcdOverridePlatformFdt|TRUE|BOOLEAN|0x0000= 0001 - # Add 'dumpfdt' EFI Shell command - gFdtPlatformDxeTokenSpaceGuid.PcdDumpFdtShellCommand|TRUE|BOOLEAN|0x0000= 0002 - -[PcdsFixedAtBuild.common, PcdsDynamic.common] - gFdtPlatformDxeTokenSpaceGuid.PcdFdtDevicePaths|L""|VOID*|0x00000055 diff --git a/Platform/ARM/ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDx= e.inf b/Platform/ARM/ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf index b844c0dc5233..471efb51afd0 100644 --- a/Platform/ARM/ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf +++ b/Platform/ARM/ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf @@ -26,7 +26,6 @@ [Packages] MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec Platform/ARM/ArmCommonPkg/ArmCommonPkg.dec - Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.dec ShellPkg/ShellPkg.dec =20 [LibraryClasses] diff --git a/Platform/ARM/JunoPkg/ArmJuno.dsc b/Platform/ARM/JunoPkg/ArmJun= o.dsc index fdfc8cd9e20f..93d78597930d 100644 --- a/Platform/ARM/JunoPkg/ArmJuno.dsc +++ b/Platform/ARM/JunoPkg/ArmJuno.dsc @@ -375,7 +375,7 @@ [Components.common] # # FDT installation # - Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf { + ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf { BdsLib|Platform/ARM/Library/BdsLib/BdsLib.inf } diff --git a/Platform/ARM/JunoPkg/ArmJuno.fdf b/Platform/ARM/JunoPkg/ArmJun= o.fdf index 4e9cbee52932..01c7edb08661 100644 --- a/Platform/ARM/JunoPkg/ArmJuno.fdf +++ b/Platform/ARM/JunoPkg/ArmJuno.fdf @@ -232,7 +232,7 @@ [FV.FvMain] # # The UEFI driver is at the end of the list of the driver to be dispatch= ed # after the device drivers (eg: Ethernet) to ensure we have support for = them. - INF Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf + INF ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf =20 # SCMI Driver INF ArmPkg/Drivers/ArmScmiDxe/ArmScmiDxe.inf diff --git a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf b/Platf= orm/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf index 8b3a159ebe20..5dcd67af47aa 100644 --- a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf +++ b/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf @@ -23,7 +23,6 @@ [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec ArmCommonPkg/ArmCommonPkg.dec - Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.dec Platform/ARM/JunoPkg/ArmJuno.dec =20 [LibraryClasses] diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc b/Platform/A= RM/VExpressPkg/ArmVExpress-CTA15-A7.dsc index e06a2a47f091..ee75fc472ec6 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc +++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc @@ -281,7 +281,7 @@ [Components.common] # # FDT installation # - Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf { + ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf { BdsLib|Platform/ARM/Library/BdsLib/BdsLib.inf } diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf b/Platform/A= RM/VExpressPkg/ArmVExpress-CTA15-A7.fdf index 4dd01308554c..6bb1d540fe35 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf +++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf @@ -167,7 +167,7 @@ [FV.FvMain] # # The UEFI driver is at the end of the list of the driver to be dispatch= ed # after the device drivers (eg: Ethernet) to ensure we have support for = them. - INF Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf + INF ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf =20 # Example to add a Device Tree to the Firmware Volume #FILE FREEFORM =3D PCD(gArmVExpressTokenSpaceGuid.PcdFdtVExpressHwA15x2A= 7x3) { --=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 (#80870): https://edk2.groups.io/g/devel/message/80870 Mute This Topic: https://groups.io/mt/85741391/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-