[RFC PATCH edk2-platforms v1 0/5] Remove ARM nested packages

public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed

* [RFC PATCH edk2-platforms v1 0/5] Remove ARM nested packages
@ 2021-10-19 10:24 PierreGondois
  2021-10-19 10:24 ` [RFC PATCH edk2-platforms v1 1/5] Platform/ARM: Create ArmCommonPkg PierreGondois
                   ` (5 more replies)
  0 siblings, 6 replies; 10+ messages in thread
From: PierreGondois @ 2021-10-19 10:24 UTC (permalink / raw)
  To: devel, Sean Brogan, Sami Mujawar, Leif Lindholm; +Cc: Ard Biesheuvel

From: Pierre Gondois <Pierre.Gondois@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

 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


^ permalink raw reply	[flat|nested] 10+ messages in thread

* [RFC PATCH edk2-platforms v1 1/5] Platform/ARM: Create ArmCommonPkg
  2021-10-19 10:24 [RFC PATCH edk2-platforms v1 0/5] Remove ARM nested packages PierreGondois
@ 2021-10-19 10:24 ` PierreGondois
  2021-10-19 10:24 ` [RFC PATCH edk2-platforms v1 2/5] Platform/ARM: Create ArmCommonPkg.dec from ARM.dec PierreGondois
                   ` (4 subsequent siblings)
  5 siblings, 0 replies; 10+ messages in thread
From: PierreGondois @ 2021-10-19 10:24 UTC (permalink / raw)
  To: devel, Sean Brogan, Sami Mujawar, Leif Lindholm; +Cc: Ard Biesheuvel

From: Pierre Gondois <Pierre.Gondois@arm.com>

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=3259)
Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
---
 Platform/ARM/{ => ArmCommonPkg}/Drivers/BootMonFs/BootMonFs.dec   | 0
 Platform/ARM/{ => ArmCommonPkg}/Drivers/BootMonFs/BootMonFs.inf   | 0
 Platform/ARM/{ => ArmCommonPkg}/Drivers/BootMonFs/BootMonFsApi.h  | 0
 Platform/ARM/{ => ArmCommonPkg}/Drivers/BootMonFs/BootMonFsDir.c  | 0
 .../{ => ArmCommonPkg}/Drivers/BootMonFs/BootMonFsEntryPoint.c    | 0
 Platform/ARM/{ => ArmCommonPkg}/Drivers/BootMonFs/BootMonFsHw.h   | 0
 .../ARM/{ => ArmCommonPkg}/Drivers/BootMonFs/BootMonFsImages.c    | 0
 .../ARM/{ => ArmCommonPkg}/Drivers/BootMonFs/BootMonFsInternal.h  | 0
 .../ARM/{ => ArmCommonPkg}/Drivers/BootMonFs/BootMonFsOpenClose.c | 0
 .../ARM/{ => ArmCommonPkg}/Drivers/BootMonFs/BootMonFsReadWrite.c | 0
 .../{ => ArmCommonPkg}/Drivers/BootMonFs/BootMonFsUnsupported.c   | 0
 .../ARM/{ => ArmCommonPkg}/Drivers/FdtPlatformDxe/FdtPlatform.c   | 0
 .../ARM/{ => ArmCommonPkg}/Drivers/FdtPlatformDxe/FdtPlatform.h   | 0
 .../{ => ArmCommonPkg}/Drivers/FdtPlatformDxe/FdtPlatformDxe.dec  | 0
 .../{ => ArmCommonPkg}/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf  | 0
 .../{ => ArmCommonPkg}/Drivers/FdtPlatformDxe/FdtPlatformDxe.uni  | 0
 Platform/ARM/{ => ArmCommonPkg}/Drivers/FdtPlatformDxe/README.txt | 0
 .../ARM/{ => ArmCommonPkg}/Drivers/FdtPlatformDxe/ShellDumpFdt.c  | 0
 .../ARM/{ => ArmCommonPkg}/Drivers/FdtPlatformDxe/ShellSetFdt.c   | 0
 Platform/ARM/{ => ArmCommonPkg}/Include/Guid/BootMonFsFileInfo.h  | 0
 Platform/ARM/{ => ArmCommonPkg}/Include/Library/ArmShellCmdLib.h  | 0
 Platform/ARM/{ => ArmCommonPkg}/Include/Library/BdsLib.h          | 0
 .../{ => ArmCommonPkg}/Library/ArmShellCmdRunAxf/AArch64/Pivot.S  | 0
 .../ARM/{ => 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/{ => ArmCommonPkg}/Library/ArmShellCmdRunAxf/ElfLoader.c  | 0
 .../ARM/{ => ArmCommonPkg}/Library/ArmShellCmdRunAxf/ElfLoader.h  | 0
 .../ARM/{ => ArmCommonPkg}/Library/ArmShellCmdRunAxf/RunAxf.c     | 0
 Platform/ARM/{ => ArmCommonPkg}/Library/ArmShellCmdRunAxf/elf32.h | 0
 Platform/ARM/{ => ArmCommonPkg}/Library/ArmShellCmdRunAxf/elf64.h | 0
 .../ARM/{ => ArmCommonPkg}/Library/ArmShellCmdRunAxf/elf_common.h | 0
 Platform/ARM/{ => ArmCommonPkg}/Library/BdsLib/BdsFilePath.c      | 0
 Platform/ARM/{ => ArmCommonPkg}/Library/BdsLib/BdsHelper.c        | 0
 Platform/ARM/{ => ArmCommonPkg}/Library/BdsLib/BdsInternal.h      | 0
 Platform/ARM/{ => ArmCommonPkg}/Library/BdsLib/BdsLib.inf         | 0
 40 files changed, 0 insertions(+), 0 deletions(-)
 rename Platform/ARM/{ => ArmCommonPkg}/Drivers/BootMonFs/BootMonFs.dec (100%)
 rename Platform/ARM/{ => ArmCommonPkg}/Drivers/BootMonFs/BootMonFs.inf (100%)
 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.dec (100%)
 rename Platform/ARM/{ => ArmCommonPkg}/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf (100%)
 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 (100%)
 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 (100%)

diff --git a/Platform/ARM/Drivers/BootMonFs/BootMonFs.dec b/Platform/ARM/ArmCommonPkg/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/ArmCommonPkg/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/ArmCommonPkg/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/ArmCommonPkg/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/Platform/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/ArmCommonPkg/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/ARM/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/Platform/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/ARM/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/ARM/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/Platform/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.dec
diff --git a/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf b/Platform/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.inf
diff --git a/Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.uni b/Platform/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.uni
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/ARM/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/ArmCommonPkg/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/ArmCommonPkg/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/ArmCommonPkg/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/Platform/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/Platform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.c
similarity index 100%
rename from Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.c
rename to Platform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.c
diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.h b/Platform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.h
similarity index 100%
rename from Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.h
rename to Platform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.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/ArmShellCmdRunAxf.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/ArmShellCmdRunAxf.uni
diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/BootMonFsLoader.c b/Platform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/BootMonFsLoader.c
similarity index 100%
rename from Platform/ARM/Library/ArmShellCmdRunAxf/BootMonFsLoader.c
rename to Platform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/BootMonFsLoader.c
diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/BootMonFsLoader.h b/Platform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/BootMonFsLoader.h
similarity index 100%
rename from Platform/ARM/Library/ArmShellCmdRunAxf/BootMonFsLoader.h
rename to Platform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/BootMonFsLoader.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/ArmCommonPkg/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/ArmCommonPkg/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/ArmCommonPkg/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/ArmCommonPkg/Library/BdsLib/BdsLib.inf
similarity index 100%
rename from Platform/ARM/Library/BdsLib/BdsLib.inf
rename to Platform/ARM/ArmCommonPkg/Library/BdsLib/BdsLib.inf
-- 
2.17.1


^ permalink raw reply	[flat|nested] 10+ messages in thread

* [RFC PATCH edk2-platforms v1 2/5] Platform/ARM: Create ArmCommonPkg.dec from ARM.dec
  2021-10-19 10:24 [RFC PATCH edk2-platforms v1 0/5] Remove ARM nested packages PierreGondois
  2021-10-19 10:24 ` [RFC PATCH edk2-platforms v1 1/5] Platform/ARM: Create ArmCommonPkg PierreGondois
