From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by mx.groups.io with SMTP id smtpd.web12.8258.1634642241919474014 for ; Tue, 19 Oct 2021 04:17:22 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=D6h5xMg5; spf=pass (domain: kernel.org, ip: 198.145.29.99, mailfrom: ardb@kernel.org) Received: by mail.kernel.org (Postfix) with ESMTPSA id 2143560F02 for ; Tue, 19 Oct 2021 11:17:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1634642241; bh=0PC1biyw00qr0eA5UJM6t0QtIOXXFZw4K83mWs5VbI4=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=D6h5xMg5hYVeaF6LDLWBVuu4d0XPM7Qk+IZ9MBoX/+dOaGPjU4aPXV3wRU9ue0zLk MqoY8iit+fFeBFutxbU6ZmMZ+JEZd4anuJOZdA8RRNkvJbHbuxYB/tOq/auqyO2a0Z W8ZbGE13iK915z4alru0Us14nKiqH4VwbjXhUT067W59CRR7D9dlDE3+6pJ9zYck8p rPDSDqgd8HOU1Acs08LTu4NgsLwisS45lrHI+maeu25b38P58MyBnto8QlHG/jwkvV oMTaTr5LaMHko3UgDTftUSZHRMmGRdvV184a8HnqwZgG9TI8WDVPzZEC+V+s40KzSi mS4RIvgxQiAug== Received: by mail-oi1-f177.google.com with SMTP id q129so4447896oib.0 for ; Tue, 19 Oct 2021 04:17:21 -0700 (PDT) X-Gm-Message-State: AOAM530Rl0RGAPmBpca8Mq2H/11jsS8RLEjKDdX9+gFsthPLp5O+eonu 79YsYaR9952wDHPXLbDbSzQmoXWfxNNSlSaj+yQ= X-Google-Smtp-Source: ABdhPJy/JZHtThACYfD+q9Kr8MvwGArS7d3swuMgncsuNiFR57BzDXTSrHjogU8Bp6YeD0Q9d3WVaWjf7G4r1T6s4VE= X-Received: by 2002:a05:6808:1805:: with SMTP id bh5mr3588279oib.47.1634642240288; Tue, 19 Oct 2021 04:17:20 -0700 (PDT) MIME-Version: 1.0 References: <20211019102502.3765-1-Pierre.Gondois@arm.com> In-Reply-To: <20211019102502.3765-1-Pierre.Gondois@arm.com> From: "Ard Biesheuvel" Date: Tue, 19 Oct 2021 13:17:08 +0200 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [RFC PATCH edk2-platforms v1 0/5] Remove ARM nested packages To: Pierre Cc: edk2-devel-groups-io , Sean Brogan , Sami Mujawar , Leif Lindholm , Ard Biesheuvel Content-Type: text/plain; charset="UTF-8" On Tue, 19 Oct 2021 at 12:25, wrote: > > From: Pierre Gondois > > Bugzilla: 3259 (https://bugzilla.tianocore.org/show_bug.cgi?id=3259) > > 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 > > Some remarks: > - This patch-set doesn't remove the Platform/ARM prefix. > - Building an ARM Platform after applying a subset of > the patch-set would fail. Thus, if accepted, the > patch-set should be squashed as one single patch. > > Pierre Gondois (5): > Platform/ARM: Create ArmCommonPkg > Platform/ARM: Create ArmCommonPkg.dec from ARM.dec > Platform/ARM: Move BootMonFs package to ArmCommonPkg > Platform/ARM: Move FdtPlatformDxe package to ArmCommonPkg > Platform/ARM: Resolve ArmCommonPkg library references > Thanks for this, and apologies for the radio silence after the first time you submitted this. Are there any differences between this version and the one you posted before? > Platform/ARM/ARM.dec | 22 ------------------- > .../ArmCommonPkg.dec} | 18 +++++++++++++-- > .../Drivers/BootMonFs/BootMonFs.inf | 3 +-- > .../Drivers/BootMonFs/BootMonFsApi.h | 0 > .../Drivers/BootMonFs/BootMonFsDir.c | 0 > .../Drivers/BootMonFs/BootMonFsEntryPoint.c | 0 > .../Drivers/BootMonFs/BootMonFsHw.h | 0 > .../Drivers/BootMonFs/BootMonFsImages.c | 0 > .../Drivers/BootMonFs/BootMonFsInternal.h | 0 > .../Drivers/BootMonFs/BootMonFsOpenClose.c | 0 > .../Drivers/BootMonFs/BootMonFsReadWrite.c | 0 > .../Drivers/BootMonFs/BootMonFsUnsupported.c | 0 > .../Drivers/FdtPlatformDxe/FdtPlatform.c | 0 > .../Drivers/FdtPlatformDxe/FdtPlatform.h | 0 > .../Drivers/FdtPlatformDxe/FdtPlatformDxe.inf | 3 +-- > .../Drivers/FdtPlatformDxe/FdtPlatformDxe.uni | 0 > .../Drivers/FdtPlatformDxe/README.txt | 0 > .../Drivers/FdtPlatformDxe/ShellDumpFdt.c | 0 > .../Drivers/FdtPlatformDxe/ShellSetFdt.c | 0 > .../Include/Guid/BootMonFsFileInfo.h | 0 > .../Include/Library/ArmShellCmdLib.h | 0 > .../Include/Library/BdsLib.h | 0 > .../Library/ArmShellCmdRunAxf/AArch64/Pivot.S | 0 > .../Library/ArmShellCmdRunAxf/Arm/Pivot.S | 0 > .../ArmShellCmdRunAxf/ArmShellCmdRunAxf.c | 0 > .../ArmShellCmdRunAxf/ArmShellCmdRunAxf.h | 0 > .../ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf | 2 +- > .../ArmShellCmdRunAxf/ArmShellCmdRunAxf.uni | 0 > .../ArmShellCmdRunAxf/BootMonFsLoader.c | 0 > .../ArmShellCmdRunAxf/BootMonFsLoader.h | 0 > .../Library/ArmShellCmdRunAxf/ElfLoader.c | 0 > .../Library/ArmShellCmdRunAxf/ElfLoader.h | 0 > .../Library/ArmShellCmdRunAxf/RunAxf.c | 0 > .../Library/ArmShellCmdRunAxf/elf32.h | 0 > .../Library/ArmShellCmdRunAxf/elf64.h | 0 > .../Library/ArmShellCmdRunAxf/elf_common.h | 0 > .../Library/BdsLib/BdsFilePath.c | 0 > .../Library/BdsLib/BdsHelper.c | 0 > .../Library/BdsLib/BdsInternal.h | 0 > .../Library/BdsLib/BdsLib.inf | 2 +- > Platform/ARM/Drivers/BootMonFs/BootMonFs.dec | 20 ----------------- > Platform/ARM/JunoPkg/ArmJuno.dsc | 4 ++-- > Platform/ARM/JunoPkg/ArmJuno.fdf | 4 ++-- > .../JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf | 3 +-- > Platform/ARM/Morello/MorelloPlatformFvp.fdf | 2 +- > Platform/ARM/N1Sdp/N1SdpPlatform.fdf | 2 +- > Platform/ARM/SgiPkg/SgiPlatform.fdf | 2 +- > .../ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc | 4 ++-- > .../ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf | 4 ++-- > Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 4 ++-- > .../Drivers/ArmVExpressDxe/ArmFvpDxe.inf | 2 +- > .../Drivers/ArmVExpressDxe/ArmHwDxe.inf | 2 +- > 52 files changed, 36 insertions(+), 67 deletions(-) > delete mode 100644 Platform/ARM/ARM.dec > rename Platform/ARM/{Drivers/FdtPlatformDxe/FdtPlatformDxe.dec => ArmCommonPkg/ArmCommonPkg.dec} (52%) > rename Platform/ARM/{ => ArmCommonPkg}/Drivers/BootMonFs/BootMonFs.inf (90%) > rename Platform/ARM/{ => ArmCommonPkg}/Drivers/BootMonFs/BootMonFsApi.h (100%) > rename Platform/ARM/{ => ArmCommonPkg}/Drivers/BootMonFs/BootMonFsDir.c (100%) > rename Platform/ARM/{ => ArmCommonPkg}/Drivers/BootMonFs/BootMonFsEntryPoint.c (100%) > rename Platform/ARM/{ => ArmCommonPkg}/Drivers/BootMonFs/BootMonFsHw.h (100%) > rename Platform/ARM/{ => ArmCommonPkg}/Drivers/BootMonFs/BootMonFsImages.c (100%) > rename Platform/ARM/{ => ArmCommonPkg}/Drivers/BootMonFs/BootMonFsInternal.h (100%) > rename Platform/ARM/{ => ArmCommonPkg}/Drivers/BootMonFs/BootMonFsOpenClose.c (100%) > rename Platform/ARM/{ => ArmCommonPkg}/Drivers/BootMonFs/BootMonFsReadWrite.c (100%) > rename Platform/ARM/{ => ArmCommonPkg}/Drivers/BootMonFs/BootMonFsUnsupported.c (100%) > rename Platform/ARM/{ => ArmCommonPkg}/Drivers/FdtPlatformDxe/FdtPlatform.c (100%) > rename Platform/ARM/{ => ArmCommonPkg}/Drivers/FdtPlatformDxe/FdtPlatform.h (100%) > rename Platform/ARM/{ => ArmCommonPkg}/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf (89%) > rename Platform/ARM/{ => ArmCommonPkg}/Drivers/FdtPlatformDxe/FdtPlatformDxe.uni (100%) > rename Platform/ARM/{ => ArmCommonPkg}/Drivers/FdtPlatformDxe/README.txt (100%) > rename Platform/ARM/{ => ArmCommonPkg}/Drivers/FdtPlatformDxe/ShellDumpFdt.c (100%) > rename Platform/ARM/{ => ArmCommonPkg}/Drivers/FdtPlatformDxe/ShellSetFdt.c (100%) > rename Platform/ARM/{ => ArmCommonPkg}/Include/Guid/BootMonFsFileInfo.h (100%) > rename Platform/ARM/{ => ArmCommonPkg}/Include/Library/ArmShellCmdLib.h (100%) > rename Platform/ARM/{ => ArmCommonPkg}/Include/Library/BdsLib.h (100%) > rename Platform/ARM/{ => ArmCommonPkg}/Library/ArmShellCmdRunAxf/AArch64/Pivot.S (100%) > rename Platform/ARM/{ => ArmCommonPkg}/Library/ArmShellCmdRunAxf/Arm/Pivot.S (100%) > rename Platform/ARM/{ => ArmCommonPkg}/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.c (100%) > rename Platform/ARM/{ => ArmCommonPkg}/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.h (100%) > rename Platform/ARM/{ => ArmCommonPkg}/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf (91%) > rename Platform/ARM/{ => ArmCommonPkg}/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.uni (100%) > rename Platform/ARM/{ => ArmCommonPkg}/Library/ArmShellCmdRunAxf/BootMonFsLoader.c (100%) > rename Platform/ARM/{ => ArmCommonPkg}/Library/ArmShellCmdRunAxf/BootMonFsLoader.h (100%) > rename Platform/ARM/{ => ArmCommonPkg}/Library/ArmShellCmdRunAxf/ElfLoader.c (100%) > rename Platform/ARM/{ => ArmCommonPkg}/Library/ArmShellCmdRunAxf/ElfLoader.h (100%) > rename Platform/ARM/{ => ArmCommonPkg}/Library/ArmShellCmdRunAxf/RunAxf.c (100%) > rename Platform/ARM/{ => ArmCommonPkg}/Library/ArmShellCmdRunAxf/elf32.h (100%) > rename Platform/ARM/{ => ArmCommonPkg}/Library/ArmShellCmdRunAxf/elf64.h (100%) > rename Platform/ARM/{ => ArmCommonPkg}/Library/ArmShellCmdRunAxf/elf_common.h (100%) > rename Platform/ARM/{ => ArmCommonPkg}/Library/BdsLib/BdsFilePath.c (100%) > rename Platform/ARM/{ => ArmCommonPkg}/Library/BdsLib/BdsHelper.c (100%) > rename Platform/ARM/{ => ArmCommonPkg}/Library/BdsLib/BdsInternal.h (100%) > rename Platform/ARM/{ => ArmCommonPkg}/Library/BdsLib/BdsLib.inf (92%) > delete mode 100644 Platform/ARM/Drivers/BootMonFs/BootMonFs.dec > > -- > 2.17.1 >