From 2f33f892c4e9aec6a2413115c0ccdad6e3970d47 Mon Sep 17 00:00:00 2001 From: Olivier Martin Date: Mon, 6 Jul 2015 16:51:27 +0000 Subject: 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 Reviewed-by: Ronald Cron git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17830 6f19259b-4bc3-4df7-8a09-765794883524 --- ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'ArmPlatformPkg/ArmVExpressPkg') diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.c b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.c index cadff68765..351c73312d 100644 --- 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, // model or hardware platforms). // +//Note: File extensions are stripped with the VExpress NOR Flash FileSystem CONST ARM_VEXPRESS_PLATFORM ArmVExpressPlatforms[] = { - { ARM_HW_A9x4, &ArmHwA9x4Guid, L"vexpress-v2p-ca9.dtb" }, - { ARM_HW_A15x2_A7x3, &ArmHwA15x2A7x3Guid, L"vexpress-v2p-ca15_a7.dtb" }, - { ARM_HW_A15, &ArmHwA15Guid, L"vexpress-v2p-ca15-tc1.dtb" }, - { ARM_HW_A5, &ArmHwA5Guid, L"vexpress-v2p-ca5s.dtb" }, + { ARM_HW_A9x4, &ArmHwA9x4Guid, L"ca9" }, + { ARM_HW_A15x2_A7x3, &ArmHwA15x2A7x3Guid, L"ca15a7" }, + { ARM_HW_A15, &ArmHwA15Guid, L"ca15a7" }, + { ARM_HW_A5, &ArmHwA5Guid, L"ca5s" }, { ARM_FVP_VEXPRESS_UNKNOWN, &NullGuid, NULL } }; -- cgit v1.2.3