@ 2021-10-19 10:24 ` PierreGondois
  2021-10-19 10:25 ` [RFC PATCH edk2-platforms v1 3/5] Platform/ARM: Move BootMonFs package to ArmCommonPkg PierreGondois
                   ` (3 subsequent siblings)
  5 siblings, 0 replies; 10+ messages in thread
From: PierreGondois @ 2021-10-19 10:24 UTC (permalink / raw)
  To: devel, Sean Brogan, Sami Mujawar, Leif Lindholm; +Cc: Ard Biesheuvel

From: Pierre Gondois <Pierre.Gondois@arm.com>

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=3259)
Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
---
 Platform/ARM/{ARM.dec => 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 => 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 @@
 
 [Defines]
   DEC_SPECIFICATION              = 0x0001001A
-  PACKAGE_NAME                   = ARM
+  PACKAGE_NAME                   = ArmCommonPkg
   PACKAGE_GUID                   = 2a905d2b-30c9-4408-86a2-c0b328876aee
   PACKAGE_VERSION                = 0.1
 
diff --git a/Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFs.inf b/Platform/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
 
 [LibraryClasses]
diff --git a/Platform/ARM/ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.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
 
diff --git a/Platform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf b/Platform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.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
 
 [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
 
 [LibraryClasses]
   ArmLib
diff --git a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf b/Platform/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
 
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
 
 [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
 
 [LibraryClasses]
   ArmShellCmdRunAxfLib
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [RFC PATCH edk2-platforms v1 3/5] Platform/ARM: Move BootMonFs package to ArmCommonPkg
  2021-10-19 10:24 [RFC PATCH edk2-platforms v1 0/5] Remove ARM nested packages PierreGondois
  2021-10-19 10:24 ` [RFC PATCH edk2-platforms v1 1/5] Platform/ARM: Create ArmCommonPkg PierreGondois
  2021-10-19 10:24 ` [RFC PATCH edk2-platforms v1 2/5] Platform/ARM: Create ArmCommonPkg.dec from ARM.dec PierreGondois
@ 2021-10-19 10:25 ` PierreGondois
  2021-10-19 10:25 ` [RFC PATCH edk2-platforms v1 4/5] Platform/ARM: Move FdtPlatformDxe " PierreGondois
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 10+ messages in thread
From: PierreGondois @ 2021-10-19 10:25 UTC (permalink / raw)
  To: devel, Sean Brogan, Sami Mujawar, Leif Lindholm; +Cc: Ard Biesheuvel

From: Pierre Gondois <Pierre.Gondois@arm.com>

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=3259)
Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
---
 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.dec

diff --git a/Platform/ARM/ArmCommonPkg/ArmCommonPkg.dec b/Platform/ARM/ArmCommonPkg/ArmCommonPkg.dec
index cce497c27fa5..dac54b9f9ed8 100644
--- a/Platform/ARM/ArmCommonPkg/ArmCommonPkg.dec
+++ b/Platform/ARM/ArmCommonPkg/ArmCommonPkg.dec
@@ -20,3 +20,10 @@ [LibraryClasses]
 
 [Guids]
   gArmBootMonFsFileInfoGuid   = { 0x41e26b9c, 0xada6, 0x45b3, { 0x80, 0x8e, 0x23, 0x57, 0xa3, 0x5b, 0x60, 0xd6 } }
+
+[Guids.common]
+  gArmBootMonFsTokenSpaceGuid = { 0xeb76a201, 0x69b4, 0x491f, { 0x9b, 0xde, 0xbf, 0x30, 0xbd, 0x03, 0x82, 0xb4 } }
+
+[PcdsFixedAtBuild.common]
+  # Boot Monitor FileSystem
+  gArmBootMonFsTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L""|VOID*|0x0000003A
diff --git a/Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFs.dec b/Platform/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              = 0x0001001A
-  PACKAGE_NAME                   = BootMonFs
-  PACKAGE_GUID                   = 41f14aba-452f-4204-a435-25242973c5b1
-  PACKAGE_VERSION                = 0.1
-
-[Guids.common]
-  gArmBootMonFsTokenSpaceGuid = { 0xeb76a201, 0x69b4, 0x491f, { 0x9b, 0xde, 0xbf, 0x30, 0xbd, 0x03, 0x82, 0xb4 } }
-
-[PcdsFixedAtBuild.common]
-  # Boot Monitor FileSystem
-  gArmBootMonFsTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L""|VOID*|0x0000003A
diff --git a/Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFs.inf b/Platform/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
 
 [LibraryClasses]
   BaseLib
diff --git a/Platform/ARM/JunoPkg/ArmJuno.fdf b/Platform/ARM/JunoPkg/ArmJuno.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
 
   # Versatile Express FileSystem
-  INF Platform/ARM/Drivers/BootMonFs/BootMonFs.inf
+  INF Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFs.inf
 
   #
   # FAT filesystem + GPT/MBR partitioning
diff --git a/Platform/ARM/Morello/MorelloPlatformFvp.fdf b/Platform/ARM/Morello/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
 
-  INF Platform/ARM/Drivers/BootMonFs/BootMonFs.inf
+  INF Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFs.inf
   INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
 
   # Virtio Block Device support
diff --git a/Platform/ARM/N1Sdp/N1SdpPlatform.fdf b/Platform/ARM/N1Sdp/N1SdpPlatform.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
 
-  INF Platform/ARM/Drivers/BootMonFs/BootMonFs.inf
+  INF Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFs.inf
   INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
 
   # FAT filesystem + GPT/MBR partitioning
diff --git a/Platform/ARM/SgiPkg/SgiPlatform.fdf b/Platform/ARM/SgiPkg/SgiPlatform.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
 
-  INF Platform/ARM/Drivers/BootMonFs/BootMonFs.inf
+  INF Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFs.inf
   INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
 
   #
diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf b/Platform/ARM/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.inf
 
   # Versatile Express FileSystem
-  INF Platform/ARM/Drivers/BootMonFs/BootMonFs.inf
+  INF Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFs.inf
 
   #
   # USB support
diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VExpressPkg/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]
   }
 
   # Versatile Express FileSystem
-  Platform/ARM/Drivers/BootMonFs/BootMonFs.inf
+  Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFs.inf
 
   #
   # Networking stack
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [RFC PATCH edk2-platforms v1 4/5] Platform/ARM: Move FdtPlatformDxe package to ArmCommonPkg
  2021-10-19 10:24 [RFC PATCH edk2-platforms v1 0/5] Remove ARM nested packages PierreGondois
                   ` (2 preceding siblings ...)
  2021-10-19 10:25 ` [RFC PATCH edk2-platforms v1 3/5] Platform/ARM: Move BootMonFs package to ArmCommonPkg PierreGondois
@ 2021-10-19 10:25 ` PierreGondois
  2021-10-19 10:25 ` [RFC PATCH edk2-platforms v1 5/5] Platform/ARM: Resolve ArmCommonPkg library references PierreGondois
  2021-10-19 11:17 ` [RFC PATCH edk2-platforms v1 0/5] Remove ARM nested packages Ard Biesheuvel
  5 siblings, 0 replies; 10+ messages in thread
