Merge branch '2021-12-01-Kconfig-migrations' into next

[platform/kernel/u-boot.git] / include / configs / apalis-imx8.h

diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h
index 8059454..27007c5 100644 (file)
--- a/include/configs/apalis-imx8.h
+++ b/include/configs/apalis-imx8.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * Copyright 2019 Toradex
+ * Copyright 2019-2021 Toradex
  */
 
 #ifndef __APALIS_IMX8_H
@@ -11,12 +11,9 @@
 
 #define CONFIG_REMAKE_ELF
 
-#define CONFIG_DISPLAY_BOARDINFO_LATE
-
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define USDHC1_BASE_ADDR               0x5b010000
 #define USDHC2_BASE_ADDR               0x5b020000
-#define CONFIG_SUPPORT_EMMC_BOOT       /* eMMC specific */
 
 /* Networking */
 #define CONFIG_IPADDR                  192.168.10.2
@@ -42,12 +39,12 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
        BOOTENV \
        MEM_LAYOUT_ENV_SETTINGS \
+       "boot_file=Image\0" \
        "console=ttyLP1 earlycon\0" \
        "fdt_addr=0x83000000\0" \
        "fdt_file=fsl-imx8qm-apalis-eval.dtb\0" \
        "fdtfile=fsl-imx8qm-apalis-eval.dtb\0" \
        "finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \
-       "image=Image\0" \
        "initrd_addr=0x83800000\0" \
        "initrd_high=0xffffffffffffffff\0" \
        "mmcargs=setenv bootargs console=${console},${baudrate} " \
@@ -57,7 +54,7 @@
        "netargs=setenv bootargs console=${console},${baudrate} " \
                "root=/dev/nfs ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp" \
                "\0" \
-       "nfsboot=run netargs; dhcp ${loadaddr} ${image}; tftp ${fdt_addr} " \
+       "nfsboot=run netargs; dhcp ${loadaddr} ${boot_file}; tftp ${fdt_addr} " \
                "apalis-imx8/${fdt_file}; booti ${loadaddr} - ${fdt_addr}\0" \
        "panel=NULL\0" \
        "script=boot.scr\0" \