ArmPlatformPkg/ArmVExpressDxe: Renamed the device tree

Filenames cannot be longer than 8-character long on
ARM Versatile Express.
Use the default DTB filenames (the ones provided by
the ARM Versatile Express DVD) for the different Core
Tile.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <Olivier.Martin@arm.com>
Reviewed-by: Ronald Cron <Ronald.Cron@arm.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17830 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.c b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.c
index cadff687652cdde5c2c1bff8a23712f2800800ff..351c73312dc49cf25a93895774ba84f72ccfa708 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.c
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.c
@@ -28,11 +28,12 @@ CONST EFI_GUID NullGuid = { 0x0, 0x0, 0x0, { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
 // all "ArmVExpress-like" platforms (AARCH64 or ARM architecture,\r
 // model or hardware platforms).\r
 //\r
+//Note: File extensions are stripped with the VExpress NOR Flash FileSystem\r
 CONST ARM_VEXPRESS_PLATFORM ArmVExpressPlatforms[] = {\r
-  { ARM_HW_A9x4, &ArmHwA9x4Guid, L"vexpress-v2p-ca9.dtb" },\r
-  { ARM_HW_A15x2_A7x3, &ArmHwA15x2A7x3Guid, L"vexpress-v2p-ca15_a7.dtb" },\r
-  { ARM_HW_A15, &ArmHwA15Guid, L"vexpress-v2p-ca15-tc1.dtb" },\r
-  { ARM_HW_A5, &ArmHwA5Guid, L"vexpress-v2p-ca5s.dtb" },\r
+  { ARM_HW_A9x4, &ArmHwA9x4Guid, L"ca9" },\r
+  { ARM_HW_A15x2_A7x3, &ArmHwA15x2A7x3Guid, L"ca15a7" },\r
+  { ARM_HW_A15, &ArmHwA15Guid, L"ca15a7" },\r
+  { ARM_HW_A5, &ArmHwA5Guid, L"ca5s" },\r
   { ARM_FVP_VEXPRESS_UNKNOWN, &NullGuid, NULL }\r
 };\r
 \r