colibri_imx6/imx7/imx8x: use distroboot by default

Use distro_bootcmd as defauult bootcmd instead of legacy wrappers.

Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
Reviewed-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>

diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h
index 69a876fee352c3e13c6ca1b1895dec0dc4910dfe..ab98da6da39729a4e89ff66728fce27e8dc11035 100644 (file)
--- a/include/configs/colibri-imx8x.h
+++ b/include/configs/colibri-imx8x.h
@@ -79,6 +79,7 @@
        CONFIG_MFG_ENV_SETTINGS \
        M4_BOOT_ENV \
        MEM_LAYOUT_ENV_SETTINGS \
+       "boot_file=Image\0" \
        "console=ttyLP3 earlycon\0" \
        "fdt_addr=0x83000000\0" \
        "fdt_file=fsl-imx8qxp-colibri-dsihdmi-eval-v3.dtb\0" \

diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index fa4dc498f58d86aac2ed95b4d7853b4086f3d4d6..69bf8225fe53a4c16bbe8860a80a1a9a86d6ae33 100644 (file)
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -91,6 +91,7 @@
 
 #ifndef CONFIG_SPL_BUILD
 #define BOOT_TARGET_DEVICES(func) \
+       func(MMC, mmc, 0) \
        func(MMC, mmc, 1) \
        func(USB, usb, 0) \
        func(DHCP, dhcp, na)
@@ -167,8 +168,7 @@
 #define FDT_FILE "imx6dl-colibri-eval-v3.dtb"
 #define CONFIG_EXTRA_ENV_SETTINGS \
        BOOTENV \
-       "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \
-               "setenv fdtfile ${fdt_file}; run distro_bootcmd ; " \
+       "bootcmd=setenv fdtfile ${fdt_file}; run distro_bootcmd; " \
                "usb start ; " \
                "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \
        "boot_file=zImage\0" \

diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index 4677e09b47558c249e6afeb449051683600aec58..ade4df5ad8af5ed156b18a5034e9ed5f371d520a 100644 (file)
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -106,7 +106,8 @@
        "fdt_high=0xffffffff\0" \
        "initrd_high=0xffffffff\0" \
        "kernel_addr_r=0x81000000\0" \
-       "ramdisk_addr_r=0x82100000\0"
+       "ramdisk_addr_r=0x82100000\0" \
+       "scriptaddr=0x82500000\0"
 
 #if defined(CONFIG_TARGET_COLIBRI_IMX7_NAND)
 #define SD_BOOTDEV 0
@@ -157,7 +158,7 @@
        "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        UBI_BOOTCMD
 #elif defined(CONFIG_TARGET_COLIBRI_IMX7_EMMC)
-#define CONFIG_BOOTCOMMAND "run emmcboot ; echo ; echo emmcboot failed ; " \
+#define CONFIG_BOOTCOMMAND \
        "setenv fdtfile ${soc}-colibri-emmc-${fdt_board}.dtb && run distro_bootcmd;"
 #define MODULE_EXTRA_ENV_SETTINGS \
        "variant=-emmc\0" \