From: PierreGondois @ 2021-10-19 10:25 UTC (permalink / raw)
  To: devel, Sean Brogan, Sami Mujawar, Leif Lindholm; +Cc: Ard Biesheuvel

From: Pierre Gondois <Pierre.Gondois@arm.com>

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=3259)
Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
---
 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/FdtPlatformDxe.dec

diff --git a/Platform/ARM/ArmCommonPkg/ArmCommonPkg.dec b/Platform/ARM/ArmCommonPkg/ArmCommonPkg.dec
index dac54b9f9ed8..12bf49d769e5 100644
--- a/Platform/ARM/ArmCommonPkg/ArmCommonPkg.dec
+++ b/Platform/ARM/ArmCommonPkg/ArmCommonPkg.dec
@@ -20,6 +20,7 @@ [LibraryClasses]
 
 [Guids]
   gArmBootMonFsFileInfoGuid   = { 0x41e26b9c, 0xada6, 0x45b3, { 0x80, 0x8e, 0x23, 0x57, 0xa3, 0x5b, 0x60, 0xd6 } }
+  gFdtPlatformDxeTokenSpaceGuid = { 0xbfcaa0af, 0xedd4, 0x4ce7, { 0xbd, 0xb3, 0x39, 0x15, 0x07, 0x28, 0x65, 0x77 } }
 
 [Guids.common]
   gArmBootMonFsTokenSpaceGuid = { 0xeb76a201, 0x69b4, 0x491f, { 0x9b, 0xde, 0xbf, 0x30, 0xbd, 0x03, 0x82, 0xb4 } }
