From nobody Tue Apr 30 06:11:12 2024 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+82349+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+82349+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1634639126; cv=none; d=zohomail.com; s=zohoarc; b=RXMV99y+GUcop1Kt1VCdyZWx0a1/uM9xKvyV90GnhLoUH6rDOxkH4mnjPrLLz8y0gnyceme+IXd8D+d+1ZJc8XXEHttB/T+kq+59QOc4EnySpZk72kdLPw7PaT7N6jlTne++4QbritbDvB6vJBINjV9pOsC1gwVk25+j+w6H428= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634639126; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=aZ/K/euHryp2TsiY84Rj/sKNQ7Gb6dpf8gJUV4ENdQQ=; b=EJJSf3JPh5gk7vEIdqtfqXgcKrGV35+hekjX89np+Y8H3BSIsMMIoah42rYTesIFJ7+u+uqgGsN6VNylkZS3lt7cQEq0VsKo1Zt3ppSepikHnS2z6qj0WHUMx9XKH19n/CYYf6x4PZfYhcRMjcjMPgsSiAFZREEeOmxXnXGvTAU= 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+82349+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 1634639126351798.0284199305823; Tue, 19 Oct 2021 03:25:26 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 38K1YY1788612xgRU30n3osz; Tue, 19 Oct 2021 03:25:26 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web12.7853.1634639125146513087 for ; Tue, 19 Oct 2021 03:25:25 -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 AAD12ED1; Tue, 19 Oct 2021 03:25:18 -0700 (PDT) X-Received: from e120189.arm.com (unknown [10.57.73.233]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 452753F70D; Tue, 19 Oct 2021 03:25:17 -0700 (PDT) From: "PierreGondois" To: devel@edk2.groups.io, Sean Brogan , Sami Mujawar , Leif Lindholm Cc: Ard Biesheuvel Subject: [edk2-devel] [RFC PATCH edk2-platforms v1 1/5] Platform/ARM: Create ArmCommonPkg Date: Tue, 19 Oct 2021 11:24:58 +0100 Message-Id: <20211019102502.3765-2-Pierre.Gondois@arm.com> In-Reply-To: <20211019102502.3765-1-Pierre.Gondois@arm.com> References: <20211019102502.3765-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: W08YWcKrJ2STyjU6u6VqZw9Xx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1634639126; bh=FIG4nkh4sMAJgwi0bGwVVnccBxcLff91MIb2g4ZobJI=; h=Cc:Date:From:Reply-To:Subject:To; b=hltZtdpYf4E9r7feTmLpV3l6ST1XXI4TincqJ5ifMz4XqU8uDbD163t/AYHwXncjLAv JIsxJ4rz54m+qK4JKn6/xq/Korquxt6dp5lEhuuLrC160uRY33s+YJ/Hb2rn+D7LCdU2d f/qTiGkOfWq9DrPRBs8BUdp/ijjY/++s2LQ= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1634640029303100004 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 host 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 clear 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 is moving: Platform/ARM/[Drivers/* | Include/* | Library/*] to: Platform/ARM/ArmCommonPkg without code modification. Bugzilla: 3259 (https://bugzilla.tianocore.org/show_bug.cgi?id=3D3259) Signed-off-by: Pierre Gondois --- Platform/ARM/{ =3D> ArmCommonPkg}/Drivers/BootMonFs/BootMonFs.dec | 0 Platform/ARM/{ =3D> ArmCommonPkg}/Drivers/BootMonFs/BootMonFs.inf | 0 Platform/ARM/{ =3D> ArmCommonPkg}/Drivers/BootMonFs/BootMonFsApi.h | 0 Platform/ARM/{ =3D> ArmCommonPkg}/Drivers/BootMonFs/BootMonFsDir.c | 0 .../{ =3D> ArmCommonPkg}/Drivers/BootMonFs/BootMonFsEntryPoint.c | 0 Platform/ARM/{ =3D> ArmCommonPkg}/Drivers/BootMonFs/BootMonFsHw.h | 0 .../ARM/{ =3D> ArmCommonPkg}/Drivers/BootMonFs/BootMonFsImages.c | 0 .../ARM/{ =3D> ArmCommonPkg}/Drivers/BootMonFs/BootMonFsInternal.h | 0 .../ARM/{ =3D> ArmCommonPkg}/Drivers/BootMonFs/BootMonFsOpenClose.c | 0 .../ARM/{ =3D> ArmCommonPkg}/Drivers/BootMonFs/BootMonFsReadWrite.c | 0 .../{ =3D> ArmCommonPkg}/Drivers/BootMonFs/BootMonFsUnsupported.c | 0 .../ARM/{ =3D> ArmCommonPkg}/Drivers/FdtPlatformDxe/FdtPlatform.c | 0 .../ARM/{ =3D> ArmCommonPkg}/Drivers/FdtPlatformDxe/FdtPlatform.h | 0 .../{ =3D> ArmCommonPkg}/Drivers/FdtPlatformDxe/FdtPlatformDxe.dec | 0 .../{ =3D> ArmCommonPkg}/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf | 0 .../{ =3D> ArmCommonPkg}/Drivers/FdtPlatformDxe/FdtPlatformDxe.uni | 0 Platform/ARM/{ =3D> ArmCommonPkg}/Drivers/FdtPlatformDxe/README.txt | 0 .../ARM/{ =3D> ArmCommonPkg}/Drivers/FdtPlatformDxe/ShellDumpFdt.c | 0 .../ARM/{ =3D> ArmCommonPkg}/Drivers/FdtPlatformDxe/ShellSetFdt.c | 0 Platform/ARM/{ =3D> ArmCommonPkg}/Include/Guid/BootMonFsFileInfo.h | 0 Platform/ARM/{ =3D> ArmCommonPkg}/Include/Library/ArmShellCmdLib.h | 0 Platform/ARM/{ =3D> ArmCommonPkg}/Include/Library/BdsLib.h | 0 .../{ =3D> ArmCommonPkg}/Library/ArmShellCmdRunAxf/AArch64/Pivot.S | 0 .../ARM/{ =3D> ArmCommonPkg}/Library/ArmShellCmdRunAxf/Arm/Pivot.S | 0 .../Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.c | 0 .../Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.h | 0 .../Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf | 0 .../Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.uni | 0 .../Library/ArmShellCmdRunAxf/BootMonFsLoader.c | 0 .../Library/ArmShellCmdRunAxf/BootMonFsLoader.h | 0 .../ARM/{ =3D> ArmCommonPkg}/Library/ArmShellCmdRunAxf/ElfLoader.c | 0 .../ARM/{ =3D> ArmCommonPkg}/Library/ArmShellCmdRunAxf/ElfLoader.h | 0 .../ARM/{ =3D> ArmCommonPkg}/Library/ArmShellCmdRunAxf/RunAxf.c | 0 Platform/ARM/{ =3D> ArmCommonPkg}/Library/ArmShellCmdRunAxf/elf32.h | 0 Platform/ARM/{ =3D> ArmCommonPkg}/Library/ArmShellCmdRunAxf/elf64.h | 0 .../ARM/{ =3D> ArmCommonPkg}/Library/ArmShellCmdRunAxf/elf_common.h | 0 Platform/ARM/{ =3D> ArmCommonPkg}/Library/BdsLib/BdsFilePath.c | 0 Platform/ARM/{ =3D> ArmCommonPkg}/Library/BdsLib/BdsHelper.c | 0 Platform/ARM/{ =3D> ArmCommonPkg}/Library/BdsLib/BdsInternal.h | 0 Platform/ARM/{ =3D> ArmCommonPkg}/Library/BdsLib/BdsLib.inf | 0 40 files changed, 0 insertions(+), 0 deletions(-) rename Platform/ARM/{ =3D> ArmCommonPkg}/Drivers/BootMonFs/BootMonFs.dec (= 100%) rename Platform/ARM/{ =3D> ArmCommonPkg}/Drivers/BootMonFs/BootMonFs.inf (= 100%) rename Platform/ARM/{ =3D> ArmCommonPkg}/Drivers/BootMonFs/BootMonFsApi.h = (100%) rename Platform/ARM/{ =3D> ArmCommonPkg}/Drivers/BootMonFs/BootMonFsDir.c = (100%) rename Platform/ARM/{ =3D> ArmCommonPkg}/Drivers/BootMonFs/BootMonFsEntryP= oint.c (100%) rename Platform/ARM/{ =3D> ArmCommonPkg}/Drivers/BootMonFs/BootMonFsHw.h (= 100%) rename Platform/ARM/{ =3D> ArmCommonPkg}/Drivers/BootMonFs/BootMonFsImages= .c (100%) rename Platform/ARM/{ =3D> ArmCommonPkg}/Drivers/BootMonFs/BootMonFsIntern= al.h (100%) rename Platform/ARM/{ =3D> ArmCommonPkg}/Drivers/BootMonFs/BootMonFsOpenCl= ose.c (100%) rename Platform/ARM/{ =3D> ArmCommonPkg}/Drivers/BootMonFs/BootMonFsReadWr= ite.c (100%) rename Platform/ARM/{ =3D> ArmCommonPkg}/Drivers/BootMonFs/BootMonFsUnsupp= orted.c (100%) rename Platform/ARM/{ =3D> ArmCommonPkg}/Drivers/FdtPlatformDxe/FdtPlatfor= m.c (100%) rename Platform/ARM/{ =3D> ArmCommonPkg}/Drivers/FdtPlatformDxe/FdtPlatfor= m.h (100%) rename Platform/ARM/{ =3D> ArmCommonPkg}/Drivers/FdtPlatformDxe/FdtPlatfor= mDxe.dec (100%) rename Platform/ARM/{ =3D> ArmCommonPkg}/Drivers/FdtPlatformDxe/FdtPlatfor= mDxe.inf (100%) rename Platform/ARM/{ =3D> ArmCommonPkg}/Drivers/FdtPlatformDxe/FdtPlatfor= mDxe.uni (100%) rename Platform/ARM/{ =3D> ArmCommonPkg}/Drivers/FdtPlatformDxe/README.txt= (100%) rename Platform/ARM/{ =3D> ArmCommonPkg}/Drivers/FdtPlatformDxe/ShellDumpF= dt.c (100%) rename Platform/ARM/{ =3D> ArmCommonPkg}/Drivers/FdtPlatformDxe/ShellSetFd= t.c (100%) rename Platform/ARM/{ =3D> ArmCommonPkg}/Include/Guid/BootMonFsFileInfo.h = (100%) rename Platform/ARM/{ =3D> ArmCommonPkg}/Include/Library/ArmShellCmdLib.h = (100%) rename Platform/ARM/{ =3D> ArmCommonPkg}/Include/Library/BdsLib.h (100%) rename Platform/ARM/{ =3D> ArmCommonPkg}/Library/ArmShellCmdRunAxf/AArch64= /Pivot.S (100%) rename Platform/ARM/{ =3D> ArmCommonPkg}/Library/ArmShellCmdRunAxf/Arm/Piv= ot.S (100%) rename Platform/ARM/{ =3D> ArmCommonPkg}/Library/ArmShellCmdRunAxf/ArmShel= lCmdRunAxf.c (100%) rename Platform/ARM/{ =3D> ArmCommonPkg}/Library/ArmShellCmdRunAxf/ArmShel= lCmdRunAxf.h (100%) rename Platform/ARM/{ =3D> ArmCommonPkg}/Library/ArmShellCmdRunAxf/ArmShel= lCmdRunAxf.inf (100%) rename Platform/ARM/{ =3D> ArmCommonPkg}/Library/ArmShellCmdRunAxf/ArmShel= lCmdRunAxf.uni (100%) rename Platform/ARM/{ =3D> ArmCommonPkg}/Library/ArmShellCmdRunAxf/BootMon= FsLoader.c (100%) rename Platform/ARM/{ =3D> ArmCommonPkg}/Library/ArmShellCmdRunAxf/BootMon= FsLoader.h (100%) rename Platform/ARM/{ =3D> ArmCommonPkg}/Library/ArmShellCmdRunAxf/ElfLoad= er.c (100%) rename Platform/ARM/{ =3D> ArmCommonPkg}/Library/ArmShellCmdRunAxf/ElfLoad= er.h (100%) rename Platform/ARM/{ =3D> ArmCommonPkg}/Library/ArmShellCmdRunAxf/RunAxf.= c (100%) rename Platform/ARM/{ =3D> ArmCommonPkg}/Library/ArmShellCmdRunAxf/elf32.h= (100%) rename Platform/ARM/{ =3D> ArmCommonPkg}/Library/ArmShellCmdRunAxf/elf64.h= (100%) rename Platform/ARM/{ =3D> ArmCommonPkg}/Library/ArmShellCmdRunAxf/elf_com= mon.h (100%) rename Platform/ARM/{ =3D> ArmCommonPkg}/Library/BdsLib/BdsFilePath.c (100= %) rename Platform/ARM/{ =3D> ArmCommonPkg}/Library/BdsLib/BdsHelper.c (100%) rename Platform/ARM/{ =3D> ArmCommonPkg}/Library/BdsLib/BdsInternal.h (100= %) rename Platform/ARM/{ =3D> ArmCommonPkg}/Library/BdsLib/BdsLib.inf (100%) diff --git a/Platform/ARM/Drivers/BootMonFs/BootMonFs.dec b/Platform/ARM/Ar= mCommonPkg/Drivers/BootMonFs/BootMonFs.dec similarity index 100% rename from Platform/ARM/Drivers/BootMonFs/BootMonFs.dec rename to Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFs.dec diff --git a/Platform/ARM/Drivers/BootMonFs/BootMonFs.inf b/Platform/ARM/Ar= mCommonPkg/Drivers/BootMonFs/BootMonFs.inf similarity index 100% rename from Platform/ARM/Drivers/BootMonFs/BootMonFs.inf rename to Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFs.inf diff --git a/Platform/ARM/Drivers/BootMonFs/BootMonFsApi.h b/Platform/ARM/A= rmCommonPkg/Drivers/BootMonFs/BootMonFsApi.h similarity index 100% rename from Platform/ARM/Drivers/BootMonFs/BootMonFsApi.h rename to Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFsApi.h diff --git a/Platform/ARM/Drivers/BootMonFs/BootMonFsDir.c b/Platform/ARM/A= rmCommonPkg/Drivers/BootMonFs/BootMonFsDir.c similarity index 100% rename from Platform/ARM/Drivers/BootMonFs/BootMonFsDir.c rename to Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFsDir.c diff --git a/Platform/ARM/Drivers/BootMonFs/BootMonFsEntryPoint.c b/Platfor= m/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFsEntryPoint.c similarity index 100% rename from Platform/ARM/Drivers/BootMonFs/BootMonFsEntryPoint.c rename to Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFsEntryPoint.c diff --git a/Platform/ARM/Drivers/BootMonFs/BootMonFsHw.h b/Platform/ARM/Ar= mCommonPkg/Drivers/BootMonFs/BootMonFsHw.h similarity index 100% rename from Platform/ARM/Drivers/BootMonFs/BootMonFsHw.h rename to Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFsHw.h diff --git a/Platform/ARM/Drivers/BootMonFs/BootMonFsImages.c b/Platform/AR= M/ArmCommonPkg/Drivers/BootMonFs/BootMonFsImages.c similarity index 100% rename from Platform/ARM/Drivers/BootMonFs/BootMonFsImages.c rename to Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFsImages.c diff --git a/Platform/ARM/Drivers/BootMonFs/BootMonFsInternal.h b/Platform/= ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFsInternal.h similarity index 100% rename from Platform/ARM/Drivers/BootMonFs/BootMonFsInternal.h rename to Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFsInternal.h diff --git a/Platform/ARM/Drivers/BootMonFs/BootMonFsOpenClose.c b/Platform= /ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFsOpenClose.c similarity index 100% rename from Platform/ARM/Drivers/BootMonFs/BootMonFsOpenClose.c rename to Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFsOpenClose.c diff --git a/Platform/ARM/Drivers/BootMonFs/BootMonFsReadWrite.c b/Platform= /ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFsReadWrite.c similarity index 100% rename from Platform/ARM/Drivers/BootMonFs/BootMonFsReadWrite.c rename to Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFsReadWrite.c diff --git a/Platform/ARM/Drivers/BootMonFs/BootMonFsUnsupported.c b/Platfo= rm/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFsUnsupported.c similarity index 100% rename from Platform/ARM/Drivers/BootMonFs/BootMonFsUnsupported.c rename to Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFsUnsupported.c diff --git a/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatform.c b/Platform/A= RM/ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatform.c similarity index 100% rename from Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatform.c rename to Platform/ARM/ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatform.c diff --git a/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatform.h b/Platform/A= RM/ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatform.h similarity index 100% rename from Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatform.h rename to Platform/ARM/ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatform.h diff --git a/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.dec b/Platf= orm/ARM/ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.dec similarity index 100% rename from Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.dec rename to Platform/ARM/ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.d= ec diff --git a/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf b/Platf= orm/ARM/ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf similarity index 100% rename from Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf rename to Platform/ARM/ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.i= nf diff --git a/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.uni b/Platf= orm/ARM/ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.uni similarity index 100% rename from Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.uni rename to Platform/ARM/ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.u= ni diff --git a/Platform/ARM/Drivers/FdtPlatformDxe/README.txt b/Platform/ARM/= ArmCommonPkg/Drivers/FdtPlatformDxe/README.txt similarity index 100% rename from Platform/ARM/Drivers/FdtPlatformDxe/README.txt rename to Platform/ARM/ArmCommonPkg/Drivers/FdtPlatformDxe/README.txt diff --git a/Platform/ARM/Drivers/FdtPlatformDxe/ShellDumpFdt.c b/Platform/= ARM/ArmCommonPkg/Drivers/FdtPlatformDxe/ShellDumpFdt.c similarity index 100% rename from Platform/ARM/Drivers/FdtPlatformDxe/ShellDumpFdt.c rename to Platform/ARM/ArmCommonPkg/Drivers/FdtPlatformDxe/ShellDumpFdt.c diff --git a/Platform/ARM/Drivers/FdtPlatformDxe/ShellSetFdt.c b/Platform/A= RM/ArmCommonPkg/Drivers/FdtPlatformDxe/ShellSetFdt.c similarity index 100% rename from Platform/ARM/Drivers/FdtPlatformDxe/ShellSetFdt.c rename to Platform/ARM/ArmCommonPkg/Drivers/FdtPlatformDxe/ShellSetFdt.c diff --git a/Platform/ARM/Include/Guid/BootMonFsFileInfo.h b/Platform/ARM/A= rmCommonPkg/Include/Guid/BootMonFsFileInfo.h similarity index 100% rename from Platform/ARM/Include/Guid/BootMonFsFileInfo.h rename to Platform/ARM/ArmCommonPkg/Include/Guid/BootMonFsFileInfo.h diff --git a/Platform/ARM/Include/Library/ArmShellCmdLib.h b/Platform/ARM/A= rmCommonPkg/Include/Library/ArmShellCmdLib.h similarity index 100% rename from Platform/ARM/Include/Library/ArmShellCmdLib.h rename to Platform/ARM/ArmCommonPkg/Include/Library/ArmShellCmdLib.h diff --git a/Platform/ARM/Include/Library/BdsLib.h b/Platform/ARM/ArmCommon= Pkg/Include/Library/BdsLib.h similarity index 100% rename from Platform/ARM/Include/Library/BdsLib.h rename to Platform/ARM/ArmCommonPkg/Include/Library/BdsLib.h diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/AArch64/Pivot.S b/Platf= orm/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/AArch64/Pivot.S similarity index 100% rename from Platform/ARM/Library/ArmShellCmdRunAxf/AArch64/Pivot.S rename to Platform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/AArch64/Pivot= .S diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/Arm/Pivot.S b/Platform/= ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/Arm/Pivot.S similarity index 100% rename from Platform/ARM/Library/ArmShellCmdRunAxf/Arm/Pivot.S rename to Platform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/Arm/Pivot.S diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.c b/P= latform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.c similarity index 100% rename from Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.c rename to Platform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRu= nAxf.c diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.h b/P= latform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.h similarity index 100% rename from Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.h rename to Platform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRu= nAxf.h diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf b= /Platform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf similarity index 100% rename from Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf rename to Platform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRu= nAxf.inf diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.uni b= /Platform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.uni similarity index 100% rename from Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.uni rename to Platform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRu= nAxf.uni diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/BootMonFsLoader.c b/Pla= tform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/BootMonFsLoader.c similarity index 100% rename from Platform/ARM/Library/ArmShellCmdRunAxf/BootMonFsLoader.c rename to Platform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/BootMonFsLoad= er.c diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/BootMonFsLoader.h b/Pla= tform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/BootMonFsLoader.h similarity index 100% rename from Platform/ARM/Library/ArmShellCmdRunAxf/BootMonFsLoader.h rename to Platform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/BootMonFsLoad= er.h diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/ElfLoader.c b/Platform/= ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/ElfLoader.c similarity index 100% rename from Platform/ARM/Library/ArmShellCmdRunAxf/ElfLoader.c rename to Platform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/ElfLoader.c diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/ElfLoader.h b/Platform/= ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/ElfLoader.h similarity index 100% rename from Platform/ARM/Library/ArmShellCmdRunAxf/ElfLoader.h rename to Platform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/ElfLoader.h diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/RunAxf.c b/Platform/ARM= /ArmCommonPkg/Library/ArmShellCmdRunAxf/RunAxf.c similarity index 100% rename from Platform/ARM/Library/ArmShellCmdRunAxf/RunAxf.c rename to Platform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/RunAxf.c diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/elf32.h b/Platform/ARM/= ArmCommonPkg/Library/ArmShellCmdRunAxf/elf32.h similarity index 100% rename from Platform/ARM/Library/ArmShellCmdRunAxf/elf32.h rename to Platform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/elf32.h diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/elf64.h b/Platform/ARM/= ArmCommonPkg/Library/ArmShellCmdRunAxf/elf64.h similarity index 100% rename from Platform/ARM/Library/ArmShellCmdRunAxf/elf64.h rename to Platform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/elf64.h diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/elf_common.h b/Platform= /ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/elf_common.h similarity index 100% rename from Platform/ARM/Library/ArmShellCmdRunAxf/elf_common.h rename to Platform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/elf_common.h diff --git a/Platform/ARM/Library/BdsLib/BdsFilePath.c b/Platform/ARM/ArmCo= mmonPkg/Library/BdsLib/BdsFilePath.c similarity index 100% rename from Platform/ARM/Library/BdsLib/BdsFilePath.c rename to Platform/ARM/ArmCommonPkg/Library/BdsLib/BdsFilePath.c diff --git a/Platform/ARM/Library/BdsLib/BdsHelper.c b/Platform/ARM/ArmComm= onPkg/Library/BdsLib/BdsHelper.c similarity index 100% rename from Platform/ARM/Library/BdsLib/BdsHelper.c rename to Platform/ARM/ArmCommonPkg/Library/BdsLib/BdsHelper.c diff --git a/Platform/ARM/Library/BdsLib/BdsInternal.h b/Platform/ARM/ArmCo= mmonPkg/Library/BdsLib/BdsInternal.h similarity index 100% rename from Platform/ARM/Library/BdsLib/BdsInternal.h rename to Platform/ARM/ArmCommonPkg/Library/BdsLib/BdsInternal.h diff --git a/Platform/ARM/Library/BdsLib/BdsLib.inf b/Platform/ARM/ArmCommo= nPkg/Library/BdsLib/BdsLib.inf similarity index 100% rename from Platform/ARM/Library/BdsLib/BdsLib.inf rename to Platform/ARM/ArmCommonPkg/Library/BdsLib/BdsLib.inf --=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 (#82349): https://edk2.groups.io/g/devel/message/82349 Mute This Topic: https://groups.io/mt/86436506/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- From nobody Tue Apr 30 06:11:12 2024 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+82347+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+82347+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1634639127; cv=none; d=zohomail.com; s=zohoarc; b=NzoozaSLrqu/Jw2QqMovCMUGs5bQQwtlYijoZyZLyx+VdDLEoMu8+Ohr+DRn0TSSCPy6cVOEj1FODhks11aOeNalMz1DEPAi+gMp5Lk//6p1iB0z+gf0iQxEp4jl91I43v49G7rLvwJV9tqGzUCdMjaxg+7AJgRVfd3toLyd83Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634639127; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=aqEUOWZCFdPT+OmLHRJ2E4o97Ug9798EvsqktdYA9Es=; b=KFoLu4X7+v+qhvCj/h7Kzbvl+qIkjDwsQm2dOSv6U0MxcXIpjyOD76ZBdFqwG02jl+nSTJkqQFbfYCbKSVZIGVgS9O9XIHG5KJyQhhwq4uVozv/5LyEStb71phGfJ6Xj3I1CuLLF/xE1ij1J3elK+cOru882qlJ0LCb45pqd04U= 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+82347+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 1634639127124606.5367640995723; Tue, 19 Oct 2021 03:25:27 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 8ltDYY1788612xJHmUVofQrS; Tue, 19 Oct 2021 03:25:26 -0700 X-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 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 83581D6E; Tue, 19 Oct 2021 03:25:20 -0700 (PDT) X-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: [edk2-devel] [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> In-Reply-To: <20211019102502.3765-1-Pierre.Gondois@arm.com> References: <20211019102502.3765-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: rKO8RAR41YeidRsO0vVGkoSVx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1634639126; bh=zTYi/Rn7/WRhpdDn0pZskISw57/QagS+cgAqLszYhdI=; h=Cc:Date:From:Reply-To:Subject:To; b=HQ6nvwSNaHx06Hq4IvFaQjSPs/IJtQ5Hw73FXPMVuEDhDRu3uISPZYWs3KN70cvvXjd 3o81GzwQR1QX6rYZPaPnmhBwh8R7CbytfWoM2Rifn1AR6I3lovixq95u9qvGLWWAAuyaa AsGirq3CqRqtuX3mUpYSotS8BDQCmIl9UkE= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1634640029251100001 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..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 =20 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 =20 [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 =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 (#82347): https://edk2.groups.io/g/devel/message/82347 Mute This Topic: https://groups.io/mt/86436504/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- From nobody Tue Apr 30 06:11:12 2024 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+82348+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+82348+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1634639126; cv=none; d=zohomail.com; s=zohoarc; b=LxpaRLCER2SC1+OvUTYL28+u+VF41P4pRg/a1TAIlUS7GI2XG5y/egeth/DirXW4b3cqTJEQAKLuDHPknzfs+Qi6zXnEJx6Pxp8lRYMoHmMKuCgpP+3ozV4qqQBwXkZOaGplgMyMFuMP7EPVLmlzwvQVuv6k+bO/2n/JHWiBXkA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634639126; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=FejgiHgILnkua1btt+hrxxajJnc/zcDfL02JR9V4NPU=; b=n5yAudMPA8AbAeC20BsLpZ0CbAQ8BuDUutSx6lICdR/pJ1P8+9bBb2WUyx0/dKz+RSSWIDqTcniasAUlYdyg0+6NeG95/pzPRT9uERrqz0RcuE1FiJkM9lJ6tYURUP3QGZL+p9vrcYNOs1tHq6/j5zFfe2BDkUs+gkP/UYE6eM4= 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+82348+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 1634639126717378.94121732373685; Tue, 19 Oct 2021 03:25:26 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id HLZQYY1788612x4ljUbDu1S1; Tue, 19 Oct 2021 03:25:26 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web12.7854.1634639125146599470 for ; Tue, 19 Oct 2021 03:25:25 -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 313161063; Tue, 19 Oct 2021 03:25:22 -0700 (PDT) X-Received: from e120189.arm.com (unknown [10.57.73.233]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id D47B43F70D; Tue, 19 Oct 2021 03:25:20 -0700 (PDT) From: "PierreGondois" To: devel@edk2.groups.io, Sean Brogan , Sami Mujawar , Leif Lindholm Cc: Ard Biesheuvel Subject: [edk2-devel] [RFC PATCH edk2-platforms v1 3/5] Platform/ARM: Move BootMonFs package to ArmCommonPkg Date: Tue, 19 Oct 2021 11:25:00 +0100 Message-Id: <20211019102502.3765-4-Pierre.Gondois@arm.com> In-Reply-To: <20211019102502.3765-1-Pierre.Gondois@arm.com> References: <20211019102502.3765-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: UVqo8vjI3Tlh7jMWm0xWHgl7x1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1634639126; bh=4o6aTAshRQfvRMXqyXVaItQ875nOxQQzBhVahvE6oYA=; h=Cc:Date:From:Reply-To:Subject:To; b=p43IaoISTYtSVaKscPyciocw1L/EcDy6MQRFT/m8ymw3KE2mtEAFynB0lxc4KRS4+Iu 13S3UkzOCsRDnP9wArzCS+5PzqMGHddbmvDf23ClIhPi2cRI3FDtPWn/m3NKTyuWUgihz E84sf3vUS+oOewvmepJvZzTnnx/pTPW2tcI= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1634640029270100003 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..910de7c00988 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 Platform/ARM/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..2eb9d3fd46e3 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 Platform/ARM/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..905086cf2a20 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 Platform/ARM/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..62654b4aeb20 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 Platform/ARM/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..bf60fb69bb15 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 Platform/ARM/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..8704f25b11ec 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 + Platform/ARM/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 (#82348): https://edk2.groups.io/g/devel/message/82348 Mute This Topic: https://groups.io/mt/86436505/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- From nobody Tue Apr 30 06:11:12 2024 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+82346+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+82346+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1634639125; cv=none; d=zohomail.com; s=zohoarc; b=QbbZ7f+5VGkuSYJoZ76pfwclidLMvkzPJWX7U/JJ/o+9pbWpsYCTrfR3otAaj9c5G4Jrd5UeC2Mm4cKqiB4d4GIv2HupnNGd5b+m/kdxzF2aTHLJa9sKO8HvAtbox5V669y09DMn62jMRRIYRbtGHZ3wU28k5ZE3/WTEW+5sL0w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634639125; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=2E7pZTmdZsIPX4RUT/8OPEtokxd3J0pABvc2ZralCmA=; b=cuY7TEwAgcGDRKEmhI7W6gmHlHhufQX06sZcZY4Ui/4szmIuQxjBgrhj3X6jBvWlu7diOXtOjmnhVEYt9Tj2eV8jhvrj4OAc8X2GLo1IAC+jAowLFFv0is/Tq9+Vas3gU/0AxKXXo8OntMid9GLBwQW0/ia+8BNQLAXHvOYxnWk= 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+82346+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 1634639125624153.65071522174628; Tue, 19 Oct 2021 03:25:25 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 2PfhYY1788612xylJbKjMh9B; Tue, 19 Oct 2021 03:25:25 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.7744.1634639124327030826 for ; Tue, 19 Oct 2021 03:25:24 -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 EA40B11FB; Tue, 19 Oct 2021 03:25:23 -0700 (PDT) X-Received: from e120189.arm.com (unknown [10.57.73.233]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 8AA7E3F70D; Tue, 19 Oct 2021 03:25:22 -0700 (PDT) From: "PierreGondois" To: devel@edk2.groups.io, Sean Brogan , Sami Mujawar , Leif Lindholm Cc: Ard Biesheuvel Subject: [edk2-devel] [RFC PATCH edk2-platforms v1 4/5] Platform/ARM: Move FdtPlatformDxe package to ArmCommonPkg Date: Tue, 19 Oct 2021 11:25:01 +0100 Message-Id: <20211019102502.3765-5-Pierre.Gondois@arm.com> In-Reply-To: <20211019102502.3765-1-Pierre.Gondois@arm.com> References: <20211019102502.3765-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: xwLbYIFpZxZJwGyEdLjb2lwYx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1634639125; bh=SYUy2AJJrGRni4o7EiMdETfXGjnZnZvQunZJpQYbQBA=; h=Cc:Date:From:Reply-To:Subject:To; b=Q902F27FD6sL3snbyo5uxygvKR+dhAyBd9M35po9M7QcDoI7Ew0nqSAPwb4y2GtxG1q 5Urc45/fEYA/Pu2jowirAmjMFqrgTv2kKRLqWiq3ZunZVGNWxI2Cc14y6cg/pgTuxq86W n8bfnYfROM5FXLTaBGxVGe+B/jaAV3VmTYg= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1634639127537100002 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 3b7a63b6437a..9548931f6cd7 100644 --- a/Platform/ARM/JunoPkg/ArmJuno.dsc +++ b/Platform/ARM/JunoPkg/ArmJuno.dsc @@ -376,7 +376,7 @@ [Components.common] # # FDT installation # - Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf { + Platform/ARM/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 910de7c00988..992a0296650a 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 Platform/ARM/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 d2e136baec48..5092ba2e5d05 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 Platform/ARM/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..2790e9c41bd4 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 { + Platform/ARM/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 bf60fb69bb15..97984e59f950 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 Platform/ARM/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 (#82346): https://edk2.groups.io/g/devel/message/82346 Mute This Topic: https://groups.io/mt/86436503/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- From nobody Tue Apr 30 06:11:12 2024 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+82350+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+82350+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1634639127; cv=none; d=zohomail.com; s=zohoarc; b=J8SxpLDDm2qfPjiUPOdqcCyWHUuMB4dFK7svA9YLbXKiLM3mz9TFKiBDfZiF8VNYoQAVDNwBOU80Tum3bJAKpM+DtYLRvcx21WQAXiqbxeV6nZr9uppfcokLMe+AS3LMtGlAM9JpMYSM/UWOo2WOkQ6GMARxkbIrXK0qCgK2Zwg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634639127; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=y1+OlxgJVxqgywCFbaieJOU2dSAi8bYB8DuVrGUA5Uc=; b=U8j9IjWWrjmPEnk+Ka1trhlewDEnNhVg74dafZgxWEfkJqe9EIdDGTIYTOs41fnAH9T4nvUbVMKNT9ChY0khomuk0Eo1wTvgQ7z9kk0KSfkIMxT15YHz8zXkagUMQ2B2CJgRxOpvJ4eStrAr0/LhAeZETFCWy3PAqBLWnPUvPYg= 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+82350+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 1634639127523140.62538962591952; Tue, 19 Oct 2021 03:25:27 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id NQ8LYY1788612xcCIUyDwavV; Tue, 19 Oct 2021 03:25:27 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.7745.1634639126238796404 for ; Tue, 19 Oct 2021 03:25:26 -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 D2772D6E; Tue, 19 Oct 2021 03:25:25 -0700 (PDT) X-Received: from e120189.arm.com (unknown [10.57.73.233]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 4AEF33F70D; Tue, 19 Oct 2021 03:25:24 -0700 (PDT) From: "PierreGondois" To: devel@edk2.groups.io, Sean Brogan , Sami Mujawar , Leif Lindholm Cc: Ard Biesheuvel Subject: [edk2-devel] [RFC PATCH edk2-platforms v1 5/5] Platform/ARM: Resolve ArmCommonPkg library references Date: Tue, 19 Oct 2021 11:25:02 +0100 Message-Id: <20211019102502.3765-6-Pierre.Gondois@arm.com> In-Reply-To: <20211019102502.3765-1-Pierre.Gondois@arm.com> References: <20211019102502.3765-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: LhubfAoFvicSqslBMeiXEndbx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1634639127; bh=zYViw5dIGOdRtVfGNyIkM7se51C7x1Tj13ZZJrv6OKc=; h=Cc:Date:From:Reply-To:Subject:To; b=dHGwO7z/BN7rV/GompZVLu027UwHWmSMDFQhSVEQFbw8mDveVuG4P8iJHuG3bQ8nSQt RfOv4KzVaQkO/fJYKPpLY0KMdLZjs8VD07LmnNOr4fR0zerSHfkk+Sqd0bTxGaq1jnx9R f7TWe56dlv3aLOy1NonkCBtKI8xI7ZnqJCY= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1634639127828100012 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 3, this patch updates references to the libraries previously in Platform/ARM/Library. Bugzilla: 3259 (https://bugzilla.tianocore.org/show_bug.cgi?id=3D3259) 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/ArmJun= o.dsc index 9548931f6cd7..a3a7bd413249 100644 --- a/Platform/ARM/JunoPkg/ArmJuno.dsc +++ b/Platform/ARM/JunoPkg/ArmJuno.dsc @@ -378,7 +378,7 @@ [Components.common] # Platform/ARM/ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf { - BdsLib|Platform/ARM/Library/BdsLib/BdsLib.inf + BdsLib|Platform/ARM/ArmCommonPkg/Library/BdsLib/BdsLib.inf } =20 # SCMI Driver diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc b/Platform/A= RM/VExpressPkg/ArmVExpress-CTA15-A7.dsc index 2790e9c41bd4..4090c939a30e 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc +++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc @@ -283,5 +283,5 @@ [Components.common] # Platform/ARM/ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf { - BdsLib|Platform/ARM/Library/BdsLib/BdsLib.inf + BdsLib|Platform/ARM/ArmCommonPkg/Library/BdsLib/BdsLib.inf } diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VE= xpressPkg/ArmVExpress.dsc.inc index 8704f25b11ec..7ede70106d43 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc +++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc @@ -118,7 +118,7 @@ [LibraryClasses.common] =20 # RunAxf support via Dynamic Shell Command protocol # It uses the Shell libraries. - ArmShellCmdRunAxfLib|Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdR= unAxf.inf + ArmShellCmdRunAxfLib|Platform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf= /ArmShellCmdRunAxf.inf ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf --=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 (#82350): https://edk2.groups.io/g/devel/message/82350 Mute This Topic: https://groups.io/mt/86436507/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-