Hi Pierre,
This patchset is an unambiguous improvement on the current state, and
improves the state of Platform/ARM substantially.
For the series:
Acked-by: Leif Lindholm <l...@nuviainc.com>
/
Leif
On Tue, Oct 26, 2021 at 15:06:28 +0100, Pierre Gondois wrote:
> Hi Leif,
>
> This patch-set resolves:
>
> https://bugzilla.tianocore.org/show_bug.cgi?id=3259
>
> without removing the Platform/ARM prefix used in the Platform/ARM/ folder (cf
> https://bugzilla.tianocore.org/show_bug.cgi?id=3264). Does it look sensible ?
>
> Regards,
> Pierre
>
>
> On 10/19/21 12:22, PierreGondois via groups.io wrote:
> > Hi Ard,
> >
> > On 10/19/21 12:17, Ard Biesheuvel wrote:
> >> On Tue, 19 Oct 2021 at 12:25, <pierre.gond...@arm.com> wrote:
> >>> From: Pierre Gondois <pierre.gond...@arm.com>
> >>>
> >>> 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?
> > No worries, the difference is that the other patch-set was also
> > resolving this bugzilla:
> >
> > https://bugzilla.tianocore.org/show_bug.cgi?id=3264
> >
> > This path set only solves this one:
> >
> > https://bugzilla.tianocore.org/show_bug.cgi?id=3259
> >
> >>
> >>> 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
> >>>
> >
> >
> >
> >
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#82727): https://edk2.groups.io/g/devel/message/82727
Mute This Topic: https://groups.io/mt/86436502/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
