[RFC PATCH edk2-platforms v1 0/7] Modify Platform/ARM file structure

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

* [RFC PATCH edk2-platforms v1 0/7] Modify Platform/ARM file structure
@ 2021-09-20 14:04 PierreGondois
  2021-09-20 14:04 ` [RFC PATCH edk2-platforms v1 1/7] Platform/ARM: Create ArmCommonPkg PierreGondois
                   ` (6 more replies)
  0 siblings, 7 replies; 8+ messages in thread
From: PierreGondois @ 2021-09-20 14:04 UTC (permalink / raw)
  To: devel, Sean Brogan, Ard Biesheuvel, Leif Lindholm, Sami Mujawar
  Cc: Liming Gao, Thomas Abraham

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

This patchset is a code suggestion to resolve bugzillas [1] and [2],
based from the discussions available in the same threads.

Bugzilla [1]:
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

Bugzilla [2]:
Some modules/configuration files are referenced from the edk2-repository/ folder, e.g. Platform/ARM/.../module.inf.
Reasons to remove the Platform/ARM prefix are:
- The prefix implies conserving the folder structure when building Arm platforms and makes modules/packages exportation difficult. E.g., the JunoPkg must be in a Platform/ARM/ folder.
- Removing the Platform/ARM prefix would allow to make Modules/Packages self-contained entities. If there is a module/package dependency, the build system should be able to resolve it without having a file path out of the module/package.

This has been tested by building all the platforms in Platform/ARM/. Other platforms should not be impacted, but I can fix them in such case.
The modification done to Platform/Comcast/RDKQemu/RDKQemu.fdf has no consequence, but the platform seems to be broken beforehand.

The modifications can be seen at [3].

Please let me know if the solution fits,
Pierre

[1] https://bugzilla.tianocore.org/show_bug.cgi?id=3259
[2] https://bugzilla.tianocore.org/show_bug.cgi?id=3264
[3] https://github.com/PierreARM/edk2-platforms/commits/1876_Modify_Platform_ARM_file_structure_v1

Pierre Gondois (7):
  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: Remove Platform/ARM prefix
  Platform/ARM: Alphabetically order sections in inf files

 Platform/ARM/ARM.dec                          | 22 ------------
 .../ArmCommonPkg.dec}                         | 18 ++++++++--
 .../Drivers/BootMonFs/BootMonFs.inf           |  9 +++--
 .../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   | 10 +++---
 .../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                 |  4 +--
 Platform/ARM/Drivers/BootMonFs/BootMonFs.dec  | 20 -----------
 .../ARM/JunoPkg/AcpiTables/AcpiTables.inf     | 10 +++---
 Platform/ARM/JunoPkg/ArmJuno.dsc              | 30 ++++++++--------
 Platform/ARM/JunoPkg/ArmJuno.fdf              | 18 +++++-----
 .../ConfigurationManager.dsc.inc              |  2 +-
 .../ConfigurationManagerDxe.inf               |  4 +--
 .../JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf | 11 +++---
 .../Drivers/SataSiI3132Dxe/SataSiI3132Dxe.inf |  2 +-
 .../JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf | 10 +++---
 .../Library/ArmJunoMtlLib/ArmJunoMtlLib.inf   |  2 +-
 .../HdLcdArmJunoLib/HdLcdArmJunoLib.inf       |  2 +-
 .../JunoPciHostBridgeLib.inf                  |  2 +-
 .../NorFlashJunoLib/NorFlashJunoLib.inf       |  2 +-
 .../SmbiosPlatformDxe/SmbiosPlatformDxe.inf   |  4 +--
 .../ConfigurationManagerDxeFvp.inf            |  2 +-
 .../ConfigurationManagerFvp.dsc.inc           |  2 +-
 .../Drivers/PlatformDxe/PlatformDxeFvp.inf    |  2 +-
 .../PciHostBridgeLib/PciHostBridgeLibFvp.inf  |  2 +-
 .../Library/PlatformLib/PlatformLib.inf       |  2 +-
 Platform/ARM/Morello/MorelloPlatform.dsc.inc  |  2 +-
 Platform/ARM/Morello/MorelloPlatformFvp.dsc   | 12 +++----
 Platform/ARM/Morello/MorelloPlatformFvp.fdf   |  6 ++--
 Platform/ARM/Morello/Readme.md                |  2 +-
 Platform/ARM/N1Sdp/N1SdpPlatform.dsc          |  4 +--
 Platform/ARM/N1Sdp/N1SdpPlatform.fdf          |  2 +-
 Platform/ARM/Readme.md                        |  2 +-
 .../SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf  |  4 +--
 .../SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf  |  4 +--
 .../AcpiTables/RdN1EdgeX2AcpiTables.inf       |  4 +--
 .../ARM/SgiPkg/AcpiTables/RdN2AcpiTables.inf  |  4 +--
 .../SgiPkg/AcpiTables/RdN2Cfg1AcpiTables.inf  |  4 +--
 .../ARM/SgiPkg/AcpiTables/RdV1AcpiTables.inf  |  4 +--
 .../SgiPkg/AcpiTables/RdV1McAcpiTables.inf    |  4 +--
 .../SgiPkg/AcpiTables/Sgi575AcpiTables.inf    |  4 +--
 .../Drivers/PlatformDxe/PlatformDxe.inf       |  2 +-
 .../SmbiosPlatformDxe/SmbiosPlatformDxe.inf   | 10 +++---
 .../Library/HdLcdArmSgiLib/HdLcdArmSgiLib.inf |  2 +-
 .../Library/NorFlashLib/NorFlashLib.inf       |  2 +-
 .../NorFlashLib/StandaloneMmNorFlashLib.inf   |  2 +-
 .../PciHostBridgeLib/PciHostBridgeLib.inf     |  4 +--
 .../Library/PlatformLib/PlatformLib.inf       |  4 +--
 .../Library/SgiPlatformPei/SgiPlatformPei.inf |  2 +-
 Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc  |  4 +--
 Platform/ARM/SgiPkg/PlatformStandaloneMm2.dsc |  4 +--
 Platform/ARM/SgiPkg/RdE1Edge/RdE1Edge.dsc     | 10 +++---
 Platform/ARM/SgiPkg/RdE1Edge/RdE1Edge.fdf.inc |  2 +-
 Platform/ARM/SgiPkg/RdN1Edge/RdN1Edge.dsc     | 10 +++---
 Platform/ARM/SgiPkg/RdN1Edge/RdN1Edge.fdf.inc |  2 +-
 Platform/ARM/SgiPkg/RdN1EdgeX2/RdN1EdgeX2.dsc | 10 +++---
 .../ARM/SgiPkg/RdN1EdgeX2/RdN1EdgeX2.fdf.inc  |  2 +-
 Platform/ARM/SgiPkg/RdN2/RdN2.dsc             | 10 +++---
 Platform/ARM/SgiPkg/RdN2/RdN2.fdf.inc         |  2 +-
 Platform/ARM/SgiPkg/RdN2Cfg1/RdN2Cfg1.dsc     | 10 +++---
 Platform/ARM/SgiPkg/RdN2Cfg1/RdN2Cfg1.fdf.inc |  2 +-
 Platform/ARM/SgiPkg/RdV1/RdV1.dsc             | 10 +++---
 Platform/ARM/SgiPkg/RdV1/RdV1.fdf.inc         |  2 +-
 Platform/ARM/SgiPkg/RdV1Mc/RdV1Mc.dsc         | 10 +++---
 Platform/ARM/SgiPkg/RdV1Mc/RdV1Mc.fdf.inc     |  2 +-
 Platform/ARM/SgiPkg/Sgi575/Sgi575.dsc         | 10 +++---
 Platform/ARM/SgiPkg/Sgi575/Sgi575.fdf.inc     |  2 +-
 Platform/ARM/SgiPkg/SgiPlatform.dsc.inc       | 18 +++++-----
 Platform/ARM/SgiPkg/SgiPlatform.fdf           |  8 ++---
 Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc     |  2 +-
 .../ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc  | 34 +++++++++----------
 .../ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf  | 18 +++++-----
 .../VExpressPkg/ArmVExpress-FVP-AArch64.dsc   | 28 +++++++--------
 .../VExpressPkg/ArmVExpress-FVP-AArch64.fdf   | 22 ++++++------
 Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc  | 14 ++++----
 .../ConfigurationManagerDxe.inf               |  4 +--
 .../Drivers/ArmVExpressDxe/ArmFvpDxe.inf      |  8 ++---
 .../Drivers/ArmVExpressDxe/ArmHwDxe.inf       |  2 +-
 .../ArmVExpressFastBootDxe.inf                |  8 ++---
 .../Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf   |  4 +--
 .../Drivers/Lan9118Dxe/Lan9118Dxe.inf         | 12 +++----
 .../Drivers/Lan91xDxe/Lan91xDxe.inf           |  2 +-
 .../Drivers/PL180MciDxe/PL180MciDxe.inf       |  8 ++---
 .../Library/ArmMaliDpLib/ArmMaliDpLib.inf     |  2 +-
 .../ArmVExpressDtPlatformDtbLoaderLib.inf     |  4 +--
 .../ArmVExpressLibCTA15-A7/ArmVExpressLib.inf |  6 ++--
 .../ArmVExpressLibRTSM/ArmVExpressLib.inf     | 12 +++----
 .../ArmVExpressLibRTSM/ArmVExpressLibSec.inf  | 10 +++---
 .../ArmVExpressPciHostBridgeLib.inf           |  2 +-
 .../ArmVExpressSysConfigLib.inf               |  2 +-
 .../ArmVExpressSysConfigRuntimeLib.inf        |  2 +-
 .../HdLcdArmVExpressLib.inf                   |  2 +-
 .../NorFlashArmVExpressLib.inf                |  4 +--
 .../PL111LcdArmVExpressLib.inf                |  2 +-
 .../Library/ResetSystemLib/ResetSystemLib.inf |  4 +--
 Platform/Comcast/RDKQemu/RDKQemu.fdf          |  2 +-
 Readme.md                                     |  2 +-
 130 files changed, 303 insertions(+), 334 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 (92%)
 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 (93%)
 delete mode 100644 Platform/ARM/Drivers/BootMonFs/BootMonFs.dec

-- 
2.17.1


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

* [RFC PATCH edk2-platforms v1 1/7] Platform/ARM: Create ArmCommonPkg
  2021-09-20 14:04 [RFC PATCH edk2-platforms v1 0/7] Modify Platform/ARM file structure PierreGondois
@ 2021-09-20 14:04 ` PierreGondois
  2021-09-20 14:04 ` [RFC PATCH edk2-platforms v1 2/7] Platform/ARM: Create ArmCommonPkg.dec from ARM.dec PierreGondois
                   ` (5 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: PierreGondois @ 2021-09-20 14:04 UTC (permalink / raw)
  To: devel, Sean Brogan, Ard Biesheuvel, Leif Lindholm, Sami Mujawar
  Cc: Liming Gao, Thomas Abraham

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] 8+ messages in thread

* [RFC PATCH edk2-platforms v1 2/7] Platform/ARM: Create ArmCommonPkg.dec from ARM.dec
  2021-09-20 14:04 [RFC PATCH edk2-platforms v1 0/7] Modify Platform/ARM file structure PierreGondois
  2021-09-20 14:04 ` [RFC PATCH edk2-platforms v1 1/7] Platform/ARM: Create ArmCommonPkg PierreGondois
