Merge branch 'master' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

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

diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h
index 59f88bd2033b9734c1d34740a4615303ddaa40e3..0aaca3325bd3f9a03625fb39081bd63b94baf276 100644 (file)
--- a/include/configs/imx8qxp_mek.h
+++ b/include/configs/imx8qxp_mek.h
@@ -65,7 +65,7 @@
        "script=boot.scr\0" \
        "image=Image\0" \
        "panel=NULL\0" \
-       "console=ttyLP0,${baudrate} earlycon\0" \
+       "console=ttyLP0\0" \
        "fdt_addr=0x83000000\0"                 \
        "fdt_high=0xffffffffffffffff\0"         \
        "boot_fdt=try\0" \
@@ -76,7 +76,7 @@
        "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
        "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
        "mmcautodetect=yes\0" \
-       "mmcargs=setenv bootargs console=${console} root=${mmcroot}\0 " \
+       "mmcargs=setenv bootargs console=${console},${baudrate} root=${mmcroot}\0 " \
        "loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
        "bootscript=echo Running bootscript from mmc ...; " \
                "source\0" \
@@ -104,7 +104,7 @@
                                "echo wait for boot; " \
                        "fi;" \
                "fi;\0" \
-       "netargs=setenv bootargs console=${console} " \
+       "netargs=setenv bootargs console=${console},${baudrate} " \
                "root=/dev/nfs " \
                "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
        "netboot=echo Booting from net ...; " \
@@ -161,8 +161,6 @@
 #define CONFIG_SYS_INIT_SP_ADDR         0x80200000
 
 /* Default environment is in SD */
-#define CONFIG_ENV_SIZE                        0x1000
-#define CONFIG_ENV_OFFSET              (64 * SZ_64K)
 #define CONFIG_SYS_MMC_ENV_PART                0       /* user area */
 
 #define CONFIG_SYS_MMC_IMG_LOAD_PART   1
@@ -198,4 +196,9 @@
 #define CONFIG_FEC_XCV_TYPE            RGMII
 #define FEC_QUIRK_ENET_MAC
 
+/* Misc configuration */
+#define CONFIG_SYS_CBSIZE      2048
+#define CONFIG_SYS_MAXARGS     64
+#define CONFIG_SYS_BARGSIZE    CONFIG_SYS_CBSIZE
+
 #endif /* __IMX8QXP_MEK_H */