@@ -27,3 +28,12 @@ [Guids.common]
 [PcdsFixedAtBuild.common]
   # Boot Monitor FileSystem
   gArmBootMonFsTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L""|VOID*|0x0000003A
+
+[PcdsFeatureFlag.common]
+  # Enable the development specific features
+  gFdtPlatformDxeTokenSpaceGuid.PcdOverridePlatformFdt|TRUE|BOOLEAN|0x00000001
+  # Add 'dumpfdt' EFI Shell command
+  gFdtPlatformDxeTokenSpaceGuid.PcdDumpFdtShellCommand|TRUE|BOOLEAN|0x00000002
+
+[PcdsFixedAtBuild.common, PcdsDynamic.common]
+  gFdtPlatformDxeTokenSpaceGuid.PcdFdtDevicePaths|L""|VOID*|0x00000055
diff --git a/Platform/ARM/ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.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              = 0x0001001A
-  PACKAGE_NAME                   = FdtPlatformDxe
-  PACKAGE_GUID                   = ed22c1e5-71cb-48d6-a9d8-c20f8d6b909f
-  PACKAGE_VERSION                = 0.1
-
-[Guids]
-  gFdtPlatformDxeTokenSpaceGuid = { 0xbfcaa0af, 0xedd4, 0x4ce7, { 0xbd, 0xb3, 0x39, 0x15, 0x07, 0x28, 0x65, 0x77 } }
-
-[PcdsFeatureFlag.common]
-  # Enable the development specific features
-  gFdtPlatformDxeTokenSpaceGuid.PcdOverridePlatformFdt|TRUE|BOOLEAN|0x00000001
-  # Add 'dumpfdt' EFI Shell command
-  gFdtPlatformDxeTokenSpaceGuid.PcdDumpFdtShellCommand|TRUE|BOOLEAN|0x00000002
-
-[PcdsFixedAtBuild.common, PcdsDynamic.common]
-  gFdtPlatformDxeTokenSpaceGuid.PcdFdtDevicePaths|L""|VOID*|0x00000055
diff --git a/Platform/ARM/ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.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
 
 [LibraryClasses]
