mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-08-15 11:46:59 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

vexpress_ca9x4: Enable use of correct DTB file and restore EFI loader.

Browse Source 
EFI was disabled in f95b8a4b5f 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>
This commit is contained in:
Kristian Amlie 2020-02-25 18:22:16 +01:00 committed by Tom Rini
parent 0aadc0786e
commit af827140e5
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configs/vexpress_ca9x4_defconfig
View File

@ -34,4 +34,4 @@ CONFIG_SMC911X_32_BIT=y
CONFIG_BAUDRATE=38400 CONFIG_BAUDRATE=38400
CONFIG_CONS_INDEX=0 CONFIG_CONS_INDEX=0
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y
# CONFIG_EFI_LOADER is not set CONFIG_DEFAULT_FDT_FILE="vexpress-v2p-ca9.dtb"

3
include/configs/vexpress_common.h
View File

@ -207,7 +207,8 @@
"devtmpfs.mount=0 vmalloc=256M\0" \ "devtmpfs.mount=0 vmalloc=256M\0" \
"bootflash=run flashargs; " \ "bootflash=run flashargs; " \
"cp ${ramdisk_addr} ${ramdisk_addr_r} ${maxramdisk}; " \ "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 */ /* FLASH and environment organization */
#define PHYS_FLASH_SIZE 0x04000000 /* 64MB */ #define PHYS_FLASH_SIZE 0x04000000 /* 64MB */