Merge tag 'u-boot-imx-20200623' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

[oweals/u-boot.git] / include / configs / colibri-imx8x.h

diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h
index da9226e2fbedafaca45d94853a4a89c8d81f3cb7..7d007071e5f0850f4b0bc79f64f4dc1f721c4b85 100644 (file)
--- a/include/configs/colibri-imx8x.h
+++ b/include/configs/colibri-imx8x.h
@@ -62,7 +62,7 @@
 #define BOOTENV_RUN_NET_USB_START ""
 
 #define CONFIG_MFG_ENV_SETTINGS \
 #define BOOTENV_RUN_NET_USB_START ""
 
 #define CONFIG_MFG_ENV_SETTINGS \

-       "mfgtool_args=setenv bootargs console=${console},${baudrate} " \
+       "mfgtool_args=setenv bootargs ${consoleargs} " \

                "rdinit=/linuxrc g_mass_storage.stall=0 " \
                "g_mass_storage.removable=1 g_mass_storage.idVendor=0x066F " \
                "g_mass_storage.idProduct=0x37FF " \
                "rdinit=/linuxrc g_mass_storage.stall=0 " \
                "g_mass_storage.removable=1 g_mass_storage.idVendor=0x066F " \
                "g_mass_storage.idProduct=0x37FF " \


@@ -81,7 +81,7 @@
        M4_BOOT_ENV \
        MEM_LAYOUT_ENV_SETTINGS \
        "boot_file=Image\0" \
        M4_BOOT_ENV \
        MEM_LAYOUT_ENV_SETTINGS \
        "boot_file=Image\0" \

-       "console=ttyLP3 earlycon\0" \
+       "consoleargs=console=ttyLP3,${baudrate} earlycon\0" \

        "fdt_addr=0x83000000\0" \
        "fdt_file=fsl-imx8qxp-colibri-dsihdmi-eval-v3.dtb\0" \
        "fdtfile=fsl-imx8qxp-colibri-dsihdmi-eval-v3.dtb\0" \
        "fdt_addr=0x83000000\0" \
        "fdt_file=fsl-imx8qxp-colibri-dsihdmi-eval-v3.dtb\0" \
        "fdtfile=fsl-imx8qxp-colibri-dsihdmi-eval-v3.dtb\0" \


@@ -89,11 +89,11 @@
        "image=Image\0" \
        "initrd_addr=0x83800000\0" \
        "initrd_high=0xffffffffffffffff\0" \
        "image=Image\0" \
        "initrd_addr=0x83800000\0" \
        "initrd_high=0xffffffffffffffff\0" \

-       "mmcargs=setenv bootargs console=${console},${baudrate} " \
+       "mmcargs=setenv bootargs ${consoleargs} " \

                "root=PARTUUID=${uuid} rootwait " \
        "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
        "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
                "root=PARTUUID=${uuid} rootwait " \
        "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
        "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \

-       "netargs=setenv bootargs console=${console},${baudrate} " \
+       "netargs=setenv bootargs ${consoleargs} " \

                "root=/dev/nfs ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp " \
                "${vidargs}\0" \
        "nfsboot=run netargs; dhcp ${loadaddr} ${image}; tftp ${fdt_addr} " \
                "root=/dev/nfs ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp " \
                "${vidargs}\0" \
        "nfsboot=run netargs; dhcp ${loadaddr} ${image}; tftp ${fdt_addr} " \