[RFC PATCH edk2-platforms v1 1/7] Platform/ARM: Create ArmCommonPkg


PierreGondois
 

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