Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit d4babee087f24a60d910659cb4367a077bad87a0

Authored by Kristian Amlie
Committed by Heinrich Schuchardt
1 parent 4ef2b0d551
Exists in smarc_8mq_lf_v2020.04 and in 9 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

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

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>

Showing 2 changed files with 3 additions and 2 deletions Side-by-side Diff

configs/vexpress_ca9x4_defconfig
Diff comments   View file @ d4babee
... ... @@ -34,5 +34,5 @@
34 34 CONFIG_BAUDRATE=38400
35 35 CONFIG_CONS_INDEX=0
36 36 CONFIG_OF_LIBFDT=y
37   -# CONFIG_EFI_LOADER is not set
  37 +CONFIG_DEFAULT_FDT_FILE="vexpress-v2p-ca9.dtb"
include/configs/vexpress_common.h
Diff comments   View file @ d4babee
... ... @@ -207,7 +207,8 @@
207 207 "devtmpfs.mount=0 vmalloc=256M\0" \
208 208 "bootflash=run flashargs; " \
209 209 "cp ${ramdisk_addr} ${ramdisk_addr_r} ${maxramdisk}; " \
210   - "bootm ${kernel_addr} ${ramdisk_addr_r}\0"
  210 + "bootm ${kernel_addr} ${ramdisk_addr_r}\0" \
  211 + "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0"
211 212  
212 213 /* FLASH and environment organization */
213 214 #define PHYS_FLASH_SIZE 0x04000000 /* 64MB */