From 5b7dc2732868b2f5c1c87747398f27d7205d6d8b Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Sun, 27 Sep 2020 18:04:46 +0300 Subject: include: apalis-imx8/verdin-imx8mm: rename kernel image variable Variable "kernel_image" is used in boot.scr script only, that sets its own default value to the value of "boot_file" or constant string in case "kernel_image" is not set. The default name of the kernel image shipped with BSP 5.0 is "Image.gz". Setting kernel_image="Image" as a predefined u-boot variable breaks booting system with modern version of boot.scr, whereas renaming it fixes booting with modern script and don't break working of earlier versions of boot.scr. Signed-off-by: Oleksandr Suvorov --- include/configs/apalis-imx8.h | 2 +- include/configs/verdin-imx8mm.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h index 0ab60592d5..2610fec2ca 100644 --- a/include/configs/apalis-imx8.h +++ b/include/configs/apalis-imx8.h @@ -92,7 +92,7 @@ MEM_LAYOUT_ENV_SETTINGS \ "bootcmd_mfg=select_dt_from_module_version && fastboot 0\0" \ "script=boot.scr\0" \ - "kernel_image=Image\0" \ + "boot_file=Image\0" \ "console=ttyLP1 earlycon\0" \ "fdt_high=\0" \ "boot_fdt=try\0" \ diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h index b6f01b0cdf..d455d6e05c 100644 --- a/include/configs/verdin-imx8mm.h +++ b/include/configs/verdin-imx8mm.h @@ -104,7 +104,7 @@ "fdt_board=dev\0" \ "initrd_addr=0x43800000\0" \ "initrd_high=0xffffffffffffffff\0" \ - "kernel_image=Image\0" \ + "boot_file=Image\0" \ "setup=setenv setupargs console=${console},${baudrate} console=tty1 consoleblank=0 earlycon\0" #define CONFIG_SYS_INIT_RAM_ADDR 0x40000000 -- cgit v1.2.3