[PATCH 1/1] vexpress_ca9x4: Enable use of correct DTB file and restore EFI loader.

[Tom Rini]

On Tue, Feb 25, 2020 at 06:22:16PM +0100, Kristian Amlie wrote:

> 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 at northern.tech>
> ---
>  configs/vexpress_ca9x4_defconfig  | 2 +-
>  include/configs/vexpress_common.h | 3 ++-
>  2 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/configs/vexpress_ca9x4_defconfig b/configs/vexpress_ca9x4_defconfig
> index 2119df6b10..6bd1f253b6 100644
> --- a/configs/vexpress_ca9x4_defconfig
> +++ b/configs/vexpress_ca9x4_defconfig
> @@ -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"
> diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h
> index 7f215a6707..e73658a9e6 100644
> --- a/include/configs/vexpress_common.h
> +++ b/include/configs/vexpress_common.h
> @@ -207,7 +207,8 @@
>  			"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 */

Did you test build all of the vexpress platforms?  There's a common file
for the 5 different ones.  Thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200228/0b1fee9e/attachment.sig>