@ 2021-09-20 14:04 ` PierreGondois
  2021-09-20 14:04 ` [RFC PATCH edk2-platforms v1 3/7] Platform/ARM: Move BootMonFs package to ArmCommonPkg PierreGondois
                   ` (4 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: PierreGondois @ 2021-09-20 14:04 UTC (permalink / raw)
  To: devel, Sean Brogan, Ard Biesheuvel, Leif Lindholm, Sami Mujawar
  Cc: Liming Gao, Thomas Abraham

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..8b3a159ebe20 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
+  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..14e02ad51d90 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
+  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..93a51de12368 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
+  ArmCommonPkg/ArmCommonPkg.dec
 
 [LibraryClasses]
   ArmShellCmdRunAxfLib
-- 
2.17.1


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

* [RFC PATCH edk2-platforms v1 3/7] Platform/ARM: Move BootMonFs package to ArmCommonPkg
  2021-09-20 14:04 [RFC PATCH edk2-platforms v1 0/7] Modify Platform/ARM file structure PierreGondois
  2021-09-20 14:04 ` [RFC PATCH edk2-platforms v1 1/7] Platform/ARM: Create ArmCommonPkg PierreGondois
  2021-09-20 14:04 ` [RFC PATCH edk2-platforms v1 2/7] Platform/ARM: Create ArmCommonPkg.dec from ARM.dec PierreGondois
@ 2021-09-20 14:04 ` PierreGondois
  2021-09-20 14:04 ` [RFC PATCH edk2-platforms v1 4/7] Platform/ARM: Move FdtPlatformDxe " PierreGondois
                   ` (3 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: PierreGondois @ 2021-09-20 14:04 UTC (permalink / raw)
  To: devel, Sean Brogan, Ard Biesheuvel, Leif Lindholm, Sami Mujawar
  Cc: Liming Gao, Thomas Abraham

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..4e9cbee52932 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 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..8bdb7f0d0f5f 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 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..af6a76470c71 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 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..1e72c1d0544c 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 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..4dd01308554c 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 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..e45e5a610f4c 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
+  ArmCommonPkg/Drivers/BootMonFs/BootMonFs.inf
 
   #
   # Networking stack
-- 
2.17.1


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

* [RFC PATCH edk2-platforms v1 4/7] Platform/ARM: Move FdtPlatformDxe package to ArmCommonPkg
  2021-09-20 14:04 [RFC PATCH edk2-platforms v1 0/7] Modify Platform/ARM file structure PierreGondois
                   ` (2 preceding siblings ...)
  2021-09-20 14:04 ` [RFC PATCH edk2-platforms v1 3/7] Platform/ARM: Move BootMonFs package to ArmCommonPkg PierreGondois
@ 2021-09-20 14:04 ` PierreGondois
  2021-09-20 14:04 ` [RFC PATCH edk2-platforms v1 5/7] Platform/ARM: Resolve ArmCommonPkg library references PierreGondois
                   ` (2 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: PierreGondois @ 2021-09-20 14:04 UTC (permalink / raw)
  To: devel, Sean Brogan, Ard Biesheuvel, Leif Lindholm, Sami Mujawar
  Cc: Liming Gao, Thomas Abraham

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 fdfc8cd9e20f..93d78597930d 100644
--- a/Platform/ARM/JunoPkg/ArmJuno.dsc
+++ b/Platform/ARM/JunoPkg/ArmJuno.dsc
@@ -375,7 +375,7 @@ [Components.common]
   #
   # FDT installation
   #
-  Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf {
+  ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf {
     <LibraryClasses>
       BdsLib|Platform/ARM/Library/BdsLib/BdsLib.inf
   }
diff --git a/Platform/ARM/JunoPkg/ArmJuno.fdf b/Platform/ARM/JunoPkg/ArmJuno.fdf
index 4e9cbee52932..01c7edb08661 100644
--- a/Platform/ARM/JunoPkg/ArmJuno.fdf
+++ b/Platform/ARM/JunoPkg/ArmJuno.fdf
@@ -232,7 +232,7 @@ [FV.FvMain]
   #
   # The UEFI driver is at the end of the list of the driver to be dispatched
   # after the device drivers (eg: Ethernet) to ensure we have support for them.
-  INF Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf
+  INF ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf
 
   # 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 8b3a159ebe20..5dcd67af47aa 100644
--- a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf
+++ b/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf
@@ -23,7 +23,6 @@ [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   ArmCommonPkg/ArmCommonPkg.dec
-  Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.dec
   Platform/ARM/JunoPkg/ArmJuno.dec
 
 [LibraryClasses]
diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc
index e06a2a47f091..ee75fc472ec6 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc
+++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc
@@ -281,7 +281,7 @@ [Components.common]
   #
   # FDT installation
   #
-  Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf {
+  ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf {
     <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 4dd01308554c..6bb1d540fe35 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf
+++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf
@@ -167,7 +167,7 @@ [FV.FvMain]
   #
   # The UEFI driver is at the end of the list of the driver to be dispatched
   # after the device drivers (eg: Ethernet) to ensure we have support for them.
-  INF Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf
+  INF ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf
 
   # Example to add a Device Tree to the Firmware Volume
   #FILE FREEFORM = PCD(gArmVExpressTokenSpaceGuid.PcdFdtVExpressHwA15x2A7x3) {
-- 
2.17.1


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

* [RFC PATCH edk2-platforms v1 5/7] Platform/ARM: Resolve ArmCommonPkg library references
  2021-09-20 14:04 [RFC PATCH edk2-platforms v1 0/7] Modify Platform/ARM file structure PierreGondois
                   ` (3 preceding siblings ...)
  2021-09-20 14:04 ` [RFC PATCH edk2-platforms v1 4/7] Platform/ARM: Move FdtPlatformDxe " PierreGondois
@ 2021-09-20 14:04 ` PierreGondois
  2021-09-20 14:04 ` [RFC PATCH edk2-platforms v1 6/7] Platform/ARM: Remove Platform/ARM prefix PierreGondois
  2021-09-20 14:04 ` [RFC PATCH edk2-platforms v1 7/7] Platform/ARM: Alphabetically order sections in inf files PierreGondois
  6 siblings, 0 replies; 8+ messages in thread
From: PierreGondois @ 2021-09-20 14:04 UTC (permalink / raw)
  To: devel, Sean Brogan, Ard Biesheuvel, Leif Lindholm, Sami Mujawar
  Cc: Liming Gao, Thomas Abraham

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 93d78597930d..c208415f3602 100644
--- a/Platform/ARM/JunoPkg/ArmJuno.dsc
+++ b/Platform/ARM/JunoPkg/ArmJuno.dsc
@@ -377,7 +377,7 @@ [Components.common]
   #
   ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf {
     <LibraryClasses>
-      BdsLib|Platform/ARM/Library/BdsLib/BdsLib.inf
+      BdsLib|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 ee75fc472ec6..79ce9658fefa 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc
+++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc
@@ -283,5 +283,5 @@ [Components.common]
   #
   ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf {
     <LibraryClasses>
-      BdsLib|Platform/ARM/Library/BdsLib/BdsLib.inf
+      BdsLib|ArmCommonPkg/Library/BdsLib/BdsLib.inf
   }
diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
index e45e5a610f4c..1381867ac055 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|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] 8+ messages in thread

* [RFC PATCH edk2-platforms v1 6/7] Platform/ARM: Remove Platform/ARM prefix
  2021-09-20 14:04 [RFC PATCH edk2-platforms v1 0/7] Modify Platform/ARM file structure PierreGondois
                   ` (4 preceding siblings ...)
  2021-09-20 14:04 ` [RFC PATCH edk2-platforms v1 5/7] Platform/ARM: Resolve ArmCommonPkg library references PierreGondois
@ 2021-09-20 14:04 ` PierreGondois
  2021-09-20 14:04 ` [RFC PATCH edk2-platforms v1 7/7] Platform/ARM: Alphabetically order sections in inf files PierreGondois
  6 siblings, 0 replies; 8+ messages in thread
From: PierreGondois @ 2021-09-20 14:04 UTC (permalink / raw)
  To: devel, Sean Brogan, Ard Biesheuvel, Leif Lindholm, Sami Mujawar
  Cc: Liming Gao, Thomas Abraham

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

Some modules/configuration files are referenced from the
edk2-repository/ folder, e.g. Platform/ARM/.../module.inf.

Reasons to remove the Platform/ARM prefix are:
- The prefix implies conserving the folder structure when building Arm
  platforms and makes modules/packages exportation difficult.
  E.g., the JunoPkg must be in a Platform/ARM/ folder.
- Removing the Platform/ARM prefix would allow to make Modules/Packages
  self-contained entities. If there is a module/package dependency,
  the build system should be able to resolve it without having a file
  path out of the module/package.

This patch removes this Platform/ARM prefix. This implies that
edk2-platforms/Platform/ARM must be added to the PACKAGES_PATH
environment variable.

Bugzilla: 3264 (https://bugzilla.tianocore.org/show_bug.cgi?id=3264)
Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
---
 .../Drivers/BootMonFs/BootMonFs.inf           |  2 +-
 .../Drivers/FdtPlatformDxe/FdtPlatformDxe.inf |  2 +-
 .../ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf   |  2 +-
 .../ArmCommonPkg/Library/BdsLib/BdsLib.inf    |  2 +-
 .../ARM/JunoPkg/AcpiTables/AcpiTables.inf     |  2 +-
 Platform/ARM/JunoPkg/ArmJuno.dsc              | 26 ++++++++--------
 Platform/ARM/JunoPkg/ArmJuno.fdf              | 14 ++++-----
 .../ConfigurationManager.dsc.inc              |  2 +-
 .../ConfigurationManagerDxe.inf               |  2 +-
 .../JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf |  2 +-
 .../Drivers/SataSiI3132Dxe/SataSiI3132Dxe.inf |  2 +-
 .../JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf |  2 +-
 .../Library/ArmJunoMtlLib/ArmJunoMtlLib.inf   |  2 +-
 .../HdLcdArmJunoLib/HdLcdArmJunoLib.inf       |  2 +-
 .../JunoPciHostBridgeLib.inf                  |  2 +-
 .../NorFlashJunoLib/NorFlashJunoLib.inf       |  2 +-
 .../SmbiosPlatformDxe/SmbiosPlatformDxe.inf   |  2 +-
 .../ConfigurationManagerDxeFvp.inf            |  2 +-
 .../ConfigurationManagerFvp.dsc.inc           |  2 +-
 .../Drivers/PlatformDxe/PlatformDxeFvp.inf    |  2 +-
 .../PciHostBridgeLib/PciHostBridgeLibFvp.inf  |  2 +-
 .../Library/PlatformLib/PlatformLib.inf       |  2 +-
 Platform/ARM/Morello/MorelloPlatform.dsc.inc  |  2 +-
 Platform/ARM/Morello/MorelloPlatformFvp.dsc   | 12 ++++----
 Platform/ARM/Morello/MorelloPlatformFvp.fdf   |  4 +--
 Platform/ARM/Morello/Readme.md                |  2 +-
 Platform/ARM/N1Sdp/N1SdpPlatform.dsc          |  4 +--
 Platform/ARM/Readme.md                        |  2 +-
 .../SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf  |  2 +-
 .../SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf  |  2 +-
 .../AcpiTables/RdN1EdgeX2AcpiTables.inf       |  2 +-
 .../ARM/SgiPkg/AcpiTables/RdN2AcpiTables.inf  |  2 +-
 .../SgiPkg/AcpiTables/RdN2Cfg1AcpiTables.inf  |  2 +-
 .../ARM/SgiPkg/AcpiTables/RdV1AcpiTables.inf  |  2 +-
 .../SgiPkg/AcpiTables/RdV1McAcpiTables.inf    |  2 +-
 .../SgiPkg/AcpiTables/Sgi575AcpiTables.inf    |  2 +-
 .../Drivers/PlatformDxe/PlatformDxe.inf       |  2 +-
 .../SmbiosPlatformDxe/SmbiosPlatformDxe.inf   |  2 +-
 .../Library/HdLcdArmSgiLib/HdLcdArmSgiLib.inf |  2 +-
 .../Library/NorFlashLib/NorFlashLib.inf       |  2 +-
 .../NorFlashLib/StandaloneMmNorFlashLib.inf   |  2 +-
 .../Library/PlatformLib/PlatformLib.inf       |  2 +-
 .../Library/SgiPlatformPei/SgiPlatformPei.inf |  2 +-
 Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc  |  4 +--
 Platform/ARM/SgiPkg/PlatformStandaloneMm2.dsc |  4 +--
 Platform/ARM/SgiPkg/RdE1Edge/RdE1Edge.dsc     | 10 +++----
 Platform/ARM/SgiPkg/RdE1Edge/RdE1Edge.fdf.inc |  2 +-
 Platform/ARM/SgiPkg/RdN1Edge/RdN1Edge.dsc     | 10 +++----
 Platform/ARM/SgiPkg/RdN1Edge/RdN1Edge.fdf.inc |  2 +-
 Platform/ARM/SgiPkg/RdN1EdgeX2/RdN1EdgeX2.dsc | 10 +++----
 .../ARM/SgiPkg/RdN1EdgeX2/RdN1EdgeX2.fdf.inc  |  2 +-
 Platform/ARM/SgiPkg/RdN2/RdN2.dsc             | 10 +++----
 Platform/ARM/SgiPkg/RdN2/RdN2.fdf.inc         |  2 +-
 Platform/ARM/SgiPkg/RdN2Cfg1/RdN2Cfg1.dsc     | 10 +++----
 Platform/ARM/SgiPkg/RdN2Cfg1/RdN2Cfg1.fdf.inc |  2 +-
 Platform/ARM/SgiPkg/RdV1/RdV1.dsc             | 10 +++----
 Platform/ARM/SgiPkg/RdV1/RdV1.fdf.inc         |  2 +-
 Platform/ARM/SgiPkg/RdV1Mc/RdV1Mc.dsc         | 10 +++----
 Platform/ARM/SgiPkg/RdV1Mc/RdV1Mc.fdf.inc     |  2 +-
 Platform/ARM/SgiPkg/Sgi575/Sgi575.dsc         | 10 +++----
 Platform/ARM/SgiPkg/Sgi575/Sgi575.fdf.inc     |  2 +-
 Platform/ARM/SgiPkg/SgiPlatform.dsc.inc       | 18 +++++------
 Platform/ARM/SgiPkg/SgiPlatform.fdf           |  6 ++--
 Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc     |  2 +-
 .../ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc  | 30 +++++++++----------
 .../ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf  | 14 ++++-----
 .../VExpressPkg/ArmVExpress-FVP-AArch64.dsc   | 28 ++++++++---------
 .../VExpressPkg/ArmVExpress-FVP-AArch64.fdf   | 22 +++++++-------
 Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc  | 10 +++----
 .../ConfigurationManagerDxe.inf               |  2 +-
 .../Drivers/ArmVExpressDxe/ArmFvpDxe.inf      |  2 +-
 .../ArmVExpressFastBootDxe.inf                |  2 +-
 .../Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf   |  2 +-
 .../Drivers/Lan9118Dxe/Lan9118Dxe.inf         |  2 +-
 .../Drivers/Lan91xDxe/Lan91xDxe.inf           |  2 +-
 .../Drivers/PL180MciDxe/PL180MciDxe.inf       |  2 +-
 .../Library/ArmMaliDpLib/ArmMaliDpLib.inf     |  2 +-
 .../ArmVExpressDtPlatformDtbLoaderLib.inf     |  2 +-
 .../ArmVExpressLibCTA15-A7/ArmVExpressLib.inf |  2 +-
 .../ArmVExpressLibRTSM/ArmVExpressLib.inf     |  2 +-
 .../ArmVExpressLibRTSM/ArmVExpressLibSec.inf  |  2 +-
 .../ArmVExpressPciHostBridgeLib.inf           |  2 +-
 .../ArmVExpressSysConfigLib.inf               |  2 +-
 .../ArmVExpressSysConfigRuntimeLib.inf        |  2 +-
 .../HdLcdArmVExpressLib.inf                   |  2 +-
 .../NorFlashArmVExpressLib.inf                |  2 +-
 .../PL111LcdArmVExpressLib.inf                |  2 +-
 .../Library/ResetSystemLib/ResetSystemLib.inf |  2 +-
 Platform/Comcast/RDKQemu/RDKQemu.fdf          |  2 +-
 Readme.md                                     |  2 +-
 90 files changed, 206 insertions(+), 206 deletions(-)

diff --git a/Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFs.inf b/Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFs.inf
index 791e6fae0126..258eaf1204c0 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/ArmCommonPkg/ArmCommonPkg.dec
+  ArmCommonPkg/ArmCommonPkg.dec
 
 [LibraryClasses]
   BaseLib
diff --git a/Platform/ARM/ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf b/Platform/ARM/ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf
index 471efb51afd0..7f0beb100cce 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/ArmCommonPkg/ArmCommonPkg.dec
+  ArmCommonPkg/ArmCommonPkg.dec
   ShellPkg/ShellPkg.dec
 
 [LibraryClasses]
diff --git a/Platform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf b/Platform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf
index 22926f4f2314..52d6bce28ecc 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/ArmCommonPkg/ArmCommonPkg.dec
+  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 b7248624659c..4157a598cc6e 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/ArmCommonPkg/ArmCommonPkg.dec
+  ArmCommonPkg/ArmCommonPkg.dec
 
 [LibraryClasses]
   ArmLib
diff --git a/Platform/ARM/JunoPkg/AcpiTables/AcpiTables.inf b/Platform/ARM/JunoPkg/AcpiTables/AcpiTables.inf
index f140febc4ad4..20030a5e54fb 100644
--- a/Platform/ARM/JunoPkg/AcpiTables/AcpiTables.inf
+++ b/Platform/ARM/JunoPkg/AcpiTables/AcpiTables.inf
@@ -30,7 +30,7 @@ [Packages]
   EmbeddedPkg/EmbeddedPkg.dec
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
-  Platform/ARM/JunoPkg/ArmJuno.dec
+  JunoPkg/ArmJuno.dec
 
 [FixedPcd]
   gArmPlatformTokenSpaceGuid.PcdCoreCount
diff --git a/Platform/ARM/JunoPkg/ArmJuno.dsc b/Platform/ARM/JunoPkg/ArmJuno.dsc
index c208415f3602..935ddcbed70b 100644
--- a/Platform/ARM/JunoPkg/ArmJuno.dsc
+++ b/Platform/ARM/JunoPkg/ArmJuno.dsc
@@ -22,24 +22,24 @@ [Defines]
   SUPPORTED_ARCHITECTURES        = AARCH64|ARM
   BUILD_TARGETS                  = DEBUG|RELEASE
   SKUID_IDENTIFIER               = DEFAULT
-  FLASH_DEFINITION               = Platform/ARM/JunoPkg/ArmJuno.fdf
+  FLASH_DEFINITION               = JunoPkg/ArmJuno.fdf
 
 # On RTSM, most peripherals are VExpress Motherboard peripherals
-!include Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
+!include VExpressPkg/ArmVExpress.dsc.inc
 !include MdePkg/MdeLibs.dsc.inc
 
 !ifdef DYNAMIC_TABLES_FRAMEWORK
 !include DynamicTablesPkg/DynamicTables.dsc.inc
-!include Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager.dsc.inc
+!include JunoPkg/ConfigurationManager/ConfigurationManager.dsc.inc
 !endif
 
 [LibraryClasses.common]
   ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf
   ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf
-  ArmPlatformLib|Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf
+  ArmPlatformLib|JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf
   ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
 
-  NorFlashPlatformLib|Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJunoLib.inf
+  NorFlashPlatformLib|JunoPkg/Library/NorFlashJunoLib/NorFlashJunoLib.inf
 
   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
   CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf
@@ -48,10 +48,10 @@ [LibraryClasses.common]
   UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
 
   # SCMI Mailbox Transport Layer
-  ArmMtlLib|Platform/ARM/JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlLib.inf
+  ArmMtlLib|JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlLib.inf
 
 !ifndef HEADLESS_PLATFORM
-  LcdPlatformLib|Platform/ARM/JunoPkg/Library/HdLcdArmJunoLib/HdLcdArmJunoLib.inf
+  LcdPlatformLib|JunoPkg/Library/HdLcdArmJunoLib/HdLcdArmJunoLib.inf
   LcdHwLib|ArmPlatformPkg/Library/HdLcd/HdLcd.inf
 !endif
 
@@ -71,7 +71,7 @@ [LibraryClasses.common.SEC, LibraryClasses.common.PEIM]
 [LibraryClasses.common.UEFI_DRIVER, LibraryClasses.common.UEFI_APPLICATION, LibraryClasses.common.DXE_RUNTIME_DRIVER, LibraryClasses.common.DXE_DRIVER]
   PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
   NonDiscoverableDeviceRegistrationLib|MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.inf
-  PciHostBridgeLib|Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf
+  PciHostBridgeLib|JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf
   PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf
   PciLib|MdePkg/Library/BasePciLibPciExpress/BasePciLibPciExpress.inf
   PciExpressLib|MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf
@@ -271,7 +271,7 @@ [Components.common]
   #
   MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
 !ifndef DYNAMIC_TABLES_FRAMEWORK
-  Platform/ARM/JunoPkg/AcpiTables/AcpiTables.inf
+  JunoPkg/AcpiTables/AcpiTables.inf
 !endif
   MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
 
@@ -315,7 +315,7 @@ [Components.common]
   # SATA Controller
   #
   MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
-  Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SataSiI3132Dxe.inf
+  JunoPkg/Drivers/SataSiI3132Dxe/SataSiI3132Dxe.inf
 
   #
   # NVMe boot devices
@@ -325,7 +325,7 @@ [Components.common]
   #
   # Networking stack
   #
-  Platform/ARM/VExpressPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf
+  VExpressPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf
 !if 0
   OptionRomPkg/MarvellYukonDxe/MarvellYukonDxe.inf
 !endif
@@ -350,13 +350,13 @@ [Components.common]
   #
   # Juno platform driver
   #
-  Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf
+  JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf
 
   #
   # SMBIOS/DMI
   #
   MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
-  Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
+  JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
 
   #
   # Bds
diff --git a/Platform/ARM/JunoPkg/ArmJuno.fdf b/Platform/ARM/JunoPkg/ArmJuno.fdf
index 01c7edb08661..f7a1e3302287 100644
--- a/Platform/ARM/JunoPkg/ArmJuno.fdf
+++ b/Platform/ARM/JunoPkg/ArmJuno.fdf
@@ -109,10 +109,10 @@ [FV.FvMain]
   #
   INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
 !ifndef DYNAMIC_TABLES_FRAMEWORK
-  INF RuleOverride=ACPITABLE Platform/ARM/JunoPkg/AcpiTables/AcpiTables.inf
+  INF RuleOverride=ACPITABLE JunoPkg/AcpiTables/AcpiTables.inf
 !else
   # Configuration Manager
-  INF Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
+  INF JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
 
   #
   # Dynamic Table fdf
@@ -184,7 +184,7 @@ [FV.FvMain]
   # SATA Controller
   #
   INF MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
-  INF Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SataSiI3132Dxe.inf
+  INF JunoPkg/Drivers/SataSiI3132Dxe/SataSiI3132Dxe.inf
 
   #
   # NVMe boot devices
@@ -194,9 +194,9 @@ [FV.FvMain]
   #
   # Networking stack
   #
-!include Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc
+!include VExpressPkg/ArmVExpress-networking.fdf.inc
 
-  INF Platform/ARM/VExpressPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf
+  INF VExpressPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf
 !if 0
   INF OptionRomPkg/MarvellYukonDxe/MarvellYukonDxe.inf
 !endif
@@ -210,13 +210,13 @@ [FV.FvMain]
   #
   # Juno platform driver
   #
-  INF Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf
+  INF JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf
 
   #
   # SMBIOS/DMI
   #
   INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
-  INF Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
+  INF JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
 
   #
   # Bds
diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager.dsc.inc b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager.dsc.inc
index 987c2d8ca3ba..e638ee6f7ab1 100644
--- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager.dsc.inc
+++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager.dsc.inc
@@ -14,4 +14,4 @@ [LibraryClasses.common]
 
 [Components.common]
   # Configuration Manager
-  Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
+  JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
index 00be2c435bd6..b496756295bd 100644
--- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
+++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
@@ -32,7 +32,7 @@ [Packages]
   DynamicTablesPkg/DynamicTablesPkg.dec
   MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
-  Platform/ARM/JunoPkg/ArmJuno.dec
+  JunoPkg/ArmJuno.dec
 
 [LibraryClasses]
   ArmPlatformLib
diff --git a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf b/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf
index 5dcd67af47aa..3d14332b3ea0 100644
--- a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf
+++ b/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf
@@ -23,7 +23,7 @@ [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   ArmCommonPkg/ArmCommonPkg.dec
-  Platform/ARM/JunoPkg/ArmJuno.dec
+  JunoPkg/ArmJuno.dec
 
 [LibraryClasses]
   AcpiLib
diff --git a/Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SataSiI3132Dxe.inf b/Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SataSiI3132Dxe.inf
index 123e085ecd95..be9c08bc5f88 100644
--- a/Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SataSiI3132Dxe.inf
+++ b/Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SataSiI3132Dxe.inf
@@ -24,7 +24,7 @@ [Defines]
 
 [Packages]
   MdePkg/MdePkg.dec
-  Platform/ARM/JunoPkg/ArmJuno.dec
+  JunoPkg/ArmJuno.dec
 
 [LibraryClasses]
   MemoryAllocationLib
diff --git a/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf b/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf
index 145663c2fa28..cc24f5e895ce 100644
--- a/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf
+++ b/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf
@@ -18,7 +18,7 @@ [Packages]
   EmbeddedPkg/EmbeddedPkg.dec
   ArmPkg/ArmPkg.dec
   ArmPlatformPkg/ArmPlatformPkg.dec
-  Platform/ARM/JunoPkg/ArmJuno.dec
+  JunoPkg/ArmJuno.dec
 
 [LibraryClasses]
   IoLib
diff --git a/Platform/ARM/JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlLib.inf b/Platform/ARM/JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlLib.inf
index 0b1460c27408..55a18031df3f 100644
--- a/Platform/ARM/JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlLib.inf
+++ b/Platform/ARM/JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlLib.inf
@@ -19,7 +19,7 @@ [Packages]
   ArmPkg/ArmPkg.dec
   ArmPlatformPkg/ArmPlatformPkg.dec
   MdePkg/MdePkg.dec
-  Platform/ARM/JunoPkg/ArmJuno.dec
+  JunoPkg/ArmJuno.dec
 
 [LibraryClasses]
   ArmLib
diff --git a/Platform/ARM/JunoPkg/Library/HdLcdArmJunoLib/HdLcdArmJunoLib.inf b/Platform/ARM/JunoPkg/Library/HdLcdArmJunoLib/HdLcdArmJunoLib.inf
index 346c1a3d123e..a34dceb7bdc0 100644
--- a/Platform/ARM/JunoPkg/Library/HdLcdArmJunoLib/HdLcdArmJunoLib.inf
+++ b/Platform/ARM/JunoPkg/Library/HdLcdArmJunoLib/HdLcdArmJunoLib.inf
@@ -23,7 +23,7 @@ [Packages]
   ArmPkg/ArmPkg.dec
   ArmPlatformPkg/ArmPlatformPkg.dec
   MdePkg/MdePkg.dec
-  Platform/ARM/JunoPkg/ArmJuno.dec
+  JunoPkg/ArmJuno.dec
 
 [LibraryClasses]
   BaseLib
diff --git a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf
index 8b4a6e2fad97..4f3f3c708715 100644
--- a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf
+++ b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf
@@ -32,7 +32,7 @@ [Packages]
   ArmPkg/ArmPkg.dec
   MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
-  Platform/ARM/JunoPkg/ArmJuno.dec
+  JunoPkg/ArmJuno.dec
 
 [LibraryClasses]
   BaseLib
diff --git a/Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJunoLib.inf b/Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJunoLib.inf
index e5e5628de387..5064409173b1 100644
--- a/Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJunoLib.inf
+++ b/Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJunoLib.inf
@@ -19,7 +19,7 @@ [Sources.common]
 [Packages]
   ArmPlatformPkg/ArmPlatformPkg.dec
   MdePkg/MdePkg.dec
-  Platform/ARM/JunoPkg/ArmJuno.dec
+  JunoPkg/ArmJuno.dec
 
 [LibraryClasses]
   BaseLib
diff --git a/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf b/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
index 5a13605925e7..8f0231314678 100644
--- a/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
+++ b/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
@@ -32,7 +32,7 @@ [Packages]
   ArmPlatformPkg/ArmPlatformPkg.dec
   MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
-  Platform/ARM/JunoPkg/ArmJuno.dec
+  JunoPkg/ArmJuno.dec
 
 [LibraryClasses]
   ArmLib
diff --git a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxeFvp.inf b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxeFvp.inf
index 6fc307df014c..9c6b4698540b 100644
--- a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxeFvp.inf
+++ b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxeFvp.inf
@@ -35,7 +35,7 @@ [Packages]
   DynamicTablesPkg/DynamicTablesPkg.dec
   MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
-  Platform/ARM/Morello/MorelloPlatform.dec
+  Morello/MorelloPlatform.dec
 
 [LibraryClasses]
   UefiDriverEntryPoint
diff --git a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerFvp.dsc.inc b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerFvp.dsc.inc
index 71916783c24c..a2fc71f307b2 100644
--- a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerFvp.dsc.inc
+++ b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerFvp.dsc.inc
@@ -13,4 +13,4 @@ [BuildOptions]
 
 [Components.common]
   # Configuration Manager
-  Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxeFvp.inf
+  Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxeFvp.inf
diff --git a/Platform/ARM/Morello/Drivers/PlatformDxe/PlatformDxeFvp.inf b/Platform/ARM/Morello/Drivers/PlatformDxe/PlatformDxeFvp.inf
index c36c62f05a39..5e773543b39d 100644
--- a/Platform/ARM/Morello/Drivers/PlatformDxe/PlatformDxeFvp.inf
+++ b/Platform/ARM/Morello/Drivers/PlatformDxe/PlatformDxeFvp.inf
@@ -22,7 +22,7 @@ [Sources.common]
 [Packages]
   MdePkg/MdePkg.dec
   OvmfPkg/OvmfPkg.dec
-  Platform/ARM/Morello/MorelloPlatform.dec
+  Morello/MorelloPlatform.dec
 
 [LibraryClasses]
   UefiDriverEntryPoint
diff --git a/Platform/ARM/Morello/Library/PciHostBridgeLib/PciHostBridgeLibFvp.inf b/Platform/ARM/Morello/Library/PciHostBridgeLib/PciHostBridgeLibFvp.inf
index 1d6c5b01d13d..ee18350a361e 100644
--- a/Platform/ARM/Morello/Library/PciHostBridgeLib/PciHostBridgeLibFvp.inf
+++ b/Platform/ARM/Morello/Library/PciHostBridgeLib/PciHostBridgeLibFvp.inf
@@ -29,7 +29,7 @@ [Packages]
   ArmPkg/ArmPkg.dec
   MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
-  Platform/ARM/Morello/MorelloPlatform.dec
+  Morello/MorelloPlatform.dec
 
 [FixedPcd]
   gArmMorelloTokenSpaceGuid.PcdPciBusMax
diff --git a/Platform/ARM/Morello/Library/PlatformLib/PlatformLib.inf b/Platform/ARM/Morello/Library/PlatformLib/PlatformLib.inf
index c2d7da3701d2..a63ec5f52f7e 100644
--- a/Platform/ARM/Morello/Library/PlatformLib/PlatformLib.inf
+++ b/Platform/ARM/Morello/Library/PlatformLib/PlatformLib.inf
@@ -20,7 +20,7 @@ [Packages]
   ArmPlatformPkg/ArmPlatformPkg.dec
   MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
-  Platform/ARM/Morello/MorelloPlatform.dec
+  Morello/MorelloPlatform.dec
 
 [Sources.common]
   PlatformLib.c
diff --git a/Platform/ARM/Morello/MorelloPlatform.dsc.inc b/Platform/ARM/Morello/MorelloPlatform.dsc.inc
index dccd22248318..703518a3d428 100644
--- a/Platform/ARM/Morello/MorelloPlatform.dsc.inc
+++ b/Platform/ARM/Morello/MorelloPlatform.dsc.inc
@@ -9,7 +9,7 @@
 [LibraryClasses.common]
   ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf
   ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf
-  ArmPlatformLib|Platform/ARM/Morello/Library/PlatformLib/PlatformLib.inf
+  ArmPlatformLib|Morello/Library/PlatformLib/PlatformLib.inf
   BasePathLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
   HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
   TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf
diff --git a/Platform/ARM/Morello/MorelloPlatformFvp.dsc b/Platform/ARM/Morello/MorelloPlatformFvp.dsc
index ee612296a80e..1adf90227130 100644
--- a/Platform/ARM/Morello/MorelloPlatformFvp.dsc
+++ b/Platform/ARM/Morello/MorelloPlatformFvp.dsc
@@ -24,16 +24,16 @@ [Defines]
   SUPPORTED_ARCHITECTURES        = AARCH64
   BUILD_TARGETS                  = NOOPT|DEBUG|RELEASE
   SKUID_IDENTIFIER               = DEFAULT
-  FLASH_DEFINITION               = Platform/ARM/Morello/MorelloPlatformFvp.fdf
+  FLASH_DEFINITION               = Morello/MorelloPlatformFvp.fdf
   BUILD_NUMBER                   = 1
 
   # Network definition
   DEFINE NETWORK_ISCSI_ENABLE    = FALSE
 
-!include Platform/ARM/Morello/MorelloPlatform.dsc.inc
-!include Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
+!include Morello/MorelloPlatform.dsc.inc
+!include VExpressPkg/ArmVExpress.dsc.inc
 !include DynamicTablesPkg/DynamicTables.dsc.inc
-!include Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerFvp.dsc.inc
+!include Morello/ConfigurationManager/ConfigurationManagerFvp.dsc.inc
 
 # include common/basic libraries from MdePkg.
 !include MdePkg/MdeLibs.dsc.inc
@@ -46,7 +46,7 @@ [LibraryClasses.common]
   OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf
 
 [LibraryClasses.common.DXE_DRIVER]
-  PciHostBridgeLib|Platform/ARM/Morello/Library/PciHostBridgeLib/PciHostBridgeLibFvp.inf
+  PciHostBridgeLib|Morello/Library/PciHostBridgeLib/PciHostBridgeLibFvp.inf
 
 [PcdsFeatureFlag.common]
   gArmMorelloTokenSpaceGuid.PcdVirtioBlkSupported|TRUE
@@ -68,4 +68,4 @@ [Components.common]
   OvmfPkg/VirtioNetDxe/VirtioNet.inf
 
   # Platform driver
-  Platform/ARM/Morello/Drivers/PlatformDxe/PlatformDxeFvp.inf
+  Morello/Drivers/PlatformDxe/PlatformDxeFvp.inf
diff --git a/Platform/ARM/Morello/MorelloPlatformFvp.fdf b/Platform/ARM/Morello/MorelloPlatformFvp.fdf
index 8bdb7f0d0f5f..9634f45f15c3 100644
--- a/Platform/ARM/Morello/MorelloPlatformFvp.fdf
+++ b/Platform/ARM/Morello/MorelloPlatformFvp.fdf
@@ -99,7 +99,7 @@ [FV.FvMain]
   INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
 
   # Configuration Manager
-  INF Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxeFvp.inf
+  INF Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxeFvp.inf
 
   # Dynamic Table fdf
   !include DynamicTablesPkg/DynamicTables.fdf.inc
@@ -140,7 +140,7 @@ [FV.FvMain]
   INF ShellPkg/Application/Shell/Shell.inf
 
   # Platform driver
-  INF Platform/ARM/Morello/Drivers/PlatformDxe/PlatformDxeFvp.inf
+  INF Morello/Drivers/PlatformDxe/PlatformDxeFvp.inf
 
   # Bds
   INF MdeModulePkg/Application/UiApp/UiApp.inf
diff --git a/Platform/ARM/Morello/Readme.md b/Platform/ARM/Morello/Readme.md
index 8d441234f3b8..b43834625bfb 100644
--- a/Platform/ARM/Morello/Readme.md
+++ b/Platform/ARM/Morello/Readme.md
@@ -5,7 +5,7 @@ extension. Capability architecture specific changes will be added [here](https:/
 
 The platform port in UEFI firmware provides ARMv8-A architecture enablement.
 
-Platform code is located at Platform/ARM/Morello.
+Platform code is located at Morello.
 
 # Documentation
 
diff --git a/Platform/ARM/N1Sdp/N1SdpPlatform.dsc b/Platform/ARM/N1Sdp/N1SdpPlatform.dsc
index 61e7a909f80d..7e6e8d31b449 100644
--- a/Platform/ARM/N1Sdp/N1SdpPlatform.dsc
+++ b/Platform/ARM/N1Sdp/N1SdpPlatform.dsc
@@ -18,10 +18,10 @@ [Defines]
   SUPPORTED_ARCHITECTURES        = AARCH64
   BUILD_TARGETS                  = NOOPT|DEBUG|RELEASE
   SKUID_IDENTIFIER               = DEFAULT
-  FLASH_DEFINITION               = Platform/ARM/N1Sdp/N1SdpPlatform.fdf
+  FLASH_DEFINITION               = N1Sdp/N1SdpPlatform.fdf
   BUILD_NUMBER                   = 1
 
-!include Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
+!include VExpressPkg/ArmVExpress.dsc.inc
 !include MdePkg/MdeLibs.dsc.inc
 
 [LibraryClasses.common]
diff --git a/Platform/ARM/Readme.md b/Platform/ARM/Readme.md
index ad2386c0dbb6..1916651242b5 100644
--- a/Platform/ARM/Readme.md
+++ b/Platform/ARM/Readme.md
@@ -11,7 +11,7 @@ can be found here:
 
 # Build EDK2 TianoCore
 
-`build -a AARCH64 -p Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc -t GCC5`
+`build -a AARCH64 -p VExpressPkg/ArmVExpress-FVP-AArch64.dsc -t GCC5`
 
 Once built, the edk2 image is the following file Build/ArmVExpress-FVP-AArch64/DEBUG_GCC5/FV/FVP_AARCH64_EFI.fd
 
diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf
index 8c34c2fa73e4..409d3aa5ccbc 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf
+++ b/Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf
@@ -33,7 +33,7 @@ [Packages]
   ArmPlatformPkg/ArmPlatformPkg.dec
   EmbeddedPkg/EmbeddedPkg.dec
   MdePkg/MdePkg.dec
-  Platform/ARM/SgiPkg/SgiPlatform.dec
+  SgiPkg/SgiPlatform.dec
 
 [FixedPcd]
   gArmPlatformTokenSpaceGuid.PcdCoreCount
diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf
index ce89aa93ea7b..c74685bec7b2 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf
+++ b/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf
@@ -33,7 +33,7 @@ [Packages]
   ArmPlatformPkg/ArmPlatformPkg.dec
   EmbeddedPkg/EmbeddedPkg.dec
   MdePkg/MdePkg.dec
-  Platform/ARM/SgiPkg/SgiPlatform.dec
+  SgiPkg/SgiPlatform.dec
 
 [FixedPcd]
   gArmPlatformTokenSpaceGuid.PcdCoreCount
diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf
index 1999bc1553e9..1ad34860fa7b 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf
+++ b/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf
@@ -35,7 +35,7 @@ [Packages]
   ArmPlatformPkg/ArmPlatformPkg.dec
   EmbeddedPkg/EmbeddedPkg.dec
   MdePkg/MdePkg.dec
-  Platform/ARM/SgiPkg/SgiPlatform.dec
+  SgiPkg/SgiPlatform.dec
 
 [FixedPcd]
   gArmPlatformTokenSpaceGuid.PcdCoreCount
diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN2AcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/RdN2AcpiTables.inf
index 25be2e276e85..c136ea4320e0 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/RdN2AcpiTables.inf
+++ b/Platform/ARM/SgiPkg/AcpiTables/RdN2AcpiTables.inf
@@ -33,7 +33,7 @@ [Packages]
   ArmPlatformPkg/ArmPlatformPkg.dec
   EmbeddedPkg/EmbeddedPkg.dec
   MdePkg/MdePkg.dec
-  Platform/ARM/SgiPkg/SgiPlatform.dec
+  SgiPkg/SgiPlatform.dec
 
 [FixedPcd]
   gArmPlatformTokenSpaceGuid.PcdSerialDbgRegisterBase
diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN2Cfg1AcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/RdN2Cfg1AcpiTables.inf
index 4b36c3e5ceb2..36bc95615f86 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/RdN2Cfg1AcpiTables.inf
+++ b/Platform/ARM/SgiPkg/AcpiTables/RdN2Cfg1AcpiTables.inf
@@ -33,7 +33,7 @@ [Packages]
   ArmPlatformPkg/ArmPlatformPkg.dec
   EmbeddedPkg/EmbeddedPkg.dec
   MdePkg/MdePkg.dec
-  Platform/ARM/SgiPkg/SgiPlatform.dec
+  SgiPkg/SgiPlatform.dec
 
 [FixedPcd]
   gArmPlatformTokenSpaceGuid.PcdSerialDbgRegisterBase
diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdV1AcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/RdV1AcpiTables.inf
index 97a87462932b..d5b6479e4f44 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/RdV1AcpiTables.inf
+++ b/Platform/ARM/SgiPkg/AcpiTables/RdV1AcpiTables.inf
@@ -33,7 +33,7 @@ [Packages]
   ArmPlatformPkg/ArmPlatformPkg.dec
   EmbeddedPkg/EmbeddedPkg.dec
   MdePkg/MdePkg.dec
-  Platform/ARM/SgiPkg/SgiPlatform.dec
+  SgiPkg/SgiPlatform.dec
 
 [FixedPcd]
   gArmPlatformTokenSpaceGuid.PcdSerialDbgRegisterBase
diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdV1McAcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/RdV1McAcpiTables.inf
index deaca3719ae4..3863237d2a0c 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/RdV1McAcpiTables.inf
+++ b/Platform/ARM/SgiPkg/AcpiTables/RdV1McAcpiTables.inf
@@ -35,7 +35,7 @@ [Packages]
   ArmPlatformPkg/ArmPlatformPkg.dec
   EmbeddedPkg/EmbeddedPkg.dec
   MdePkg/MdePkg.dec
-  Platform/ARM/SgiPkg/SgiPlatform.dec
+  SgiPkg/SgiPlatform.dec
 
 [FixedPcd]
   gArmPlatformTokenSpaceGuid.PcdSerialDbgRegisterBase
diff --git a/Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf
index a1bd71fde761..7b536e823869 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf
+++ b/Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf
@@ -33,7 +33,7 @@ [Packages]
   ArmPlatformPkg/ArmPlatformPkg.dec
   EmbeddedPkg/EmbeddedPkg.dec
   MdePkg/MdePkg.dec
-  Platform/ARM/SgiPkg/SgiPlatform.dec
+  SgiPkg/SgiPlatform.dec
 
 [FixedPcd]
   gArmPlatformTokenSpaceGuid.PcdCoreCount
diff --git a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf
index 9d89314a594e..7cfe42bba0f2 100644
--- a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf
+++ b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf
@@ -20,7 +20,7 @@ [Packages]
   EmbeddedPkg/EmbeddedPkg.dec
   MdePkg/MdePkg.dec
   OvmfPkg/OvmfPkg.dec
-  Platform/ARM/SgiPkg/SgiPlatform.dec
+  SgiPkg/SgiPlatform.dec
 
 [LibraryClasses]
   AcpiLib
diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
index 4258eb9deadb..3ed6def28003 100644
--- a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
+++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
@@ -30,7 +30,7 @@ [Packages]
   ArmPlatformPkg/ArmPlatformPkg.dec
   MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
-  Platform/ARM/SgiPkg/SgiPlatform.dec
+  SgiPkg/SgiPlatform.dec
 
 [LibraryClasses]
   ArmLib
diff --git a/Platform/ARM/SgiPkg/Library/HdLcdArmSgiLib/HdLcdArmSgiLib.inf b/Platform/ARM/SgiPkg/Library/HdLcdArmSgiLib/HdLcdArmSgiLib.inf
index 75a6ba2ae647..db13b59856fc 100644
--- a/Platform/ARM/SgiPkg/Library/HdLcdArmSgiLib/HdLcdArmSgiLib.inf
+++ b/Platform/ARM/SgiPkg/Library/HdLcdArmSgiLib/HdLcdArmSgiLib.inf
@@ -19,7 +19,7 @@ [Packages]
   ArmPkg/ArmPkg.dec
   ArmPlatformPkg/ArmPlatformPkg.dec
   MdePkg/MdePkg.dec
-  Platform/ARM/SgiPkg/SgiPlatform.dec
+  SgiPkg/SgiPlatform.dec
 
 [LibraryClasses]
   BaseLib
diff --git a/Platform/ARM/SgiPkg/Library/NorFlashLib/NorFlashLib.inf b/Platform/ARM/SgiPkg/Library/NorFlashLib/NorFlashLib.inf
index 74486eacd009..0b24102001c3 100644
--- a/Platform/ARM/SgiPkg/Library/NorFlashLib/NorFlashLib.inf
+++ b/Platform/ARM/SgiPkg/Library/NorFlashLib/NorFlashLib.inf
@@ -20,7 +20,7 @@ [Sources.common]
 [Packages]
   ArmPlatformPkg/ArmPlatformPkg.dec
   MdePkg/MdePkg.dec
-  Platform/ARM/SgiPkg/SgiPlatform.dec
+  SgiPkg/SgiPlatform.dec
 
 [LibraryClasses]
   BaseLib
diff --git a/Platform/ARM/SgiPkg/Library/NorFlashLib/StandaloneMmNorFlashLib.inf b/Platform/ARM/SgiPkg/Library/NorFlashLib/StandaloneMmNorFlashLib.inf
index 96bbf1e42313..d98a4a252373 100644
--- a/Platform/ARM/SgiPkg/Library/NorFlashLib/StandaloneMmNorFlashLib.inf
+++ b/Platform/ARM/SgiPkg/Library/NorFlashLib/StandaloneMmNorFlashLib.inf
@@ -21,7 +21,7 @@ [Sources.common]
 [Packages]
   ArmPlatformPkg/ArmPlatformPkg.dec
   MdePkg/MdePkg.dec
-  Platform/ARM/SgiPkg/SgiPlatform.dec
+  SgiPkg/SgiPlatform.dec
 
 [LibraryClasses]
   BaseLib
diff --git a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf b/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf
index 22e247ea4fae..f86167cccd70 100644
--- a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf
+++ b/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf
@@ -18,7 +18,7 @@ [Packages]
   EmbeddedPkg/EmbeddedPkg.dec
   MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
-  Platform/ARM/SgiPkg/SgiPlatform.dec
+  SgiPkg/SgiPlatform.dec
   StandaloneMmPkg/StandaloneMmPkg.dec
 
 [LibraryClasses]
diff --git a/Platform/ARM/SgiPkg/Library/SgiPlatformPei/SgiPlatformPei.inf b/Platform/ARM/SgiPkg/Library/SgiPlatformPei/SgiPlatformPei.inf
index 407160c07563..12677b8c7c78 100644
--- a/Platform/ARM/SgiPkg/Library/SgiPlatformPei/SgiPlatformPei.inf
+++ b/Platform/ARM/SgiPkg/Library/SgiPlatformPei/SgiPlatformPei.inf
@@ -15,7 +15,7 @@ [Defines]
 [Packages]
   EmbeddedPkg/EmbeddedPkg.dec
   MdePkg/MdePkg.dec
-  Platform/ARM/SgiPkg/SgiPlatform.dec
+  SgiPkg/SgiPlatform.dec
 
 [LibraryClasses]
   FdtLib
diff --git a/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc b/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc
index 2cb4895cfcff..601d48f5d804 100644
--- a/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc
+++ b/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc
@@ -21,7 +21,7 @@ [Defines]
   SUPPORTED_ARCHITECTURES        = AARCH64
   BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
-  FLASH_DEFINITION               = Platform/ARM/SgiPkg/PlatformStandaloneMm.fdf
+  FLASH_DEFINITION               = SgiPkg/PlatformStandaloneMm.fdf
   DEFINE DEBUG_MESSAGE           = TRUE
 
   # LzmaF86
@@ -29,7 +29,7 @@ [Defines]
 
 # include common definitions.
 !include MdePkg/MdeLibs.dsc.inc
-!include Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc
+!include SgiPkg/SgiPlatformMm.dsc.inc
 
 ################################################################################
 #
diff --git a/Platform/ARM/SgiPkg/PlatformStandaloneMm2.dsc b/Platform/ARM/SgiPkg/PlatformStandaloneMm2.dsc
index 46c2ae3529d1..ef833654099a 100644
--- a/Platform/ARM/SgiPkg/PlatformStandaloneMm2.dsc
+++ b/Platform/ARM/SgiPkg/PlatformStandaloneMm2.dsc
@@ -20,7 +20,7 @@ [Defines]
   SUPPORTED_ARCHITECTURES        = AARCH64
   BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
-  FLASH_DEFINITION               = Platform/ARM/SgiPkg/PlatformStandaloneMm.fdf
+  FLASH_DEFINITION               = SgiPkg/PlatformStandaloneMm.fdf
   DEFINE DEBUG_MESSAGE           = TRUE
 
   # LzmaF86
@@ -28,7 +28,7 @@ [Defines]
 
 # include common definitions.
 !include MdePkg/MdeLibs.dsc.inc
-!include Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc
+!include SgiPkg/SgiPlatformMm.dsc.inc
 
 ################################################################################
 #
diff --git a/Platform/ARM/SgiPkg/RdE1Edge/RdE1Edge.dsc b/Platform/ARM/SgiPkg/RdE1Edge/RdE1Edge.dsc
index edd5a49315be..501fefe7edc4 100644
--- a/Platform/ARM/SgiPkg/RdE1Edge/RdE1Edge.dsc
+++ b/Platform/ARM/SgiPkg/RdE1Edge/RdE1Edge.dsc
@@ -18,13 +18,13 @@ [Defines]
   SUPPORTED_ARCHITECTURES        = AARCH64|ARM
   BUILD_TARGETS                  = NOOPT|DEBUG|RELEASE
   SKUID_IDENTIFIER               = DEFAULT
-  FLASH_DEFINITION               = Platform/ARM/SgiPkg/SgiPlatform.fdf
-  BOARD_DXE_FV_COMPONENTS        = Platform/ARM/SgiPkg/RdE1Edge/RdE1Edge.fdf.inc
+  FLASH_DEFINITION               = SgiPkg/SgiPlatform.fdf
+  BOARD_DXE_FV_COMPONENTS        = SgiPkg/RdE1Edge/RdE1Edge.fdf.inc
   BUILD_NUMBER                   = 1
 
 # include common definitions from SgiPlatform.dsc
-!include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
-!include Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc
+!include SgiPkg/SgiPlatform.dsc.inc
+!include SgiPkg/SgiMemoryMap.dsc.inc
 
 # include common/basic libraries from MdePkg.
 !include MdePkg/MdeLibs.dsc.inc
@@ -52,4 +52,4 @@ [PcdsFixedAtBuild.common]
 ################################################################################
 
 [Components.common]
-  Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf
+  SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf
diff --git a/Platform/ARM/SgiPkg/RdE1Edge/RdE1Edge.fdf.inc b/Platform/ARM/SgiPkg/RdE1Edge/RdE1Edge.fdf.inc
index 056fc55c098a..d86a45276892 100644
--- a/Platform/ARM/SgiPkg/RdE1Edge/RdE1Edge.fdf.inc
+++ b/Platform/ARM/SgiPkg/RdE1Edge/RdE1Edge.fdf.inc
@@ -7,4 +7,4 @@
 # Per-platform additional content of the DXE phase firmware volume
 
   # ACPI support
-  INF RuleOverride=ACPITABLE Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf
+  INF RuleOverride=ACPITABLE SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf
diff --git a/Platform/ARM/SgiPkg/RdN1Edge/RdN1Edge.dsc b/Platform/ARM/SgiPkg/RdN1Edge/RdN1Edge.dsc
index 37f0deed6b45..a6288b6dda01 100644
--- a/Platform/ARM/SgiPkg/RdN1Edge/RdN1Edge.dsc
+++ b/Platform/ARM/SgiPkg/RdN1Edge/RdN1Edge.dsc
@@ -18,13 +18,13 @@ [Defines]
   SUPPORTED_ARCHITECTURES        = AARCH64|ARM
   BUILD_TARGETS                  = NOOPT|DEBUG|RELEASE
   SKUID_IDENTIFIER               = DEFAULT
-  FLASH_DEFINITION               = Platform/ARM/SgiPkg/SgiPlatform.fdf
-  BOARD_DXE_FV_COMPONENTS        = Platform/ARM/SgiPkg/RdN1Edge/RdN1Edge.fdf.inc
+  FLASH_DEFINITION               = SgiPkg/SgiPlatform.fdf
+  BOARD_DXE_FV_COMPONENTS        = SgiPkg/RdN1Edge/RdN1Edge.fdf.inc
   BUILD_NUMBER                   = 1
 
 # include common definitions from SgiPlatform.dsc
-!include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
-!include Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc
+!include SgiPkg/SgiPlatform.dsc.inc
+!include SgiPkg/SgiMemoryMap.dsc.inc
 
 # include common/basic libraries from MdePkg.
 !include MdePkg/MdeLibs.dsc.inc
@@ -52,4 +52,4 @@ [PcdsFixedAtBuild.common]
 ################################################################################
 
 [Components.common]
-  Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf
+  SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf
diff --git a/Platform/ARM/SgiPkg/RdN1Edge/RdN1Edge.fdf.inc b/Platform/ARM/SgiPkg/RdN1Edge/RdN1Edge.fdf.inc
index 4b191ca55cb9..3cf8ceae0bd8 100644
--- a/Platform/ARM/SgiPkg/RdN1Edge/RdN1Edge.fdf.inc
+++ b/Platform/ARM/SgiPkg/RdN1Edge/RdN1Edge.fdf.inc
@@ -7,4 +7,4 @@
 # Per-platform additional content of the DXE phase firmware volume
 
   # ACPI support
-  INF RuleOverride=ACPITABLE Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf
+  INF RuleOverride=ACPITABLE SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf
diff --git a/Platform/ARM/SgiPkg/RdN1EdgeX2/RdN1EdgeX2.dsc b/Platform/ARM/SgiPkg/RdN1EdgeX2/RdN1EdgeX2.dsc
index 7449c75be4da..143902b8972c 100644
--- a/Platform/ARM/SgiPkg/RdN1EdgeX2/RdN1EdgeX2.dsc
+++ b/Platform/ARM/SgiPkg/RdN1EdgeX2/RdN1EdgeX2.dsc
@@ -18,13 +18,13 @@ [Defines]
   SUPPORTED_ARCHITECTURES        = AARCH64|ARM
   BUILD_TARGETS                  = NOOPT|DEBUG|RELEASE
   SKUID_IDENTIFIER               = DEFAULT
-  FLASH_DEFINITION               = Platform/ARM/SgiPkg/SgiPlatform.fdf
-  BOARD_DXE_FV_COMPONENTS        = Platform/ARM/SgiPkg/RdN1EdgeX2/RdN1EdgeX2.fdf.inc
+  FLASH_DEFINITION               = SgiPkg/SgiPlatform.fdf
+  BOARD_DXE_FV_COMPONENTS        = SgiPkg/RdN1EdgeX2/RdN1EdgeX2.fdf.inc
   BUILD_NUMBER                   = 1
 
 # include common definitions from SgiPlatform.dsc
-!include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
-!include Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc
+!include SgiPkg/SgiPlatform.dsc.inc
+!include SgiPkg/SgiMemoryMap.dsc.inc
 
 # include common/basic libraries from MdePkg.
 !include MdePkg/MdeLibs.dsc.inc
@@ -55,4 +55,4 @@ [PcdsFixedAtBuild.common]
 ################################################################################
 
 [Components.common]
-  Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf
+  SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf
diff --git a/Platform/ARM/SgiPkg/RdN1EdgeX2/RdN1EdgeX2.fdf.inc b/Platform/ARM/SgiPkg/RdN1EdgeX2/RdN1EdgeX2.fdf.inc
index 369264a916b4..6f2cb5e380af 100644
--- a/Platform/ARM/SgiPkg/RdN1EdgeX2/RdN1EdgeX2.fdf.inc
+++ b/Platform/ARM/SgiPkg/RdN1EdgeX2/RdN1EdgeX2.fdf.inc
@@ -7,4 +7,4 @@
 # Per-platform additional content of the DXE phase firmware volume
 
   # ACPI support
-  INF RuleOverride=ACPITABLE Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf
+  INF RuleOverride=ACPITABLE SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf
diff --git a/Platform/ARM/SgiPkg/RdN2/RdN2.dsc b/Platform/ARM/SgiPkg/RdN2/RdN2.dsc
index adce7ee90ff8..9ba3c9f9bfae 100644
--- a/Platform/ARM/SgiPkg/RdN2/RdN2.dsc
+++ b/Platform/ARM/SgiPkg/RdN2/RdN2.dsc
@@ -18,13 +18,13 @@ [Defines]
   SUPPORTED_ARCHITECTURES        = AARCH64|ARM
   BUILD_TARGETS                  = NOOPT|DEBUG|RELEASE
   SKUID_IDENTIFIER               = DEFAULT
-  FLASH_DEFINITION               = Platform/ARM/SgiPkg/SgiPlatform.fdf
-  BOARD_DXE_FV_COMPONENTS        = Platform/ARM/SgiPkg/RdN2/RdN2.fdf.inc
+  FLASH_DEFINITION               = SgiPkg/SgiPlatform.fdf
+  BOARD_DXE_FV_COMPONENTS        = SgiPkg/RdN2/RdN2.fdf.inc
   BUILD_NUMBER                   = 1
 
 # include common definitions from SgiPlatform.dsc
-!include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
-!include Platform/ARM/SgiPkg/SgiMemoryMap2.dsc.inc
+!include SgiPkg/SgiPlatform.dsc.inc
+!include SgiPkg/SgiMemoryMap2.dsc.inc
 
 # include common/basic libraries from MdePkg.
 !include MdePkg/MdeLibs.dsc.inc
@@ -52,4 +52,4 @@ [PcdsFixedAtBuild.common]
 ################################################################################
 
 [Components.common]
-  Platform/ARM/SgiPkg/AcpiTables/RdN2AcpiTables.inf
+  SgiPkg/AcpiTables/RdN2AcpiTables.inf
diff --git a/Platform/ARM/SgiPkg/RdN2/RdN2.fdf.inc b/Platform/ARM/SgiPkg/RdN2/RdN2.fdf.inc
index ebd6ed90530c..ee7d309594fc 100644
--- a/Platform/ARM/SgiPkg/RdN2/RdN2.fdf.inc
+++ b/Platform/ARM/SgiPkg/RdN2/RdN2.fdf.inc
@@ -7,4 +7,4 @@
 # Per-platform additional content of the DXE phase firmware volume
 
   # ACPI support
-  INF RuleOverride=ACPITABLE Platform/ARM/SgiPkg/AcpiTables/RdN2AcpiTables.inf
+  INF RuleOverride=ACPITABLE SgiPkg/AcpiTables/RdN2AcpiTables.inf
diff --git a/Platform/ARM/SgiPkg/RdN2Cfg1/RdN2Cfg1.dsc b/Platform/ARM/SgiPkg/RdN2Cfg1/RdN2Cfg1.dsc
index c26f652cb9e9..f16cc4079f9a 100644
--- a/Platform/ARM/SgiPkg/RdN2Cfg1/RdN2Cfg1.dsc
+++ b/Platform/ARM/SgiPkg/RdN2Cfg1/RdN2Cfg1.dsc
@@ -20,13 +20,13 @@ [Defines]
   SUPPORTED_ARCHITECTURES        = AARCH64
   BUILD_TARGETS                  = NOOPT|DEBUG|RELEASE
   SKUID_IDENTIFIER               = DEFAULT
-  FLASH_DEFINITION               = Platform/ARM/SgiPkg/SgiPlatform.fdf
-  BOARD_DXE_FV_COMPONENTS        = Platform/ARM/SgiPkg/RdN2Cfg1/RdN2Cfg1.fdf.inc
+  FLASH_DEFINITION               = SgiPkg/SgiPlatform.fdf
+  BOARD_DXE_FV_COMPONENTS        = SgiPkg/RdN2Cfg1/RdN2Cfg1.fdf.inc
   BUILD_NUMBER                   = 1
 
 # include common definitions from SgiPlatform.dsc
-!include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
-!include Platform/ARM/SgiPkg/SgiMemoryMap2.dsc.inc
+!include SgiPkg/SgiPlatform.dsc.inc
+!include SgiPkg/SgiMemoryMap2.dsc.inc
 
 # include common/basic libraries from MdePkg.
 !include MdePkg/MdeLibs.dsc.inc
@@ -54,4 +54,4 @@ [PcdsFixedAtBuild.common]
 ################################################################################
 
 [Components.common]
-  Platform/ARM/SgiPkg/AcpiTables/RdN2Cfg1AcpiTables.inf
+  SgiPkg/AcpiTables/RdN2Cfg1AcpiTables.inf
diff --git a/Platform/ARM/SgiPkg/RdN2Cfg1/RdN2Cfg1.fdf.inc b/Platform/ARM/SgiPkg/RdN2Cfg1/RdN2Cfg1.fdf.inc
index ef0c02afb4f4..be13d61d6eb6 100644
--- a/Platform/ARM/SgiPkg/RdN2Cfg1/RdN2Cfg1.fdf.inc
+++ b/Platform/ARM/SgiPkg/RdN2Cfg1/RdN2Cfg1.fdf.inc
@@ -9,4 +9,4 @@
 # Per-platform additional content of the DXE phase firmware volume
 
   # ACPI support
-  INF RuleOverride=ACPITABLE Platform/ARM/SgiPkg/AcpiTables/RdN2Cfg1AcpiTables.inf
+  INF RuleOverride=ACPITABLE SgiPkg/AcpiTables/RdN2Cfg1AcpiTables.inf
diff --git a/Platform/ARM/SgiPkg/RdV1/RdV1.dsc b/Platform/ARM/SgiPkg/RdV1/RdV1.dsc
index a878d28df7cb..26d8f82a062f 100644
--- a/Platform/ARM/SgiPkg/RdV1/RdV1.dsc
+++ b/Platform/ARM/SgiPkg/RdV1/RdV1.dsc
@@ -18,13 +18,13 @@ [Defines]
   SUPPORTED_ARCHITECTURES        = AARCH64|ARM
   BUILD_TARGETS                  = NOOPT|DEBUG|RELEASE
   SKUID_IDENTIFIER               = DEFAULT
-  FLASH_DEFINITION               = Platform/ARM/SgiPkg/SgiPlatform.fdf
-  BOARD_DXE_FV_COMPONENTS        = Platform/ARM/SgiPkg/RdV1/RdV1.fdf.inc
+  FLASH_DEFINITION               = SgiPkg/SgiPlatform.fdf
+  BOARD_DXE_FV_COMPONENTS        = SgiPkg/RdV1/RdV1.fdf.inc
   BUILD_NUMBER                   = 1
 
 # include common definitions from SgiPlatform.dsc
-!include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
-!include Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc
+!include SgiPkg/SgiPlatform.dsc.inc
+!include SgiPkg/SgiMemoryMap.dsc.inc
 
 # include common/basic libraries from MdePkg.
 !include MdePkg/MdeLibs.dsc.inc
@@ -52,4 +52,4 @@ [PcdsFixedAtBuild.common]
 ################################################################################
 
 [Components.common]
-  Platform/ARM/SgiPkg/AcpiTables/RdV1AcpiTables.inf
+  SgiPkg/AcpiTables/RdV1AcpiTables.inf
diff --git a/Platform/ARM/SgiPkg/RdV1/RdV1.fdf.inc b/Platform/ARM/SgiPkg/RdV1/RdV1.fdf.inc
index 1277bf39c162..f6c6f8d76119 100644
--- a/Platform/ARM/SgiPkg/RdV1/RdV1.fdf.inc
+++ b/Platform/ARM/SgiPkg/RdV1/RdV1.fdf.inc
@@ -7,4 +7,4 @@
 # Per-platform additional content of the DXE phase firmware volume
 
   # ACPI support
-  INF RuleOverride=ACPITABLE Platform/ARM/SgiPkg/AcpiTables/RdV1AcpiTables.inf
+  INF RuleOverride=ACPITABLE SgiPkg/AcpiTables/RdV1AcpiTables.inf
diff --git a/Platform/ARM/SgiPkg/RdV1Mc/RdV1Mc.dsc b/Platform/ARM/SgiPkg/RdV1Mc/RdV1Mc.dsc
index 578cb74fa06a..e7937a838df8 100644
--- a/Platform/ARM/SgiPkg/RdV1Mc/RdV1Mc.dsc
+++ b/Platform/ARM/SgiPkg/RdV1Mc/RdV1Mc.dsc
@@ -18,13 +18,13 @@ [Defines]
   SUPPORTED_ARCHITECTURES        = AARCH64|ARM
   BUILD_TARGETS                  = NOOPT|DEBUG|RELEASE
   SKUID_IDENTIFIER               = DEFAULT
-  FLASH_DEFINITION               = Platform/ARM/SgiPkg/SgiPlatform.fdf
-  BOARD_DXE_FV_COMPONENTS        = Platform/ARM/SgiPkg/RdV1Mc/RdV1Mc.fdf.inc
+  FLASH_DEFINITION               = SgiPkg/SgiPlatform.fdf
+  BOARD_DXE_FV_COMPONENTS        = SgiPkg/RdV1Mc/RdV1Mc.fdf.inc
   BUILD_NUMBER                   = 1
 
 # include common definitions from SgiPlatform.dsc
-!include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
-!include Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc
+!include SgiPkg/SgiPlatform.dsc.inc
+!include SgiPkg/SgiMemoryMap.dsc.inc
 
 # include common/basic libraries from MdePkg.
 !include MdePkg/MdeLibs.dsc.inc
@@ -55,4 +55,4 @@ [PcdsFixedAtBuild.common]
 ################################################################################
 
 [Components.common]
-  Platform/ARM/SgiPkg/AcpiTables/RdV1McAcpiTables.inf
+  SgiPkg/AcpiTables/RdV1McAcpiTables.inf
diff --git a/Platform/ARM/SgiPkg/RdV1Mc/RdV1Mc.fdf.inc b/Platform/ARM/SgiPkg/RdV1Mc/RdV1Mc.fdf.inc
index 6b83893fe0fe..fe1febf11fcb 100644
--- a/Platform/ARM/SgiPkg/RdV1Mc/RdV1Mc.fdf.inc
+++ b/Platform/ARM/SgiPkg/RdV1Mc/RdV1Mc.fdf.inc
@@ -7,4 +7,4 @@
 # Per-platform additional content of the DXE phase firmware volume
 
   # ACPI support
-  INF RuleOverride=ACPITABLE Platform/ARM/SgiPkg/AcpiTables/RdV1McAcpiTables.inf
+  INF RuleOverride=ACPITABLE SgiPkg/AcpiTables/RdV1McAcpiTables.inf
diff --git a/Platform/ARM/SgiPkg/Sgi575/Sgi575.dsc b/Platform/ARM/SgiPkg/Sgi575/Sgi575.dsc
index 50790135a6d4..a018187c96bd 100644
--- a/Platform/ARM/SgiPkg/Sgi575/Sgi575.dsc
+++ b/Platform/ARM/SgiPkg/Sgi575/Sgi575.dsc
@@ -18,13 +18,13 @@ [Defines]
   SUPPORTED_ARCHITECTURES        = AARCH64|ARM
   BUILD_TARGETS                  = NOOPT|DEBUG|RELEASE
   SKUID_IDENTIFIER               = DEFAULT
-  FLASH_DEFINITION               = Platform/ARM/SgiPkg/SgiPlatform.fdf
-  BOARD_DXE_FV_COMPONENTS        = Platform/ARM/SgiPkg/Sgi575/Sgi575.fdf.inc
+  FLASH_DEFINITION               = SgiPkg/SgiPlatform.fdf
+  BOARD_DXE_FV_COMPONENTS        = SgiPkg/Sgi575/Sgi575.fdf.inc
   BUILD_NUMBER                   = 1
 
 # include common definitions from SgiPlatform.dsc
-!include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
-!include Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc
+!include SgiPkg/SgiPlatform.dsc.inc
+!include SgiPkg/SgiMemoryMap.dsc.inc
 
 # include common/basic libraries from MdePkg.
 !include MdePkg/MdeLibs.dsc.inc
@@ -52,4 +52,4 @@ [PcdsFixedAtBuild.common]
 ################################################################################
 
 [Components.common]
-  Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf
+  SgiPkg/AcpiTables/Sgi575AcpiTables.inf
diff --git a/Platform/ARM/SgiPkg/Sgi575/Sgi575.fdf.inc b/Platform/ARM/SgiPkg/Sgi575/Sgi575.fdf.inc
index 3748d86efdf4..77b8e5c02967 100644
--- a/Platform/ARM/SgiPkg/Sgi575/Sgi575.fdf.inc
+++ b/Platform/ARM/SgiPkg/Sgi575/Sgi575.fdf.inc
@@ -7,4 +7,4 @@
 # Per-platform additional content of the DXE phase firmware volume
 
   # ACPI support
-  INF RuleOverride=ACPITABLE Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf
+  INF RuleOverride=ACPITABLE SgiPkg/AcpiTables/Sgi575AcpiTables.inf
diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc b/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
index 7e37732fb93c..c6e1be9eedda 100644
--- a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
+++ b/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
@@ -4,7 +4,7 @@
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 
-!include Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
+!include VExpressPkg/ArmVExpress.dsc.inc
 
 [Defines]
   # To allow the use of secure storage, set this to TRUE.
@@ -28,13 +28,13 @@ [LibraryClasses.common]
   ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf
   ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf
   ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
-  ArmPlatformSysConfigLib|Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf
-  ArmPlatformLib|Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf
+  ArmPlatformSysConfigLib|VExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf
+  ArmPlatformLib|SgiPkg/Library/PlatformLib/PlatformLib.inf
   BasePathLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
   EfiResetSystemLib|ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf
   LcdHwLib|ArmPlatformPkg/Library/HdLcd/HdLcd.inf
-  LcdPlatformLib|Platform/ARM/SgiPkg/Library/HdLcdArmSgiLib/HdLcdArmSgiLib.inf
-  NorFlashPlatformLib|Platform/ARM/SgiPkg/Library/NorFlashLib/NorFlashLib.inf
+  LcdPlatformLib|SgiPkg/Library/HdLcdArmSgiLib/HdLcdArmSgiLib.inf
+  NorFlashPlatformLib|SgiPkg/Library/NorFlashLib/NorFlashLib.inf
   HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
   TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf
 !if $(SECURE_BOOT_ENABLE) == TRUE
@@ -78,7 +78,7 @@ [LibraryClasses.common.DXE_CORE]
 
 [LibraryClasses.common.DXE_DRIVER]
   FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf
-  PciHostBridgeLib|Platform/ARM/SgiPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf
+  PciHostBridgeLib|SgiPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf
   PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf
   PciLib|MdePkg/Library/BasePciLibPciExpress/BasePciLibPciExpress.inf
   PciExpressLib|MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf
@@ -232,7 +232,7 @@ [Components.common]
     <LibraryClasses>
       NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
   }
-  Platform/ARM/SgiPkg/Library/SgiPlatformPei/SgiPlatformPei.inf
+  SgiPkg/Library/SgiPlatformPei/SgiPlatformPei.inf
 
   #
   # DXE
@@ -299,12 +299,12 @@ [Components.common]
   # SMBIOS/DMI
   #
   MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
-  Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
+  SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
 
   #
   # platform driver
   #
-  Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf
+  SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf
 
   #
   # FAT filesystem + GPT/MBR partitioning
diff --git a/Platform/ARM/SgiPkg/SgiPlatform.fdf b/Platform/ARM/SgiPkg/SgiPlatform.fdf
index 1e72c1d0544c..80046643069f 100644
--- a/Platform/ARM/SgiPkg/SgiPlatform.fdf
+++ b/Platform/ARM/SgiPkg/SgiPlatform.fdf
@@ -113,7 +113,7 @@ [FV.FvMain]
   # SMBIOS/DMI
   #
   INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
-  INF Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
+  INF SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
 
   # Required by PCI
   INF ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf
@@ -182,7 +182,7 @@ [FV.FvMain]
   #
   # Platform driver
   #
-  INF Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf
+  INF SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf
 
   #
   # Bds
@@ -228,7 +228,7 @@ [FV.FVMAIN_COMPACT]
   INF MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf
   INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf
   INF MdeModulePkg/Universal/Variable/Pei/VariablePei.inf
-  INF Platform/ARM/SgiPkg/Library/SgiPlatformPei/SgiPlatformPei.inf
+  INF SgiPkg/Library/SgiPlatformPei/SgiPlatformPei.inf
 
   FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
     SECTION GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF PROCESSING_REQUIRED = TRUE {
diff --git a/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc b/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc
index 5287e1f8e568..6e457e8127c6 100644
--- a/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc
+++ b/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc
@@ -63,7 +63,7 @@ [LibraryClasses.common.MM_STANDALONE]
   AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf
   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
   IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
-  NorFlashPlatformLib|Platform/ARM/SgiPkg/Library/NorFlashLib/StandaloneMmNorFlashLib.inf
+  NorFlashPlatformLib|SgiPkg/Library/NorFlashLib/StandaloneMmNorFlashLib.inf
   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
   RngLib|MdePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf
   PlatformSecureLib|SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.inf
diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc
index 79ce9658fefa..3682af4dc44c 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc
+++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc
@@ -24,33 +24,33 @@ [Defines]
   SUPPORTED_ARCHITECTURES        = ARM
   BUILD_TARGETS                  = DEBUG|RELEASE
   SKUID_IDENTIFIER               = DEFAULT
-  FLASH_DEFINITION               = Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf
+  FLASH_DEFINITION               = VExpressPkg/ArmVExpress-CTA15-A7.fdf
 
   DEFINE EDK2_SKIP_PEICORE = 1
   DEFINE ARM_BIGLITTLE_TC2 = 1 # We build for the TC2 hardware by default
 
-!include Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
+!include VExpressPkg/ArmVExpress.dsc.inc
 !include MdePkg/MdeLibs.dsc.inc
 
 [LibraryClasses.common]
   ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf
   ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf
-  ArmPlatformLib|Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/ArmVExpressLib.inf
+  ArmPlatformLib|VExpressPkg/Library/ArmVExpressLibCTA15-A7/ArmVExpressLib.inf
 
-  ArmPlatformSysConfigLib|Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf
+  ArmPlatformSysConfigLib|VExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf
 
-  #DebugAgentTimerLib|Platform/ARM/VExpressPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.inf
+  #DebugAgentTimerLib|VExpressPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.inf
 
   # ARM General Interrupt Driver in Secure and Non-secure
   ArmGicLib|ArmPkg/Drivers/ArmGic/ArmGicLib.inf
 
   LcdHwLib|ArmPlatformPkg/Library/HdLcd/HdLcd.inf
-  LcdPlatformLib|Platform/ARM/VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpressLib.inf
+  LcdPlatformLib|VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpressLib.inf
 
   ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
 
 [LibraryClasses.common.DXE_RUNTIME_DRIVER]
-  ArmPlatformSysConfigLib|Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigRuntimeLib/ArmVExpressSysConfigRuntimeLib.inf
+  ArmPlatformSysConfigLib|VExpressPkg/Library/ArmVExpressSysConfigRuntimeLib/ArmVExpressSysConfigRuntimeLib.inf
 
 [LibraryClasses.ARM]
   ArmSoftFloatLib|ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf
@@ -60,7 +60,7 @@ [LibraryClasses.ARM]
   # syscfg MMIO register implementation on ARM.
   # This will not work at actual runtime.
   #
-  ResetSystemLib|Platform/ARM/VExpressPkg/Library/ResetSystemLib/ResetSystemLib.inf
+  ResetSystemLib|VExpressPkg/Library/ResetSystemLib/ResetSystemLib.inf
 
 [BuildOptions]
 !ifdef ARM_BIGLITTLE_TC2
@@ -68,11 +68,11 @@ [BuildOptions]
   *_*_ARM_PP_FLAGS  = -DARM_BIGLITTLE_TC2=1
 !endif
 
-  RVCT:*_*_ARM_PLATFORM_FLAGS == --cpu Cortex-A15 -I$(WORKSPACE)/Platform/ARM/VExpressPkg/Include/Platform/CTA15-A7
+  RVCT:*_*_ARM_PLATFORM_FLAGS == --cpu Cortex-A15 -I$(WORKSPACE)/VExpressPkg/Include/Platform/CTA15-A7
 
-  GCC:*_*_ARM_PLATFORM_FLAGS == -mcpu=cortex-a15 -I$(WORKSPACE)/Platform/ARM/VExpressPkg/Include/Platform/CTA15-A7
+  GCC:*_*_ARM_PLATFORM_FLAGS == -mcpu=cortex-a15 -I$(WORKSPACE)/VExpressPkg/Include/Platform/CTA15-A7
 
-  XCODE:*_*_ARM_PLATFORM_FLAGS = -I$(WORKSPACE)/Platform/ARM/VExpressPkg/Include/Platform/CTA15-A7
+  XCODE:*_*_ARM_PLATFORM_FLAGS = -I$(WORKSPACE)/VExpressPkg/Include/Platform/CTA15-A7
 
 ################################################################################
 #
@@ -189,7 +189,7 @@ [Components.common]
   #
   ArmPlatformPkg/PrePi/PeiMPCore.inf {
     <LibraryClasses>
-      ArmPlatformLib|Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/ArmVExpressLib.inf
+      ArmPlatformLib|VExpressPkg/Library/ArmVExpressLibCTA15-A7/ArmVExpressLib.inf
   }
 
   #
@@ -237,7 +237,7 @@ [Components.common]
   #
   # Platform
   #
-  Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.inf
+  VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.inf
 
   #
   # Filesystems
@@ -250,10 +250,10 @@ [Components.common]
   # Multimedia Card Interface
   #
   EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf
-  Platform/ARM/VExpressPkg/Drivers/PL180MciDxe/PL180MciDxe.inf
+  VExpressPkg/Drivers/PL180MciDxe/PL180MciDxe.inf
 
   # SMSC LAN 9118
-  Platform/ARM/VExpressPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf
+  VExpressPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf
 
   #
   # FAT filesystem + GPT/MBR partitioning
diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf
index 6bb1d540fe35..00dc813b69fb 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf
+++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf
@@ -97,13 +97,13 @@ [FV.FvMain]
   #
   # Platform
   #
-  INF Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.inf
+  INF VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.inf
 
   #
   # Multimedia Card Interface
   #
   INF EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf
-  INF Platform/ARM/VExpressPkg/Drivers/PL180MciDxe/PL180MciDxe.inf
+  INF VExpressPkg/Drivers/PL180MciDxe/PL180MciDxe.inf
 
   #
   # Filesystems
@@ -126,14 +126,14 @@ [FV.FvMain]
   #
   # USB support
   #
-  INF Platform/ARM/VExpressPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf
+  INF VExpressPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf
 
   #
   # Android Fastboot
   #
   INF EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf
   INF EmbeddedPkg/Drivers/AndroidFastbootTransportUsbDxe/FastbootTransportUsbDxe.inf
-  INF Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf
+  INF VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf
 
   # ACPI Support
   INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
@@ -141,9 +141,9 @@ [FV.FvMain]
   #
   # Networking stack
   #
-!include Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc
+!include VExpressPkg/ArmVExpress-networking.fdf.inc
 
-  INF Platform/ARM/VExpressPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf
+  INF VExpressPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf
 
   #
   # UEFI application
@@ -171,7 +171,7 @@ [FV.FvMain]
 
   # Example to add a Device Tree to the Firmware Volume
   #FILE FREEFORM = PCD(gArmVExpressTokenSpaceGuid.PcdFdtVExpressHwA15x2A7x3) {
-  #  SECTION RAW = Platform/ARM/VExpressPkg/Fdts/vexpress-v2p-ca15_a7.dtb
+  #  SECTION RAW = VExpressPkg/Fdts/vexpress-v2p-ca15_a7.dtb
   #}
 
 [FV.FVMAIN_COMPACT]
diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc
index cf7350649edb..98d9049a6e14 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc
+++ b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc
@@ -23,7 +23,7 @@ [Defines]
   SUPPORTED_ARCHITECTURES        = AARCH64
   BUILD_TARGETS                  = DEBUG|RELEASE
   SKUID_IDENTIFIER               = DEFAULT
-  FLASH_DEFINITION               = Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf
+  FLASH_DEFINITION               = VExpressPkg/ArmVExpress-FVP-AArch64.fdf
 
 !ifndef ARM_FVP_RUN_NORFLASH
   DEFINE EDK2_SKIP_PEICORE=1
@@ -31,19 +31,19 @@ [Defines]
 
   DT_SUPPORT                     = FALSE
 
-!include Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
+!include VExpressPkg/ArmVExpress.dsc.inc
 !include MdePkg/MdeLibs.dsc.inc
 !include DynamicTablesPkg/DynamicTables.dsc.inc
 
 [LibraryClasses.common]
   ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf
-  ArmPlatformLib|Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf
+  ArmPlatformLib|VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf
   ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf
 
-  ArmPlatformSysConfigLib|Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf
+  ArmPlatformSysConfigLib|VExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf
 !ifdef EDK2_ENABLE_PL111
   LcdHwLib|ArmPlatformPkg/Library/PL111Lcd/PL111Lcd.inf
-  LcdPlatformLib|Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpressLib.inf
+  LcdPlatformLib|VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpressLib.inf
 !endif
 
   # Virtio Support
@@ -53,24 +53,24 @@ [LibraryClasses.common]
   FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
 !endif
 
-  DtPlatformDtbLoaderLib|Platform/ARM/VExpressPkg/Library/ArmVExpressDtPlatformDtbLoaderLib/ArmVExpressDtPlatformDtbLoaderLib.inf
+  DtPlatformDtbLoaderLib|VExpressPkg/Library/ArmVExpressDtPlatformDtbLoaderLib/ArmVExpressDtPlatformDtbLoaderLib.inf
 
 [LibraryClasses.common.DXE_RUNTIME_DRIVER]
-  ArmPlatformSysConfigLib|Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigRuntimeLib/ArmVExpressSysConfigRuntimeLib.inf
+  ArmPlatformSysConfigLib|VExpressPkg/Library/ArmVExpressSysConfigRuntimeLib/ArmVExpressSysConfigRuntimeLib.inf
 
 [LibraryClasses.common.SEC]
-  ArmPlatformLib|Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf
+  ArmPlatformLib|VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf
 
 [LibraryClasses.common.UEFI_DRIVER, LibraryClasses.common.UEFI_APPLICATION, LibraryClasses.common.DXE_RUNTIME_DRIVER, LibraryClasses.common.DXE_DRIVER]
   PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
 
   PciExpressLib|MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf
-  PciHostBridgeLib|Platform/ARM/VExpressPkg/Library/ArmVExpressPciHostBridgeLib/ArmVExpressPciHostBridgeLib.inf
+  PciHostBridgeLib|VExpressPkg/Library/ArmVExpressPciHostBridgeLib/ArmVExpressPciHostBridgeLib.inf
   PciLib|MdePkg/Library/BasePciLibPciExpress/BasePciLibPciExpress.inf
   PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf
 
 [BuildOptions]
-  GCC:*_*_AARCH64_PLATFORM_FLAGS == -I$(WORKSPACE)/Platform/ARM/VExpressPkg/Include/Platform/RTSM
+  GCC:*_*_AARCH64_PLATFORM_FLAGS == -I$(WORKSPACE)/VExpressPkg/Include/Platform/RTSM
 
 
 ################################################################################
@@ -204,7 +204,7 @@ [Components.common]
   # UEFI is placed in RAM by bootloader
   ArmPlatformPkg/PrePi/PeiUniCore.inf {
     <LibraryClasses>
-      ArmPlatformLib|Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf
+      ArmPlatformLib|VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf
   }
 !else
   # UEFI lives in FLASH and copies itself to RAM
@@ -282,7 +282,7 @@ [Components.common]
 !endif
   }
 
-  Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf {
+  VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf {
     <PcdsFixedAtBuild>
       gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x1c090000
       gArmPlatformTokenSpaceGuid.PL011UartInterrupt|0x25
@@ -309,12 +309,12 @@ [Components.common]
   # Multimedia Card Interface
   #
   EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf
-  Platform/ARM/VExpressPkg/Drivers/PL180MciDxe/PL180MciDxe.inf
+  VExpressPkg/Drivers/PL180MciDxe/PL180MciDxe.inf
 
   #
   # Platform Driver
   #
-  Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.inf
+  VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.inf
   OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
 
   #
diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf
index 7635cb7a8406..102965615207 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf
+++ b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf
@@ -94,7 +94,7 @@ [FV.FvMain]
   INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
 
   # Configuration Manager
-  INF Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
+  INF VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
 
   #
   # Dynamic Table fdf
@@ -135,7 +135,7 @@ [FV.FvMain]
   # Multimedia Card Interface
   #
   INF EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf
-  INF Platform/ARM/VExpressPkg/Drivers/PL180MciDxe/PL180MciDxe.inf
+  INF VExpressPkg/Drivers/PL180MciDxe/PL180MciDxe.inf
 
   #
   # SMBIOS Support
@@ -145,12 +145,12 @@ [FV.FvMain]
   #
   # Platform Driver
   #
-  INF Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.inf
+  INF VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.inf
   INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
 
 !ifdef EDK2_ENABLE_SMSC_91X
-!include Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc
-  INF Platform/ARM/VExpressPkg/Drivers/Lan91xDxe/Lan91xDxe.inf
+!include VExpressPkg/ArmVExpress-networking.fdf.inc
+  INF VExpressPkg/Drivers/Lan91xDxe/Lan91xDxe.inf
 !endif
 
   #
@@ -196,12 +196,12 @@ [FV.FvMain]
 
   # builtin device tree binaries -- order matches ARM_VEXPRESS_PLATFORM_ID
   FILE FREEFORM = 25462CDA-221F-47DF-AC1D-259CFAA4E326 {
-    SECTION RAW = Platform/ARM/VExpressPkg/DeviceTree/fvp-base-gicv2-psci.dtb
-    SECTION RAW = Platform/ARM/VExpressPkg/DeviceTree/fvp-base-gicv2legacy-psci.dtb
-    SECTION RAW = Platform/ARM/VExpressPkg/DeviceTree/fvp-base-gicv3-psci.dtb
-    SECTION RAW = Platform/ARM/VExpressPkg/DeviceTree/fvp-foundation-gicv2-psci.dtb
-    SECTION RAW = Platform/ARM/VExpressPkg/DeviceTree/fvp-foundation-gicv2legacy-psci.dtb
-    SECTION RAW = Platform/ARM/VExpressPkg/DeviceTree/fvp-foundation-gicv3-psci.dtb
+    SECTION RAW = VExpressPkg/DeviceTree/fvp-base-gicv2-psci.dtb
+    SECTION RAW = VExpressPkg/DeviceTree/fvp-base-gicv2legacy-psci.dtb
+    SECTION RAW = VExpressPkg/DeviceTree/fvp-base-gicv3-psci.dtb
+    SECTION RAW = VExpressPkg/DeviceTree/fvp-foundation-gicv2-psci.dtb
+    SECTION RAW = VExpressPkg/DeviceTree/fvp-foundation-gicv2legacy-psci.dtb
+    SECTION RAW = VExpressPkg/DeviceTree/fvp-foundation-gicv3-psci.dtb
   }
 !endif
 
diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
index 1381867ac055..60f1926aced5 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
+++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
@@ -80,8 +80,8 @@ [LibraryClasses.common]
 
   # Versatile Express Specific Libraries
   PlatformPeiLib|ArmPlatformPkg/PlatformPei/PlatformPeiLib.inf
-  ArmPlatformSysConfigLib|Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf
-  NorFlashPlatformLib|Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf
+  ArmPlatformSysConfigLib|VExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf
+  NorFlashPlatformLib|VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf
   ResetSystemLib|ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
 
   # ARM PL031 RTC Driver
@@ -425,7 +425,7 @@ [Components.common]
 !include NetworkPkg/Network.dsc.inc
 !ifdef EDK2_ENABLE_SMSC_91X
   # SMSC LAN 91C111
-  Platform/ARM/VExpressPkg/Drivers/Lan91xDxe/Lan91xDxe.inf
+  VExpressPkg/Drivers/Lan91xDxe/Lan91xDxe.inf
 !endif
 
   #
@@ -433,7 +433,7 @@ [Components.common]
   #
   EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf
   EmbeddedPkg/Drivers/AndroidFastbootTransportUsbDxe/FastbootTransportUsbDxe.inf
-  Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf
+  VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf
 
   # FV Filesystem
   MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf
@@ -464,4 +464,4 @@ [Components.common]
 [Components.ARM]
 
   # ISP1761 USB OTG Controller
-  Platform/ARM/VExpressPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf
+  VExpressPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf
diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
index b53daf51d4b1..bbb3dd02ef8d 100644
--- a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
+++ b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
@@ -31,7 +31,7 @@ [Packages]
   DynamicTablesPkg/DynamicTablesPkg.dec
   MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
-  Platform/ARM/VExpressPkg/ArmVExpressPkg.dec
+  VExpressPkg/ArmVExpressPkg.dec
 
 [LibraryClasses]
   ArmPlatformLib
diff --git a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.inf b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.inf
index 14e02ad51d90..26798cdfb22c 100644
--- a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.inf
+++ b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.inf
@@ -23,7 +23,7 @@ [Packages]
   ArmPlatformPkg/ArmPlatformPkg.dec
   OvmfPkg/OvmfPkg.dec
   ArmCommonPkg/ArmCommonPkg.dec
-  Platform/ARM/VExpressPkg/ArmVExpressPkg.dec
+  VExpressPkg/ArmVExpressPkg.dec
 
 [LibraryClasses]
   ArmShellCmdRunAxfLib
diff --git a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf
index d95dc0268eba..5121177324d5 100644
--- a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf
+++ b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf
@@ -39,7 +39,7 @@ [Packages]
   MdeModulePkg/MdeModulePkg.dec
   ArmPlatformPkg/ArmPlatformPkg.dec
   ArmPkg/ArmPkg.dec
-  Platform/ARM/VExpressPkg/ArmVExpressPkg.dec
+  VExpressPkg/ArmVExpressPkg.dec
 
 [Pcd]
   gArmVExpressTokenSpaceGuid.PcdAndroidFastbootNvmDevicePath
diff --git a/Platform/ARM/VExpressPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf b/Platform/ARM/VExpressPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf
index 40efb73f5db9..2ebcf910ed2d 100644
--- a/Platform/ARM/VExpressPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf
+++ b/Platform/ARM/VExpressPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf
@@ -40,7 +40,7 @@ [Packages]
   EmbeddedPkg/EmbeddedPkg.dec
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
-  Platform/ARM/VExpressPkg/ArmVExpressPkg.dec
+  VExpressPkg/ArmVExpressPkg.dec
 
 [Pcd]
   gArmVExpressTokenSpaceGuid.PcdIsp1761BaseAddress
diff --git a/Platform/ARM/VExpressPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf b/Platform/ARM/VExpressPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf
index b289f80c35a5..988eb4a23ea0 100644
--- a/Platform/ARM/VExpressPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf
+++ b/Platform/ARM/VExpressPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf
@@ -31,7 +31,7 @@ [Packages]
   NetworkPkg/NetworkPkg.dec
   MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
-  Platform/ARM/VExpressPkg/ArmVExpressPkg.dec
+  VExpressPkg/ArmVExpressPkg.dec
 
 [LibraryClasses]
   BaseLib
diff --git a/Platform/ARM/VExpressPkg/Drivers/Lan91xDxe/Lan91xDxe.inf b/Platform/ARM/VExpressPkg/Drivers/Lan91xDxe/Lan91xDxe.inf
index 11a9f74c50f4..61fa01dbfa7e 100644
--- a/Platform/ARM/VExpressPkg/Drivers/Lan91xDxe/Lan91xDxe.inf
+++ b/Platform/ARM/VExpressPkg/Drivers/Lan91xDxe/Lan91xDxe.inf
@@ -33,7 +33,7 @@ [Packages]
   MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
   NetworkPkg/NetworkPkg.dec
-  Platform/ARM/VExpressPkg/ArmVExpressPkg.dec
+  VExpressPkg/ArmVExpressPkg.dec
 
 [LibraryClasses]
   ArmLib
diff --git a/Platform/ARM/VExpressPkg/Drivers/PL180MciDxe/PL180MciDxe.inf b/Platform/ARM/VExpressPkg/Drivers/PL180MciDxe/PL180MciDxe.inf
index 34690a135e16..ff1407aefd4e 100644
--- a/Platform/ARM/VExpressPkg/Drivers/PL180MciDxe/PL180MciDxe.inf
+++ b/Platform/ARM/VExpressPkg/Drivers/PL180MciDxe/PL180MciDxe.inf
@@ -29,7 +29,7 @@ [Sources.common]
 [Packages]
   EmbeddedPkg/EmbeddedPkg.dec
   MdePkg/MdePkg.dec
-  Platform/ARM/VExpressPkg/ArmVExpressPkg.dec
+  VExpressPkg/ArmVExpressPkg.dec
 
 [LibraryClasses]
   BaseLib
diff --git a/Platform/ARM/VExpressPkg/Library/ArmMaliDpLib/ArmMaliDpLib.inf b/Platform/ARM/VExpressPkg/Library/ArmMaliDpLib/ArmMaliDpLib.inf
index 784e84bd9293..c230d33510db 100644
--- a/Platform/ARM/VExpressPkg/Library/ArmMaliDpLib/ArmMaliDpLib.inf
+++ b/Platform/ARM/VExpressPkg/Library/ArmMaliDpLib/ArmMaliDpLib.inf
@@ -20,7 +20,7 @@ [Sources.common]
 [Packages]
   ArmPlatformPkg/ArmPlatformPkg.dec
   MdePkg/MdePkg.dec
-  Platform/ARM/VExpressPkg/ArmVExpressPkg.dec
+  VExpressPkg/ArmVExpressPkg.dec
 
 [LibraryClasses]
   BaseLib
diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressDtPlatformDtbLoaderLib/ArmVExpressDtPlatformDtbLoaderLib.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressDtPlatformDtbLoaderLib/ArmVExpressDtPlatformDtbLoaderLib.inf
index 7992ffa22c91..823233a4153b 100644
--- a/Platform/ARM/VExpressPkg/Library/ArmVExpressDtPlatformDtbLoaderLib/ArmVExpressDtPlatformDtbLoaderLib.inf
+++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressDtPlatformDtbLoaderLib/ArmVExpressDtPlatformDtbLoaderLib.inf
@@ -20,7 +20,7 @@ [Sources]
 [Packages]
   ArmPkg/ArmPkg.dec
   MdePkg/MdePkg.dec
-  Platform/ARM/VExpressPkg/ArmVExpressPkg.dec
+  VExpressPkg/ArmVExpressPkg.dec
   EmbeddedPkg/EmbeddedPkg.dec
 
 [LibraryClasses]
diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/ArmVExpressLib.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/ArmVExpressLib.inf
index e585fe6c1876..d2bf15aa405e 100644
--- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/ArmVExpressLib.inf
+++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/ArmVExpressLib.inf
@@ -20,7 +20,7 @@ [Packages]
   EmbeddedPkg/EmbeddedPkg.dec
   MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
-  Platform/ARM/VExpressPkg/ArmVExpressPkg.dec
+  VExpressPkg/ArmVExpressPkg.dec
 
 [LibraryClasses]
   IoLib
diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf
index 929dadc28a84..8ff24785939a 100644
--- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf
+++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf
@@ -19,7 +19,7 @@ [Packages]
   EmbeddedPkg/EmbeddedPkg.dec
   ArmPkg/ArmPkg.dec
   ArmPlatformPkg/ArmPlatformPkg.dec
-  Platform/ARM/VExpressPkg/ArmVExpressPkg.dec
+  VExpressPkg/ArmVExpressPkg.dec
 
 [LibraryClasses]
   IoLib
diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf
index ede7ab0a32ce..7271ff5ab298 100644
--- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf
+++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf
@@ -16,7 +16,7 @@ [Defines]
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
-  Platform/ARM/VExpressPkg/ArmVExpressPkg.dec
+  VExpressPkg/ArmVExpressPkg.dec
   EmbeddedPkg/EmbeddedPkg.dec
   ArmPkg/ArmPkg.dec
   ArmPlatformPkg/ArmPlatformPkg.dec
diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressPciHostBridgeLib/ArmVExpressPciHostBridgeLib.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressPciHostBridgeLib/ArmVExpressPciHostBridgeLib.inf
index e5080074e2e9..39e6d0e112b4 100644
--- a/Platform/ARM/VExpressPkg/Library/ArmVExpressPciHostBridgeLib/ArmVExpressPciHostBridgeLib.inf
+++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressPciHostBridgeLib/ArmVExpressPciHostBridgeLib.inf
@@ -29,7 +29,7 @@ [Packages]
   ArmPkg/ArmPkg.dec
   MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
-  Platform/ARM/VExpressPkg/ArmVExpressPkg.dec
+  VExpressPkg/ArmVExpressPkg.dec
 
 [LibraryClasses]
   IoLib
diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf
index 36f447ee79bd..feb00a41c4ff 100644
--- a/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf
+++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf
@@ -22,7 +22,7 @@ [Sources.common]
 [Packages]
   ArmPlatformPkg/ArmPlatformPkg.dec
   MdePkg/MdePkg.dec
-  Platform/ARM/VExpressPkg/ArmVExpressPkg.dec
+  VExpressPkg/ArmVExpressPkg.dec
 
 [LibraryClasses]
   BaseLib
diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigRuntimeLib/ArmVExpressSysConfigRuntimeLib.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigRuntimeLib/ArmVExpressSysConfigRuntimeLib.inf
index 5179165f98e2..5aa8aefb790d 100644
--- a/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigRuntimeLib/ArmVExpressSysConfigRuntimeLib.inf
+++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigRuntimeLib/ArmVExpressSysConfigRuntimeLib.inf
@@ -23,7 +23,7 @@ [Sources.common]
 [Packages]
   ArmPlatformPkg/ArmPlatformPkg.dec
   MdePkg/MdePkg.dec
-  Platform/ARM/VExpressPkg/ArmVExpressPkg.dec
+  VExpressPkg/ArmVExpressPkg.dec
 
 [LibraryClasses]
   BaseLib
diff --git a/Platform/ARM/VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpressLib.inf b/Platform/ARM/VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpressLib.inf
index 191261d0629a..aa4d98b91935 100644
--- a/Platform/ARM/VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpressLib.inf
+++ b/Platform/ARM/VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpressLib.inf
@@ -22,7 +22,7 @@ [Sources.common]
 [Packages]
   ArmPlatformPkg/ArmPlatformPkg.dec
   MdePkg/MdePkg.dec
-  Platform/ARM/VExpressPkg/ArmVExpressPkg.dec
+  VExpressPkg/ArmVExpressPkg.dec
 
 [LibraryClasses]
   ArmPlatformSysConfigLib
diff --git a/Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf b/Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf
index a411ba4d0072..736230e53160 100644
--- a/Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf
+++ b/Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf
@@ -19,7 +19,7 @@ [Sources.common]
 [Packages]
   MdePkg/MdePkg.dec
   ArmPlatformPkg/ArmPlatformPkg.dec
-  Platform/ARM/VExpressPkg/ArmVExpressPkg.dec
+  VExpressPkg/ArmVExpressPkg.dec
 
 [LibraryClasses]
   BaseLib
diff --git a/Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpressLib.inf b/Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpressLib.inf
index 999a0814f508..afa950846260 100644
--- a/Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpressLib.inf
+++ b/Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpressLib.inf
@@ -22,7 +22,7 @@ [Sources.common]
 [Packages]
   ArmPlatformPkg/ArmPlatformPkg.dec
   MdePkg/MdePkg.dec
-  Platform/ARM/VExpressPkg/ArmVExpressPkg.dec
+  VExpressPkg/ArmVExpressPkg.dec
 
 [LibraryClasses]
   ArmPlatformSysConfigLib
diff --git a/Platform/ARM/VExpressPkg/Library/ResetSystemLib/ResetSystemLib.inf b/Platform/ARM/VExpressPkg/Library/ResetSystemLib/ResetSystemLib.inf
index e18df3c0baec..37e00bd5bc60 100644
--- a/Platform/ARM/VExpressPkg/Library/ResetSystemLib/ResetSystemLib.inf
+++ b/Platform/ARM/VExpressPkg/Library/ResetSystemLib/ResetSystemLib.inf
@@ -24,7 +24,7 @@ [Packages]
   ArmPlatformPkg/ArmPlatformPkg.dec
   MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
-  Platform/ARM/VExpressPkg/ArmVExpressPkg.dec
+  VExpressPkg/ArmVExpressPkg.dec
 
 [LibraryClasses]
   DebugLib
diff --git a/Platform/Comcast/RDKQemu/RDKQemu.fdf b/Platform/Comcast/RDKQemu/RDKQemu.fdf
index 953a72c955c4..50b1929d6136 100644
--- a/Platform/Comcast/RDKQemu/RDKQemu.fdf
+++ b/Platform/Comcast/RDKQemu/RDKQemu.fdf
@@ -111,7 +111,7 @@ [FV.FVMAIN_COMPACT]
   #
   # 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 Drivers/FdtPlatformDxe/FdtPlatformDxe.inf
 
   FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
     SECTION GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF PROCESSING_REQUIRED = TRUE {
diff --git a/Readme.md b/Readme.md
index 62876b4b7d75..c9fd8e987cb7 100644
--- a/Readme.md
+++ b/Readme.md
@@ -157,7 +157,7 @@ $ NUM_CPUS=$((`getconf _NPROCESSORS_ONLN` + 2))
 For the toolchain tag, use GCC5 for gcc version 5 or later, GCC4x for
 earlier versions, or CLANG35/CLANG38 as appropriate when building with clang.
 ```
-$ build -n $NUM_CPUS -a AARCH64 -t GCC5 -p Platform/ARM/JunoPkg/ArmJuno.dsc
+$ build -n $NUM_CPUS -a AARCH64 -t GCC5 -p JunoPkg/ArmJuno.dsc
 ```
 (Note that the description file gets resolved by the build command through
 searching in all locations specified in **PACKAGES_PATH**.)
-- 
2.17.1


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

* [RFC PATCH edk2-platforms v1 7/7] Platform/ARM: Alphabetically order sections in inf files
  2021-09-20 14:04 [RFC PATCH edk2-platforms v1 0/7] Modify Platform/ARM file structure PierreGondois
                   ` (5 preceding siblings ...)
  2021-09-20 14:04 ` [RFC PATCH edk2-platforms v1 6/7] Platform/ARM: Remove Platform/ARM prefix PierreGondois
@ 2021-09-20 14:04 ` PierreGondois
  6 siblings, 0 replies; 8+ messages in thread
From: PierreGondois @ 2021-09-20 14:04 UTC (permalink / raw)
  To: devel, Sean Brogan, Ard Biesheuvel, Leif Lindholm, Sami Mujawar
  Cc: Liming Gao, Thomas Abraham

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

Removing the "Platform/ARM/" prefix changes the order of
alphabetically ordered files in the "Package" section of inf files.
Re-order them.

Also to re-order the "LibraryClasses" and "Sources" sections when
necessary.

Bugzilla: 3264 (https://bugzilla.tianocore.org/show_bug.cgi?id=3264)
Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
---
 .../ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFs.inf   |  8 ++++----
 .../Drivers/FdtPlatformDxe/FdtPlatformDxe.inf          |  2 +-
 .../Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf    | 10 +++++-----
 Platform/ARM/ArmCommonPkg/Library/BdsLib/BdsLib.inf    |  4 ++--
 Platform/ARM/JunoPkg/AcpiTables/AcpiTables.inf         | 10 +++++-----
 .../ConfigurationManagerDxe.inf                        |  4 ++--
 Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf | 10 +++++-----
 .../JunoPkg/Drivers/SataSiI3132Dxe/SataSiI3132Dxe.inf  |  2 +-
 Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf |  8 ++++----
 .../JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlLib.inf    |  2 +-
 .../Library/HdLcdArmJunoLib/HdLcdArmJunoLib.inf        |  2 +-
 .../JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf      |  2 +-
 .../Library/NorFlashJunoLib/NorFlashJunoLib.inf        |  2 +-
 .../JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf    |  4 ++--
 .../ARM/Morello/Drivers/PlatformDxe/PlatformDxeFvp.inf |  2 +-
 Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf  |  2 +-
 Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf  |  2 +-
 .../ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf     |  2 +-
 Platform/ARM/SgiPkg/AcpiTables/RdN2AcpiTables.inf      |  2 +-
 Platform/ARM/SgiPkg/AcpiTables/RdN2Cfg1AcpiTables.inf  |  2 +-
 Platform/ARM/SgiPkg/AcpiTables/RdV1AcpiTables.inf      |  2 +-
 Platform/ARM/SgiPkg/AcpiTables/RdV1McAcpiTables.inf    |  2 +-
 Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf    |  2 +-
 .../Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf    |  8 ++++----
 .../Library/PciHostBridgeLib/PciHostBridgeLib.inf      |  4 ++--
 .../ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf     |  2 +-
 .../ConfigurationManagerDxe.inf                        |  2 +-
 .../VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.inf   |  6 +++---
 .../VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.inf    |  2 +-
 .../ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf  |  6 +++---
 .../Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf            |  2 +-
 .../ARM/VExpressPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf  | 10 +++++-----
 .../VExpressPkg/Drivers/PL180MciDxe/PL180MciDxe.inf    |  6 +++---
 .../ArmVExpressDtPlatformDtbLoaderLib.inf              |  2 +-
 .../Library/ArmVExpressLibCTA15-A7/ArmVExpressLib.inf  |  4 ++--
 .../Library/ArmVExpressLibRTSM/ArmVExpressLib.inf      | 10 +++++-----
 .../Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf   | 10 +++++-----
 .../NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf  |  2 +-
 .../Library/ResetSystemLib/ResetSystemLib.inf          |  2 +-
 39 files changed, 83 insertions(+), 83 deletions(-)

diff --git a/Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFs.inf b/Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFs.inf
index 258eaf1204c0..04560a7c1911 100644
--- a/Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFs.inf
+++ b/Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFs.inf
@@ -17,18 +17,18 @@ [Defines]
   ENTRY_POINT                    = BootMonFsEntryPoint
 
 [Sources]
-  BootMonFsEntryPoint.c
-  BootMonFsOpenClose.c
   BootMonFsDir.c
+  BootMonFsEntryPoint.c
   BootMonFsImages.c
+  BootMonFsOpenClose.c
   BootMonFsReadWrite.c
   BootMonFsUnsupported.c
 
 [Packages]
+  ArmCommonPkg/ArmCommonPkg.dec
   ArmPlatformPkg/ArmPlatformPkg.dec
-  MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
-  ArmCommonPkg/ArmCommonPkg.dec
+  MdePkg/MdePkg.dec
 
 [LibraryClasses]
   BaseLib
diff --git a/Platform/ARM/ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf b/Platform/ARM/ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf
index 7f0beb100cce..e7b68356585e 100644
--- a/Platform/ARM/ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf
+++ b/Platform/ARM/ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf
@@ -22,10 +22,10 @@ [Sources.common]
   ShellSetFdt.c
 
 [Packages]
+  ArmCommonPkg/ArmCommonPkg.dec
   EmbeddedPkg/EmbeddedPkg.dec
   MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
-  ArmCommonPkg/ArmCommonPkg.dec
   ShellPkg/ShellPkg.dec
 
 [LibraryClasses]
diff --git a/Platform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf b/Platform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf
index 52d6bce28ecc..fdd238f5b621 100644
--- a/Platform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf
+++ b/Platform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf
@@ -17,15 +17,15 @@ [Defines]
 [Sources.common]
   ArmShellCmdRunAxf.c
   ArmShellCmdRunAxf.uni
-  RunAxf.c
-  BootMonFsLoader.h
   BootMonFsLoader.c
-  ElfLoader.h
+  BootMonFsLoader.h
   ElfLoader.c
+  ElfLoader.h
+  RunAxf.c
   # ELF definitions taken from BaseTools
+  elf_common.h
   elf32.h
   elf64.h
-  elf_common.h
 
 [Sources.AARCH64]
   AArch64/Pivot.S
@@ -34,10 +34,10 @@ [Sources.ARM]
   Arm/Pivot.S
 
 [Packages]
+  ArmCommonPkg/ArmCommonPkg.dec
   ArmPkg/ArmPkg.dec
   MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
-  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 4157a598cc6e..cb734c08fc4d 100644
--- a/Platform/ARM/ArmCommonPkg/Library/BdsLib/BdsLib.inf
+++ b/Platform/ARM/ArmCommonPkg/Library/BdsLib/BdsLib.inf
@@ -19,11 +19,11 @@ [Sources.common]
   BdsHelper.c
 
 [Packages]
+  ArmCommonPkg/ArmCommonPkg.dec
   EmbeddedPkg/EmbeddedPkg.dec
   MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
   NetworkPkg/NetworkPkg.dec
-  ArmCommonPkg/ArmCommonPkg.dec
 
 [LibraryClasses]
   ArmLib
@@ -31,8 +31,8 @@ [LibraryClasses]
   DebugLib
   DevicePathLib
   HobLib
-  PcdLib
   NetLib
+  PcdLib
 
 [Guids]
   gEfiFileInfoGuid
diff --git a/Platform/ARM/JunoPkg/AcpiTables/AcpiTables.inf b/Platform/ARM/JunoPkg/AcpiTables/AcpiTables.inf
index 20030a5e54fb..a7353238128f 100644
--- a/Platform/ARM/JunoPkg/AcpiTables/AcpiTables.inf
+++ b/Platform/ARM/JunoPkg/AcpiTables/AcpiTables.inf
@@ -16,21 +16,21 @@ [Defines]
   VERSION_STRING                 = 1.0
 
 [Sources]
-  Dsdt.asl
+  AcpiSsdtRootPci.asl          # Juno R1 specific
   Dbg2.aslc
-  Spcr.aslc
+  Dsdt.asl
   Fadt.aslc
   Gtdt.aslc
   Madt.aslc
-  AcpiSsdtRootPci.asl          # Juno R1 specific
+  Spcr.aslc
 
 [Packages]
   ArmPkg/ArmPkg.dec
   ArmPlatformPkg/ArmPlatformPkg.dec
   EmbeddedPkg/EmbeddedPkg.dec
-  MdePkg/MdePkg.dec
-  MdeModulePkg/MdeModulePkg.dec
   JunoPkg/ArmJuno.dec
+  MdeModulePkg/MdeModulePkg.dec
+  MdePkg/MdePkg.dec
 
 [FixedPcd]
   gArmPlatformTokenSpaceGuid.PcdCoreCount
diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
index b496756295bd..0323240355de 100644
--- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
+++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
@@ -21,18 +21,18 @@ [Defines]
 #
 
 [Sources]
-  ConfigurationManager.c
   AslTables/Dsdt.asl
   AslTables/SsdtJunoUsb.asl
   AslTables/SsdtPci.asl
+  ConfigurationManager.c
 
 [Packages]
   ArmPkg/ArmPkg.dec
   ArmPlatformPkg/ArmPlatformPkg.dec
   DynamicTablesPkg/DynamicTablesPkg.dec
+  JunoPkg/ArmJuno.dec
   MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
-  JunoPkg/ArmJuno.dec
 
 [LibraryClasses]
   ArmPlatformLib
diff --git a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf b/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf
index 3d14332b3ea0..1f14edf9a900 100644
--- a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf
+++ b/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf
@@ -17,13 +17,13 @@ [Sources.common]
   ArmJunoDxe.c
 
 [Packages]
+  ArmCommonPkg/ArmCommonPkg.dec
   ArmPkg/ArmPkg.dec
   ArmPlatformPkg/ArmPlatformPkg.dec
   EmbeddedPkg/EmbeddedPkg.dec
-  MdePkg/MdePkg.dec
-  MdeModulePkg/MdeModulePkg.dec
-  ArmCommonPkg/ArmCommonPkg.dec
   JunoPkg/ArmJuno.dec
+  MdeModulePkg/MdeModulePkg.dec
+  MdePkg/MdePkg.dec
 
 [LibraryClasses]
   AcpiLib
@@ -38,9 +38,9 @@ [LibraryClasses]
   PrintLib
   SerialPortLib
   UefiBootServicesTableLib
-  UefiRuntimeServicesTableLib
-  UefiLib
   UefiDriverEntryPoint
+  UefiLib
+  UefiRuntimeServicesTableLib
 
 [Guids]
   gEfiFileInfoGuid
diff --git a/Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SataSiI3132Dxe.inf b/Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SataSiI3132Dxe.inf
index be9c08bc5f88..5174ff9501d8 100644
--- a/Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SataSiI3132Dxe.inf
+++ b/Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SataSiI3132Dxe.inf
@@ -23,8 +23,8 @@ [Defines]
   ENTRY_POINT                    = InitializeSataSiI3132
 
 [Packages]
-  MdePkg/MdePkg.dec
   JunoPkg/ArmJuno.dec
+  MdePkg/MdePkg.dec
 
 [LibraryClasses]
   MemoryAllocationLib
diff --git a/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf b/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf
index cc24f5e895ce..3923b6ffba47 100644
--- a/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf
+++ b/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf
@@ -13,17 +13,17 @@ [Defines]
   LIBRARY_CLASS                  = ArmPlatformLib
 
 [Packages]
-  MdePkg/MdePkg.dec
-  MdeModulePkg/MdeModulePkg.dec
-  EmbeddedPkg/EmbeddedPkg.dec
   ArmPkg/ArmPkg.dec
   ArmPlatformPkg/ArmPlatformPkg.dec
+  EmbeddedPkg/EmbeddedPkg.dec
   JunoPkg/ArmJuno.dec
+  MdeModulePkg/MdeModulePkg.dec
+  MdePkg/MdePkg.dec
 
 [LibraryClasses]
-  IoLib
   ArmLib
   HobLib
+  IoLib
   MemoryAllocationLib
   SerialPortLib
 
diff --git a/Platform/ARM/JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlLib.inf b/Platform/ARM/JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlLib.inf
index 55a18031df3f..8b833ba57da9 100644
--- a/Platform/ARM/JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlLib.inf
+++ b/Platform/ARM/JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlLib.inf
@@ -18,8 +18,8 @@ [Sources.common]
 [Packages]
   ArmPkg/ArmPkg.dec
   ArmPlatformPkg/ArmPlatformPkg.dec
-  MdePkg/MdePkg.dec
   JunoPkg/ArmJuno.dec
+  MdePkg/MdePkg.dec
 
 [LibraryClasses]
   ArmLib
diff --git a/Platform/ARM/JunoPkg/Library/HdLcdArmJunoLib/HdLcdArmJunoLib.inf b/Platform/ARM/JunoPkg/Library/HdLcdArmJunoLib/HdLcdArmJunoLib.inf
index a34dceb7bdc0..fe9b666a4c45 100644
--- a/Platform/ARM/JunoPkg/Library/HdLcdArmJunoLib/HdLcdArmJunoLib.inf
+++ b/Platform/ARM/JunoPkg/Library/HdLcdArmJunoLib/HdLcdArmJunoLib.inf
@@ -22,8 +22,8 @@ [Sources.common]
 [Packages]
   ArmPkg/ArmPkg.dec
   ArmPlatformPkg/ArmPlatformPkg.dec
-  MdePkg/MdePkg.dec
   JunoPkg/ArmJuno.dec
+  MdePkg/MdePkg.dec
 
 [LibraryClasses]
   BaseLib
diff --git a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf
index 4f3f3c708715..7f52562e7e98 100644
--- a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf
+++ b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf
@@ -30,9 +30,9 @@ [Sources]
 
 [Packages]
   ArmPkg/ArmPkg.dec
+  JunoPkg/ArmJuno.dec
   MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
-  JunoPkg/ArmJuno.dec
 
 [LibraryClasses]
   BaseLib
diff --git a/Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJunoLib.inf b/Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJunoLib.inf
index 5064409173b1..2d654cc7758f 100644
--- a/Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJunoLib.inf
+++ b/Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJunoLib.inf
@@ -18,8 +18,8 @@ [Sources.common]
 
 [Packages]
   ArmPlatformPkg/ArmPlatformPkg.dec
-  MdePkg/MdePkg.dec
   JunoPkg/ArmJuno.dec
+  MdePkg/MdePkg.dec
 
 [LibraryClasses]
   BaseLib
diff --git a/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf b/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
index 8f0231314678..d18a561fbab1 100644
--- a/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
+++ b/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
@@ -30,14 +30,14 @@ [Sources]
 [Packages]
   ArmPkg/ArmPkg.dec
   ArmPlatformPkg/ArmPlatformPkg.dec
+  JunoPkg/ArmJuno.dec
   MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
-  JunoPkg/ArmJuno.dec
 
 [LibraryClasses]
   ArmLib
-  BaseMemoryLib
   BaseLib
+  BaseMemoryLib
   DebugLib
   HobLib
   IoLib
diff --git a/Platform/ARM/Morello/Drivers/PlatformDxe/PlatformDxeFvp.inf b/Platform/ARM/Morello/Drivers/PlatformDxe/PlatformDxeFvp.inf
index 5e773543b39d..a4428f382e49 100644
--- a/Platform/ARM/Morello/Drivers/PlatformDxe/PlatformDxeFvp.inf
+++ b/Platform/ARM/Morello/Drivers/PlatformDxe/PlatformDxeFvp.inf
@@ -21,8 +21,8 @@ [Sources.common]
 
 [Packages]
   MdePkg/MdePkg.dec
-  OvmfPkg/OvmfPkg.dec
   Morello/MorelloPlatform.dec
+  OvmfPkg/OvmfPkg.dec
 
 [LibraryClasses]
   UefiDriverEntryPoint
diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf
index 409d3aa5ccbc..0a1503884db3 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf
+++ b/Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf
@@ -16,7 +16,6 @@ [Defines]
 
 [Sources]
   Dbg2.aslc
-  SsdtRos.asl
   Fadt.aslc
   Gtdt.aslc
   Iort.aslc
@@ -27,6 +26,7 @@ [Sources]
   Spcr.aslc
   Ssdt.asl
   SsdtEvents.asl
+  SsdtRos.asl
 
 [Packages]
   ArmPkg/ArmPkg.dec
diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf
index c74685bec7b2..767073ff8a0c 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf
+++ b/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf
@@ -16,7 +16,6 @@ [Defines]
 
 [Sources]
   Dbg2.aslc
-  SsdtRos.asl
   Fadt.aslc
   Gtdt.aslc
   Iort.aslc
@@ -27,6 +26,7 @@ [Sources]
   Spcr.aslc
   Ssdt.asl
   SsdtEvents.asl
+  SsdtRos.asl
 
 [Packages]
   ArmPkg/ArmPkg.dec
diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf
index 1ad34860fa7b..c4e29a485f44 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf
+++ b/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf
@@ -16,7 +16,6 @@ [Defines]
 
 [Sources]
   Dbg2.aslc
-  SsdtRos.asl
   Fadt.aslc
   Gtdt.aslc
   Iort.aslc
@@ -29,6 +28,7 @@ [Sources]
   Spcr.aslc
   Ssdt.asl
   SsdtEvents.asl
+  SsdtRos.asl
 
 [Packages]
   ArmPkg/ArmPkg.dec
diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN2AcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/RdN2AcpiTables.inf
index c136ea4320e0..60ef6744294f 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/RdN2AcpiTables.inf
+++ b/Platform/ARM/SgiPkg/AcpiTables/RdN2AcpiTables.inf
@@ -25,8 +25,8 @@ [Sources]
   RdN2/Pptt.aslc
   Spcr.aslc
   Ssdt.asl
-  SsdtRos.asl
   SsdtEvents.asl
+  SsdtRos.asl
 
 [Packages]
   ArmPkg/ArmPkg.dec
diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN2Cfg1AcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/RdN2Cfg1AcpiTables.inf
index 36bc95615f86..574f332985d6 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/RdN2Cfg1AcpiTables.inf
+++ b/Platform/ARM/SgiPkg/AcpiTables/RdN2Cfg1AcpiTables.inf
@@ -25,8 +25,8 @@ [Sources]
   RdN2Cfg1/Pptt.aslc
   Spcr.aslc
   Ssdt.asl
-  SsdtRos.asl
   SsdtEvents.asl
+  SsdtRos.asl
 
 [Packages]
   ArmPkg/ArmPkg.dec
diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdV1AcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/RdV1AcpiTables.inf
index d5b6479e4f44..808033405512 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/RdV1AcpiTables.inf
+++ b/Platform/ARM/SgiPkg/AcpiTables/RdV1AcpiTables.inf
@@ -16,7 +16,6 @@ [Defines]
 
 [Sources]
   Dbg2.aslc
-  SsdtRos.asl
   Fadt.aslc
   Gtdt.aslc
   Iort.aslc
@@ -27,6 +26,7 @@ [Sources]
   Spcr.aslc
   Ssdt.asl
   SsdtEvents.asl
+  SsdtRos.asl
 
 [Packages]
   ArmPkg/ArmPkg.dec
diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdV1McAcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/RdV1McAcpiTables.inf
index 3863237d2a0c..86c8257c9bcd 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/RdV1McAcpiTables.inf
+++ b/Platform/ARM/SgiPkg/AcpiTables/RdV1McAcpiTables.inf
@@ -16,7 +16,6 @@ [Defines]
 
 [Sources]
   Dbg2.aslc
-  SsdtRos.asl
   Fadt.aslc
   Gtdt.aslc
   Iort.aslc
@@ -29,6 +28,7 @@ [Sources]
   Spcr.aslc
   Ssdt.asl
   SsdtEvents.asl
+  SsdtRos.asl
 
 [Packages]
   ArmPkg/ArmPkg.dec
diff --git a/Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf
index 7b536e823869..e6ae131aba3c 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf
+++ b/Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf
@@ -25,8 +25,8 @@ [Sources]
   Sgi575/Pptt.aslc
   Spcr.aslc
   Ssdt.asl
-  SsdtRos.asl
   SsdtEvents.asl
+  SsdtRos.asl
 
 [Packages]
   ArmPkg/ArmPkg.dec
diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
index 3ed6def28003..08241b85590e 100644
--- a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
+++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
@@ -16,14 +16,14 @@ [Defines]
 [Sources]
   SmbiosPlatformDxe.c
   Type0BiosInformation.c
-  Type1SystemInformation.c
-  Type3SystemEnclosure.c
-  Type4ProcessorInformation.c
-  Type7CacheInformation.c
   Type16PhysicalMemoryArray.c
   Type17MemoryDevice.c
   Type19MemoryArrayMappedAddress.c
+  Type1SystemInformation.c
   Type32SystemBootInformation.c
+  Type3SystemEnclosure.c
+  Type4ProcessorInformation.c
+  Type7CacheInformation.c
 
 [Packages]
   ArmPkg/ArmPkg.dec
diff --git a/Platform/ARM/SgiPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf b/Platform/ARM/SgiPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf
index a9fdd874d049..17c2bb01b821 100644
--- a/Platform/ARM/SgiPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf
+++ b/Platform/ARM/SgiPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf
@@ -27,9 +27,9 @@ [Sources]
   PciHostBridgeLib.c
 
 [Packages]
-  MdePkg/MdePkg.dec
-  MdeModulePkg/MdeModulePkg.dec
   ArmPkg/ArmPkg.dec
+  MdeModulePkg/MdeModulePkg.dec
+  MdePkg/MdePkg.dec
 
 [LibraryClasses]
   BaseLib
diff --git a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf b/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf
index f86167cccd70..00452b678c72 100644
--- a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf
+++ b/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf
@@ -30,8 +30,8 @@ [LibraryClasses]
   SerialPortLib
 
 [Sources.common]
-  PlatformLibMem.c
   PlatformLib.c
+  PlatformLibMem.c
 
 [Sources.AARCH64]
   AArch64/Helper.S | GCC
diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
index bbb3dd02ef8d..477b16852156 100644
--- a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
+++ b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
@@ -21,9 +21,9 @@ [Defines]
 #
 
 [Sources]
-  ConfigurationManager.c
   AslTables/Dsdt.asl
   AslTables/SsdtPci.asl
+  ConfigurationManager.c
 
 [Packages]
   ArmPkg/ArmPkg.dec
diff --git a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.inf b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.inf
index 26798cdfb22c..d2dce0058bd4 100644
--- a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.inf
+++ b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.inf
@@ -18,11 +18,11 @@ [Sources.common]
   ArmFvpDxe.c
 
 [Packages]
-  MdePkg/MdePkg.dec
+  ArmCommonPkg/ArmCommonPkg.dec
   ArmPkg/ArmPkg.dec
   ArmPlatformPkg/ArmPlatformPkg.dec
+  MdePkg/MdePkg.dec
   OvmfPkg/OvmfPkg.dec
-  ArmCommonPkg/ArmCommonPkg.dec
   VExpressPkg/ArmVExpressPkg.dec
 
 [LibraryClasses]
@@ -30,7 +30,7 @@ [LibraryClasses]
   BaseMemoryLib
   IoLib
   TimerLib
-  UefiDriverEntryPoint
   UefiBootServicesTableLib
+  UefiDriverEntryPoint
   VirtioMmioDeviceLib
 
diff --git a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.inf b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.inf
index 93a51de12368..a2ebd3b10099 100644
--- a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.inf
+++ b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.inf
@@ -18,9 +18,9 @@ [Sources.common]
   ArmHwDxe.c
 
 [Packages]
+  ArmCommonPkg/ArmCommonPkg.dec
   ArmPlatformPkg/ArmPlatformPkg.dec
   MdePkg/MdePkg.dec
-  ArmCommonPkg/ArmCommonPkg.dec
 
 [LibraryClasses]
   ArmShellCmdRunAxfLib
diff --git a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf
index 5121177324d5..ba30409a50c0 100644
--- a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf
+++ b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf
@@ -34,11 +34,11 @@ [Protocols]
   gEfiDiskIoProtocolGuid
 
 [Packages]
+  ArmPkg/ArmPkg.dec
+  ArmPlatformPkg/ArmPlatformPkg.dec
   EmbeddedPkg/EmbeddedPkg.dec
-  MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
-  ArmPlatformPkg/ArmPlatformPkg.dec
-  ArmPkg/ArmPkg.dec
+  MdePkg/MdePkg.dec
   VExpressPkg/ArmVExpressPkg.dec
 
 [Pcd]
diff --git a/Platform/ARM/VExpressPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf b/Platform/ARM/VExpressPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf
index 2ebcf910ed2d..7a1aa87ba86e 100644
--- a/Platform/ARM/VExpressPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf
+++ b/Platform/ARM/VExpressPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf
@@ -38,8 +38,8 @@ [Protocols]
 
 [Packages]
   EmbeddedPkg/EmbeddedPkg.dec
-  MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
+  MdePkg/MdePkg.dec
   VExpressPkg/ArmVExpressPkg.dec
 
 [Pcd]
diff --git a/Platform/ARM/VExpressPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf b/Platform/ARM/VExpressPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf
index 988eb4a23ea0..6b8e5d75a89e 100644
--- a/Platform/ARM/VExpressPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf
+++ b/Platform/ARM/VExpressPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf
@@ -28,19 +28,19 @@ [Sources.common]
   Lan9118Dxe.h
 
 [Packages]
-  NetworkPkg/NetworkPkg.dec
   MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
+  NetworkPkg/NetworkPkg.dec
   VExpressPkg/ArmVExpressPkg.dec
 
 [LibraryClasses]
   BaseLib
-  UefiLib
-  NetLib
-  UefiDriverEntryPoint
   BaseMemoryLib
-  IoLib
   DevicePathLib
+  IoLib
+  NetLib
+  UefiDriverEntryPoint
+  UefiLib
 
 [Protocols]
   gEfiSimpleNetworkProtocolGuid
diff --git a/Platform/ARM/VExpressPkg/Drivers/PL180MciDxe/PL180MciDxe.inf b/Platform/ARM/VExpressPkg/Drivers/PL180MciDxe/PL180MciDxe.inf
index ff1407aefd4e..d07954df1b3a 100644
--- a/Platform/ARM/VExpressPkg/Drivers/PL180MciDxe/PL180MciDxe.inf
+++ b/Platform/ARM/VExpressPkg/Drivers/PL180MciDxe/PL180MciDxe.inf
@@ -32,13 +32,13 @@ [Packages]
   VExpressPkg/ArmVExpressPkg.dec
 
 [LibraryClasses]
+  ArmLib
   BaseLib
-  UefiLib
-  UefiDriverEntryPoint
   BaseMemoryLib
-  ArmLib
   IoLib
   TimerLib
+  UefiDriverEntryPoint
+  UefiLib
 
 [Protocols]
   gEfiCpuArchProtocolGuid
diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressDtPlatformDtbLoaderLib/ArmVExpressDtPlatformDtbLoaderLib.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressDtPlatformDtbLoaderLib/ArmVExpressDtPlatformDtbLoaderLib.inf
index 823233a4153b..488d5175015f 100644
--- a/Platform/ARM/VExpressPkg/Library/ArmVExpressDtPlatformDtbLoaderLib/ArmVExpressDtPlatformDtbLoaderLib.inf
+++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressDtPlatformDtbLoaderLib/ArmVExpressDtPlatformDtbLoaderLib.inf
@@ -19,9 +19,9 @@ [Sources]
 
 [Packages]
   ArmPkg/ArmPkg.dec
+  EmbeddedPkg/EmbeddedPkg.dec
   MdePkg/MdePkg.dec
   VExpressPkg/ArmVExpressPkg.dec
-  EmbeddedPkg/EmbeddedPkg.dec
 
 [LibraryClasses]
   ArmGicLib
diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/ArmVExpressLib.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/ArmVExpressLib.inf
index d2bf15aa405e..8c56cac09603 100644
--- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/ArmVExpressLib.inf
+++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/ArmVExpressLib.inf
@@ -15,16 +15,16 @@ [Defines]
   LIBRARY_CLASS                  = ArmPlatformLib
 
 [Packages]
-  ArmPlatformPkg/ArmPlatformPkg.dec
   ArmPkg/ArmPkg.dec
+  ArmPlatformPkg/ArmPlatformPkg.dec
   EmbeddedPkg/EmbeddedPkg.dec
   MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
   VExpressPkg/ArmVExpressPkg.dec
 
 [LibraryClasses]
-  IoLib
   ArmLib
+  IoLib
   MemoryAllocationLib
   SerialPortLib
 
diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf
index 8ff24785939a..f54ff376c775 100644
--- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf
+++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf
@@ -14,19 +14,19 @@ [Defines]
   LIBRARY_CLASS                  = ArmPlatformLib
 
 [Packages]
-  MdePkg/MdePkg.dec
-  MdeModulePkg/MdeModulePkg.dec
-  EmbeddedPkg/EmbeddedPkg.dec
   ArmPkg/ArmPkg.dec
   ArmPlatformPkg/ArmPlatformPkg.dec
+  EmbeddedPkg/EmbeddedPkg.dec
+  MdeModulePkg/MdeModulePkg.dec
+  MdePkg/MdePkg.dec
   VExpressPkg/ArmVExpressPkg.dec
 
 [LibraryClasses]
-  IoLib
   ArmLib
+  HobLib
+  IoLib
   MemoryAllocationLib
   SerialPortLib
-  HobLib
 
 [Sources.common]
   RTSM.c
diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf
index 7271ff5ab298..28bf8f05db33 100644
--- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf
+++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf
@@ -14,16 +14,16 @@ [Defines]
   LIBRARY_CLASS                  = ArmPlatformLib
 
 [Packages]
-  MdePkg/MdePkg.dec
-  MdeModulePkg/MdeModulePkg.dec
-  VExpressPkg/ArmVExpressPkg.dec
-  EmbeddedPkg/EmbeddedPkg.dec
   ArmPkg/ArmPkg.dec
   ArmPlatformPkg/ArmPlatformPkg.dec
+  EmbeddedPkg/EmbeddedPkg.dec
+  MdeModulePkg/MdeModulePkg.dec
+  MdePkg/MdePkg.dec
+  VExpressPkg/ArmVExpressPkg.dec
 
 [LibraryClasses]
-  IoLib
   ArmLib
+  IoLib
   SerialPortLib
 
 [Sources.common]
diff --git a/Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf b/Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf
index 736230e53160..b171d1f92096 100644
--- a/Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf
+++ b/Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf
@@ -17,8 +17,8 @@ [Sources.common]
   NorFlashArmVExpress.c
 
 [Packages]
-  MdePkg/MdePkg.dec
   ArmPlatformPkg/ArmPlatformPkg.dec
+  MdePkg/MdePkg.dec
   VExpressPkg/ArmVExpressPkg.dec
 
 [LibraryClasses]
diff --git a/Platform/ARM/VExpressPkg/Library/ResetSystemLib/ResetSystemLib.inf b/Platform/ARM/VExpressPkg/Library/ResetSystemLib/ResetSystemLib.inf
index 37e00bd5bc60..332156d71eb5 100644
--- a/Platform/ARM/VExpressPkg/Library/ResetSystemLib/ResetSystemLib.inf
+++ b/Platform/ARM/VExpressPkg/Library/ResetSystemLib/ResetSystemLib.inf
@@ -27,5 +27,5 @@ [Packages]
   VExpressPkg/ArmVExpressPkg.dec
 
 [LibraryClasses]
-  DebugLib
   ArmPlatformSysConfigLib
+  DebugLib
-- 
2.17.1


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

end of thread, other threads:[~2021-09-20 14:05 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-09-20 14:04 [RFC PATCH edk2-platforms v1 0/7] Modify Platform/ARM file structure PierreGondois
2021-09-20 14:04 ` [RFC PATCH edk2-platforms v1 1/7] Platform/ARM: Create ArmCommonPkg PierreGondois
2021-09-20 14:04 ` [RFC PATCH edk2-platforms v1 2/7] Platform/ARM: Create ArmCommonPkg.dec from ARM.dec PierreGondois
2021-09-20 14:04 ` [RFC PATCH edk2-platforms v1 3/7] Platform/ARM: Move BootMonFs package to ArmCommonPkg PierreGondois
2021-09-20 14:04 ` [RFC PATCH edk2-platforms v1 4/7] Platform/ARM: Move FdtPlatformDxe " PierreGondois
2021-09-20 14:04 ` [RFC PATCH edk2-platforms v1 5/7] Platform/ARM: Resolve ArmCommonPkg library references PierreGondois
2021-09-20 14:04 ` [RFC PATCH edk2-platforms v1 6/7] Platform/ARM: Remove Platform/ARM prefix PierreGondois
2021-09-20 14:04 ` [RFC PATCH edk2-platforms v1 7/7] Platform/ARM: Alphabetically order sections in inf files PierreGondois

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