diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2017-11-15 16:20:55 +0000 |
|---|---|---|
| committer | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2017-12-08 16:17:20 +0000 |
| commit | 40d0673c2e3db10e47fd0742bf484c3d0aea2efe (patch) | |
| tree | bf7abfce6aa7143bee3880655ce712c8f9fe9a8b /Platform/ARM/JunoPkg | |
| parent | 8ad58788b5c39c3b4cc46aa20c9c557a6b90d42e (diff) | |
| download | edk2-platforms-40d0673c2e3db10e47fd0742bf484c3d0aea2efe.tar.xz | |
Platform/ARM: import BootMonFs and ArmShellCmdRunAxf from EDK2
BootMonFs and ArmShellCmdRunAxf are only used on development boards
manufactured by ARM itself, so let's keep it under Platform/ARM where
it belongs.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
Diffstat (limited to 'Platform/ARM/JunoPkg')
| -rw-r--r-- | Platform/ARM/JunoPkg/ArmJuno.dsc | 2 | ||||
| -rw-r--r-- | Platform/ARM/JunoPkg/ArmJuno.fdf | 2 | ||||
| -rw-r--r-- | Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/Platform/ARM/JunoPkg/ArmJuno.dsc b/Platform/ARM/JunoPkg/ArmJuno.dsc index 2844c91813..e7cb280ff3 100644 --- a/Platform/ARM/JunoPkg/ArmJuno.dsc +++ b/Platform/ARM/JunoPkg/ArmJuno.dsc @@ -157,7 +157,7 @@ gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|24
# List of Device Paths that support BootMonFs
- gArmPlatformTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)"
+ gArmBootMonFsTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)"
#
# ARM OS Loader
diff --git a/Platform/ARM/JunoPkg/ArmJuno.fdf b/Platform/ARM/JunoPkg/ArmJuno.fdf index 72771b1170..ee9d0e7f4f 100644 --- a/Platform/ARM/JunoPkg/ArmJuno.fdf +++ b/Platform/ARM/JunoPkg/ArmJuno.fdf @@ -135,7 +135,7 @@ FvNameGuid = B73FE497-B92E-416e-8326-45AD0D270092 INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf
# Versatile Express FileSystem
- INF ArmPlatformPkg/FileSystem/BootMonFs/BootMonFs.inf
+ INF Platform/ARM/Drivers/BootMonFs/BootMonFs.inf
#
# FAT filesystem + GPT/MBR partitioning
diff --git a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf b/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf index 0e53a49ee2..7da336fbd8 100644 --- a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf +++ b/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf @@ -28,6 +28,7 @@ EmbeddedPkg/EmbeddedPkg.dec
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
+ Platform/ARM/ARM.dec
Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.dec
Platform/ARM/JunoPkg/ArmJuno.dec
|