vexpress_ca9x4: Enable use of correct DTB file and restore EFI loader.
authorKristian Amlie <kristian.amlie@northern.tech>
Tue, 25 Feb 2020 17:22:16 +0000 (18:22 +0100)
committerTom Rini <trini@konsulko.com>
Mon, 23 Mar 2020 20:11:46 +0000 (16:11 -0400)
EFI was disabled in f95b8a4b5f64f because of the missing DTB file,
and indeed, the DTB file is required to load recent versions of GRUB
(2.04) correctly.

Signed-off-by: Kristian Amlie <kristian.amlie@northern.tech>
configs/vexpress_ca9x4_defconfig
include/configs/vexpress_common.h

index 2119df6b10e6cf3f89c4061dfe2a3db2282d662d..6bd1f253b6ae5e7c637f86272e6e47f2dd7732bd 100644 (file)
@@ -34,4 +34,4 @@ CONFIG_SMC911X_32_BIT=y
 CONFIG_BAUDRATE=38400
 CONFIG_CONS_INDEX=0
 CONFIG_OF_LIBFDT=y
-# CONFIG_EFI_LOADER is not set
+CONFIG_DEFAULT_FDT_FILE="vexpress-v2p-ca9.dtb"
index 7f215a67077172862e67698ee3431eb791f7f533..e73658a9e6e37b7dd422fd57a4d76a3a5dffbe08 100644 (file)
                        "devtmpfs.mount=0  vmalloc=256M\0" \
                "bootflash=run flashargs; " \
                        "cp ${ramdisk_addr} ${ramdisk_addr_r} ${maxramdisk}; " \
-                       "bootm ${kernel_addr} ${ramdisk_addr_r}\0"
+                       "bootm ${kernel_addr} ${ramdisk_addr_r}\0" \
+               "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0"
 
 /* FLASH and environment organization */
 #define PHYS_FLASH_SIZE                        0x04000000      /* 64MB */