[PATCH 3/4] ls1046ardb: refactor EXTRA_ENV_SETTINGS and add board-specific overrides

[chunguang.li_2 at nxp.com]

From: Chunguang Li <chunguang.li_2 at nxp.com>

Upstream-Status: Inappropriate
Signed-off-by: Chunguang Li <chunguang.li_2 at nxp.com>

- Rename CFG_EXTRA_ENV_SETTINGS → EXTRA_ENV_SETTINGS in ls1046a_common.h
- Adjust console parameter in the common environment
- Add CFG_EXTRA_ENV_SETTINGS in ls1046ardb.h with additional board/image/fdtfile variables
- Set CFG_EXTRA_ENV_SETTINGS in ls1046aqds.h to EXTRA_ENV_SETTINGS

Enables board‑specific env customization while keeping LS1046A common env shared.
---
 include/configs/ls1046a_common.h |  2 +-
 include/configs/ls1046afrwy.h    |  6 ++++++
 include/configs/ls1046aqds.h     |  5 +++++
 include/configs/ls1046ardb.h     | 10 ++++++++++
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index 8666aff0f33..e99c677f2d1 100644
--- 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 21804fc6654..07846c3bd25 100644
--- 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 4b4bd7cbe48..001118b8504 100644
--- 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 b2a8bd5cf8a..dfe5270142d 100644
--- a/include/configs/ls1046ardb.h
+++ b/include/configs/ls1046ardb.h
@@ -132,4 +132,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__ */
-- 
2.34.1