colibri-imx8x: declare consoleargs

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

diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h
index 6f3c34d..7d00707 100644 (file)
--- a/include/configs/colibri-imx8x.h
+++ b/include/configs/colibri-imx8x.h
@@ -8,13 +8,12 @@
 
 #include <asm/arch/imx-regs.h>
 #include <linux/sizes.h>
+#include <linux/stringify.h>
 
 #define CONFIG_REMAKE_ELF
 
 #define CONFIG_DISPLAY_BOARDINFO_LATE
 
-#undef CONFIG_BOOTM_NETBSD
-
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define USDHC1_BASE_ADDR               0x5b010000
 #define USDHC2_BASE_ADDR               0x5b020000
@@ -63,7 +62,7 @@
 #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 " \
@@ -81,7 +80,8 @@
        CONFIG_MFG_ENV_SETTINGS \
        M4_BOOT_ENV \
        MEM_LAYOUT_ENV_SETTINGS \
-       "console=ttyLP3 earlycon\0" \
+       "boot_file=Image\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" \
@@ -89,11 +89,11 @@
        "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" \
-       "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} " \
@@ -115,13 +115,7 @@
 
 #define CONFIG_SYS_INIT_SP_ADDR                0x80200000
 
-#define CONFIG_SYS_MEMTEST_START       0x88000000
-#define CONFIG_SYS_MEMTEST_END         0x89000000
-
 /* Environment in eMMC, before config block at the end of 1st "boot sector" */
-#define CONFIG_ENV_SIZE                        SZ_8K
-#define CONFIG_ENV_OFFSET              (-CONFIG_ENV_SIZE + \
-                                        CONFIG_TDX_CFG_BLOCK_OFFSET)
 #define CONFIG_SYS_MMC_ENV_DEV         0       /* USDHC1 eMMC */
 #define CONFIG_SYS_MMC_ENV_PART                1