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/VExpressPkg | |
| 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/VExpressPkg')
| -rw-r--r-- | Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf | 2 | ||||
| -rw-r--r-- | Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 6 | ||||
| -rw-r--r-- | Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.inf | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf index 5ceba5fa13..16131bf789 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf +++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf @@ -128,7 +128,7 @@ FvNameGuid = 73dcb643-3862-4904-9076-a94af1890243 INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
# Versatile Express FileSystem
- INF ArmPlatformPkg/FileSystem/BootMonFs/BootMonFs.inf
+ INF Platform/ARM/Drivers/BootMonFs/BootMonFs.inf
#
# USB support
diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc index 5a3b787afb..c6b88c7416 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc +++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc @@ -119,7 +119,7 @@ # RunAxf support via Dynamic Shell Command protocol
# It uses the Shell libraries.
- ArmShellCmdRunAxfLib|ArmPlatformPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf
+ ArmShellCmdRunAxfLib|Platform/ARM/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf
ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
@@ -370,7 +370,7 @@ #
# List of Device Paths that support BootMonFs
- gArmPlatformTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59);VenHw(1F15DA3C-37FF-4070-B471-BB4AF12A724A)"
+ gArmBootMonFsTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59);VenHw(1F15DA3C-37FF-4070-B471-BB4AF12A724A)"
#
# ARM OS Loader
@@ -434,7 +434,7 @@ }
# Versatile Express FileSystem
- ArmPlatformPkg/FileSystem/BootMonFs/BootMonFs.inf
+ Platform/ARM/Drivers/BootMonFs/BootMonFs.inf
#
# Networking stack
diff --git a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.inf b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.inf index 1ecdbb0b23..8bf289f8da 100644 --- a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.inf +++ b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.inf @@ -26,6 +26,7 @@ [Packages]
ArmPlatformPkg/ArmPlatformPkg.dec
MdePkg/MdePkg.dec
+ Platform/ARM/ARM.dec
[LibraryClasses]
ArmShellCmdRunAxfLib
|