diff --git a/Platform/ARM/JunoPkg/ArmJuno.dsc b/Platform/ARM/JunoPkg/ArmJuno.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 {
     <LibraryClasses>
       BdsLib|Platform/ARM/Library/BdsLib/BdsLib.inf
   }
diff --git a/Platform/ARM/JunoPkg/ArmJuno.fdf b/Platform/ARM/JunoPkg/ArmJuno.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 dispatched
   # 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
 
   # SCMI Driver
   INF ArmPkg/Drivers/ArmScmiDxe/ArmScmiDxe.inf
diff --git a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf b/Platform/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
 
 [LibraryClasses]
diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc b/Platform/ARM/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 {
     <LibraryClasses>
       BdsLib|Platform/ARM/Library/BdsLib/BdsLib.inf
   }
diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf b/Platform/ARM/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 dispatched
   # 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
 
   # Example to add a Device Tree to the Firmware Volume
   #FILE FREEFORM = PCD(gArmVExpressTokenSpaceGuid.PcdFdtVExpressHwA15x2A7x3) {
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [RFC PATCH edk2-platforms v1 5/5] Platform/ARM: Resolve ArmCommonPkg library references
  2021-10-19 10:24 [RFC PATCH edk2-platforms v1 0/5] Remove ARM nested packages PierreGondois
                   ` (3 preceding siblings ...)
  2021-10-19 10:25 ` [RFC PATCH edk2-platforms v1 4/5] Platform/ARM: Move FdtPlatformDxe " PierreGondois
@ 2021-10-19 10:25 ` PierreGondois
  2021-10-19 11:17 ` [RFC PATCH edk2-platforms v1 0/5] Remove ARM nested packages Ard Biesheuvel
  5 siblings, 0 replies; 10+ messages in thread
From: PierreGondois @ 2021-10-19 10:25 UTC (permalink / raw)
  To: devel, Sean Brogan, Sami Mujawar, Leif Lindholm; +Cc: Ard Biesheuvel

From: Pierre Gondois <Pierre.Gondois@arm.com>

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=3259)
Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
---
 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/ArmJuno.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 {
     <LibraryClasses>
-      BdsLib|Platform/ARM/Library/BdsLib/BdsLib.inf
+      BdsLib|Platform/ARM/ArmCommonPkg/Library/BdsLib/BdsLib.inf
   }
 
   # SCMI Driver
diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc b/Platform/ARM/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 {
     <LibraryClasses>
-      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/VExpressPkg/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]
 
   # RunAxf support via Dynamic Shell Command protocol
   # It uses the Shell libraries.
-  ArmShellCmdRunAxfLib|Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.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
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* Re: [RFC PATCH edk2-platforms v1 0/5] Remove ARM nested packages
  2021-10-19 10:24 [RFC PATCH edk2-platforms v1 0/5] Remove ARM nested packages PierreGondois
                   ` (4 preceding siblings ...)
  2021-10-19 10:25 ` [RFC PATCH edk2-platforms v1 5/5] Platform/ARM: Resolve ArmCommonPkg library references PierreGondois
