From 496504be0b871f4ed7baa82b365b864c10d1cd97 Mon Sep 17 00:00:00 2001 From: Chunguang Li Date: Thu, 2 Apr 2026 11:51:31 +0800 Subject: 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 Signed-off-by: Peng Fan --- 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 53ef5975a28..89f96bb3e74 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 0e42a51fc59..a032e52c519 100644 --- a/include/configs/ls1046ardb.h +++ b/include/configs/ls1046ardb.h @@ -131,4 +131,14 @@ #include +#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__ */ -- cgit v1.2.3