ls1046a: add env variables to assist boot

Add LS1046ARDB-specific variables to assist the boot flow,
and update the related common and other LS1046A board settings
accordingly.

Signed-off-by: Chunguang Li <chunguang.li_2@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>

diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index 53ef5975a28ce4fe9cc118f30a193790cdd9d7ea..89f96bb3e74d0f36c8d2f617ae1fff3a6c9b493e 100644 (file)
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -83,7 +83,7 @@
 #endif
 #ifndef SPL_NO_MISC
 /* Initial environment variables */
-#define CFG_EXTRA_ENV_SETTINGS         \
+#define EXTRA_ENV_SETTINGS         \
        "hwconfig=fsl_ddr:bank_intlv=auto\0"    \
        "ramdisk_addr=0x800000\0"               \
        "ramdisk_size=0x2000000\0"              \

diff --git a/include/configs/ls1046afrwy.h b/include/configs/ls1046afrwy.h
index 21804fc6654ad95d57886d91fbbefe635a7abc35..07846c3bd250099068e6b98357f58ffa6813bd50 100644 (file)
--- a/include/configs/ls1046afrwy.h
+++ b/include/configs/ls1046afrwy.h
@@ -70,6 +70,12 @@
 /*
  * Environment
  */
+#ifndef SPL_NO_MISC
+/* Initial environment variables */
+#define CFG_EXTRA_ENV_SETTINGS      \
+       EXTRA_ENV_SETTINGS
+#endif
+
 #define CFG_SYS_FSL_QSPI_BASE  0x40000000
 
 #undef BOOT_TARGET_DEVICES

diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h
index 4b4bd7cbe4860b339e02194b125a9ffb2820d31b..001118b8504cc7019e2976dfd08b37914b1a42de 100644 (file)
--- a/include/configs/ls1046aqds.h
+++ b/include/configs/ls1046aqds.h
@@ -312,6 +312,11 @@
 /*
  * Environment
  */
+#ifndef SPL_NO_MISC
+/* Initial environment variables */
+#define CFG_EXTRA_ENV_SETTINGS      \
+       EXTRA_ENV_SETTINGS
+#endif
 
 #ifdef CONFIG_TFABOOT
 #define IFC_NAND_BOOTCOMMAND "run distro_bootcmd; run nand_bootcmd; "  \

diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h
index 0e42a51fc599165365df796fd4055dc762add978..a032e52c519bdc09f2c25c102ddfe0d358c98954 100644 (file)
--- a/include/configs/ls1046ardb.h
+++ b/include/configs/ls1046ardb.h
@@ -131,4 +131,14 @@
 
 #include <asm/fsl_secure_boot.h>
 
+#ifndef SPL_NO_MISC
+/* Initial environment variables */
+#define CFG_EXTRA_ENV_SETTINGS      \
+       EXTRA_ENV_SETTINGS                              \
+       "board=ls1046ardb\0"            \
+       "fdtfile=fsl-ls1046a-rdb-sdk.dtb\0"     \
+       "image=Image\0"                                 \
+       "console_dbg=earlycon=uart8250,mmio,0x21c0500\0"
+#endif
+
 #endif /* __LS1046ARDB_H__ */