@ 2021-10-19 11:17 ` Ard Biesheuvel
  2021-10-19 11:22   ` PierreGondois
       [not found]   ` <16AF6AC06BB23F23.2978@groups.io>
  5 siblings, 2 replies; 10+ messages in thread
From: Ard Biesheuvel @ 2021-10-19 11:17 UTC (permalink / raw)
  To: Pierre
  Cc: edk2-devel-groups-io, Sean Brogan, Sami Mujawar, Leif Lindholm,
	Ard Biesheuvel

On Tue, 19 Oct 2021 at 12:25, <Pierre.Gondois@arm.com> wrote:
>
> From: Pierre Gondois <Pierre.Gondois@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?


>  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
>

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [RFC PATCH edk2-platforms v1 0/5] Remove ARM nested packages
  2021-10-19 11:17 ` [RFC PATCH edk2-platforms v1 0/5] Remove ARM nested packages Ard Biesheuvel
@ 2021-10-19 11:22   ` PierreGondois
       [not found]   ` <16AF6AC06BB23F23.2978@groups.io>
  1 sibling, 0 replies; 10+ messages in thread
From: PierreGondois @ 2021-10-19 11:22 UTC (permalink / raw)
  To: Ard Biesheuvel
  Cc: edk2-devel-groups-io, Sean Brogan, Sami Mujawar, Leif Lindholm,
	Ard Biesheuvel

Hi Ard,

On 10/19/21 12:17, Ard Biesheuvel wrote:
> On Tue, 19 Oct 2021 at 12:25, <Pierre.Gondois@arm.com> wrote:
>> From: Pierre Gondois <Pierre.Gondois@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
>>

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [edk2-devel] [RFC PATCH edk2-platforms v1 0/5] Remove ARM nested packages
       [not found]   ` <16AF6AC06BB23F23.2978@groups.io>
@ 2021-10-26 14:06     ` PierreGondois
  2021-10-26 21:37       ` Leif Lindholm
  0 siblings, 1 reply; 10+ messages in thread
From: PierreGondois @ 2021-10-26 14:06 UTC (permalink / raw)
  To: devel, Ard Biesheuvel
  Cc: Sean Brogan, Sami Mujawar, Leif Lindholm, Ard Biesheuvel

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.Gondois@arm.com> wrote:
>>> From: Pierre Gondois <Pierre.Gondois@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
>>>
>
> 
>
>

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [edk2-devel] [RFC PATCH edk2-platforms v1 0/5] Remove ARM nested packages
  2021-10-26 14:06     ` [edk2-devel] " PierreGondois
@ 2021-10-26 21:37       ` Leif Lindholm
  0 siblings, 0 replies; 10+ messages in thread
From: Leif Lindholm @ 2021-10-26 21:37 UTC (permalink / raw)
  To: Pierre Gondois
  Cc: devel, Ard Biesheuvel, Sean Brogan, Sami Mujawar, Ard Biesheuvel

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 <leif@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.Gondois@arm.com> wrote:
> >>> From: Pierre Gondois <Pierre.Gondois@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
> >>>
> >
> > 
> >
> >

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2021-10-26 21:37 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-19 10:24 [RFC PATCH edk2-platforms v1 0/5] Remove ARM nested packages PierreGondois
2021-10-19 10:24 ` [RFC PATCH edk2-platforms v1 1/5] Platform/ARM: Create ArmCommonPkg PierreGondois
2021-10-19 10:24 ` [RFC PATCH edk2-platforms v1 2/5] Platform/ARM: Create ArmCommonPkg.dec from ARM.dec PierreGondois
2021-10-19 10:25 ` [RFC PATCH edk2-platforms v1 3/5] Platform/ARM: Move BootMonFs package to ArmCommonPkg PierreGondois
2021-10-19 10:25 ` [RFC PATCH edk2-platforms v1 4/5] Platform/ARM: Move FdtPlatformDxe " PierreGondois
2021-10-19 10:25 ` [RFC PATCH edk2-platforms v1 5/5] Platform/ARM: Resolve ArmCommonPkg library references PierreGondois
2021-10-19 11:17 ` [RFC PATCH edk2-platforms v1 0/5] Remove ARM nested packages Ard Biesheuvel
2021-10-19 11:22   ` PierreGondois
     [not found]   ` <16AF6AC06BB23F23.2978@groups.io>
2021-10-26 14:06     ` [edk2-devel] " PierreGondois
2021-10-26 21:37       ` Leif Lindholm

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox