* [PATCH v6 01/16] configs: sc5xx: Do not store environment in SPI flash
2026-05-21 13:53 [PATCH v6 00/16] sc5xx Environment Cleanup and Fixes Caleb Ethridge
@ 2026-05-21 13:53 ` Caleb Ethridge
2026-05-21 13:53 ` [PATCH v6 02/16] mach-sc5xx: Remove update commands from default environment Caleb Ethridge
` (15 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Caleb Ethridge @ 2026-05-21 13:53 UTC (permalink / raw)
To: u-boot; +Cc: trini, malysagreg, philip, sjg, linux, jcethrid, Caleb Ethridge
Remove config option enabling storage of the environment
in the SPI flash, to match shift of programming boot media
to Linux.
Signed-off-by: Caleb Ethridge <caleb.ethridge@analog.com>
---
configs/sc573-ezkit_defconfig | 4 ----
configs/sc584-ezkit_defconfig | 5 -----
configs/sc589-ezkit_defconfig | 5 -----
configs/sc589-mini_defconfig | 5 -----
configs/sc594-som-ezkit-spl_defconfig | 4 ----
configs/sc594-som-ezlite-spl_defconfig | 4 ----
configs/sc598-som-ezkit-spl_defconfig | 4 ----
configs/sc598-som-ezlite-spl_defconfig | 4 ----
8 files changed, 35 deletions(-)
diff --git a/configs/sc573-ezkit_defconfig b/configs/sc573-ezkit_defconfig
index fc4ce13cc70..976d8e0306a 100644
--- a/configs/sc573-ezkit_defconfig
+++ b/configs/sc573-ezkit_defconfig
@@ -3,9 +3,6 @@ CONFIG_SYS_ARM_CACHE_WRITETHROUGH=y
CONFIG_ARCH_SC5XX=y
CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_SPL_GPIO=y
-CONFIG_ENV_SIZE=0x4000
-CONFIG_ENV_OFFSET=0xD0000
-CONFIG_ENV_SECT_SIZE=0x4000
CONFIG_DM_GPIO=y
CONFIG_SPL_SYS_MALLOC_F_LEN=0x10000
CONFIG_SPL_SERIAL=y
@@ -52,7 +49,6 @@ CONFIG_CMD_FS_GENERIC=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_OF_EMBED=y
CONFIG_ENV_OVERWRITE=y
-CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_USE_HOSTNAME=y
CONFIG_HOSTNAME="sc573-ezkit"
CONFIG_NET_RETRY_COUNT=20
diff --git a/configs/sc584-ezkit_defconfig b/configs/sc584-ezkit_defconfig
index a8c6b9f1224..27f55804199 100644
--- a/configs/sc584-ezkit_defconfig
+++ b/configs/sc584-ezkit_defconfig
@@ -3,9 +3,6 @@ CONFIG_SYS_ARM_CACHE_WRITETHROUGH=y
CONFIG_ARCH_SC5XX=y
CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_SPL_GPIO=y
-CONFIG_ENV_SIZE=0x4000
-CONFIG_ENV_OFFSET=0xD0000
-CONFIG_ENV_SECT_SIZE=0x4000
CONFIG_DM_GPIO=y
CONFIG_SPL_SYS_MALLOC_F_LEN=0x8000
CONFIG_SPL_SERIAL=y
@@ -57,8 +54,6 @@ CONFIG_CMD_FS_GENERIC=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_OF_EMBED=y
CONFIG_ENV_OVERWRITE=y
-CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_ENV_SPI_MAX_HZ=10000000
CONFIG_USE_HOSTNAME=y
CONFIG_HOSTNAME="sc584-ezkit"
CONFIG_NET_RETRY_COUNT=20
diff --git a/configs/sc589-ezkit_defconfig b/configs/sc589-ezkit_defconfig
index 9cd204e40ab..180b6904d95 100644
--- a/configs/sc589-ezkit_defconfig
+++ b/configs/sc589-ezkit_defconfig
@@ -5,9 +5,6 @@ CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_SPL_GPIO=y
CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xC203F000
CONFIG_SF_DEFAULT_SPEED=1000000
-CONFIG_ENV_SIZE=0x4000
-CONFIG_ENV_OFFSET=0xD0000
-CONFIG_ENV_SECT_SIZE=0x4000
CONFIG_DM_GPIO=y
CONFIG_SPL_SYS_MALLOC_F_LEN=0x8000
CONFIG_SPL_SERIAL=y
@@ -61,8 +58,6 @@ CONFIG_CMD_FS_GENERIC=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_OF_EMBED=y
CONFIG_ENV_OVERWRITE=y
-CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_ENV_SPI_MAX_HZ=10000000
CONFIG_USE_HOSTNAME=y
CONFIG_HOSTNAME="sc589-ezkit"
CONFIG_NET_RETRY_COUNT=20
diff --git a/configs/sc589-mini_defconfig b/configs/sc589-mini_defconfig
index 0908ab1708b..92c2741f701 100644
--- a/configs/sc589-mini_defconfig
+++ b/configs/sc589-mini_defconfig
@@ -4,9 +4,6 @@ CONFIG_ARCH_SC5XX=y
CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_SPL_GPIO=y
CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xC203F000
-CONFIG_ENV_SIZE=0x10000
-CONFIG_ENV_OFFSET=0xD0000
-CONFIG_ENV_SECT_SIZE=0x10000
CONFIG_DM_GPIO=y
CONFIG_SPL_SYS_MALLOC_F_LEN=0x8000
CONFIG_SPL_SERIAL=y
@@ -58,8 +55,6 @@ CONFIG_CMD_FS_GENERIC=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_OF_EMBED=y
CONFIG_ENV_OVERWRITE=y
-CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_ENV_SPI_MAX_HZ=10000000
CONFIG_USE_HOSTNAME=y
CONFIG_HOSTNAME="sc589-mini"
CONFIG_NET_RETRY_COUNT=20
diff --git a/configs/sc594-som-ezkit-spl_defconfig b/configs/sc594-som-ezkit-spl_defconfig
index c62097a2ac9..c379de2c146 100644
--- a/configs/sc594-som-ezkit-spl_defconfig
+++ b/configs/sc594-som-ezkit-spl_defconfig
@@ -4,9 +4,6 @@ CONFIG_ARCH_SC5XX=y
CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_SPL_GPIO=y
CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x8203f000
-CONFIG_ENV_SIZE=0x20000
-CONFIG_ENV_OFFSET=0x100000
-CONFIG_ENV_SECT_SIZE=0x20000
CONFIG_DM_GPIO=y
CONFIG_SPL_DM_SPI=y
CONFIG_SPL_SYS_MALLOC_F_LEN=0x10000
@@ -40,7 +37,6 @@ CONFIG_CMD_EXT4=y
CONFIG_CMD_FAT=y
CONFIG_OF_EMBED=y
CONFIG_ENV_OVERWRITE=y
-CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_USE_HOSTNAME=y
CONFIG_HOSTNAME="sc594-som-ezkit"
CONFIG_NET_RETRY_COUNT=20
diff --git a/configs/sc594-som-ezlite-spl_defconfig b/configs/sc594-som-ezlite-spl_defconfig
index 39481351102..54b26ed85c2 100644
--- a/configs/sc594-som-ezlite-spl_defconfig
+++ b/configs/sc594-som-ezlite-spl_defconfig
@@ -3,9 +3,6 @@ CONFIG_SYS_ARM_CACHE_WRITETHROUGH=y
CONFIG_ARCH_SC5XX=y
CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_SPL_GPIO=y
-CONFIG_ENV_SIZE=0x20000
-CONFIG_ENV_OFFSET=0x100000
-CONFIG_ENV_SECT_SIZE=0x20000
CONFIG_DM_GPIO=y
CONFIG_SPL_DM_SPI=y
CONFIG_SPL_SYS_MALLOC_F_LEN=0x10000
@@ -45,7 +42,6 @@ CONFIG_CMD_FAT=y
# CONFIG_DOS_PARTITION is not set
CONFIG_OF_EMBED=y
CONFIG_ENV_OVERWRITE=y
-CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_USE_HOSTNAME=y
CONFIG_HOSTNAME="sc594-som-ezlite"
CONFIG_NET_RETRY_COUNT=20
diff --git a/configs/sc598-som-ezkit-spl_defconfig b/configs/sc598-som-ezkit-spl_defconfig
index bf001459831..98256517b87 100644
--- a/configs/sc598-som-ezkit-spl_defconfig
+++ b/configs/sc598-som-ezkit-spl_defconfig
@@ -4,9 +4,6 @@ CONFIG_COUNTER_FREQUENCY=31250000
CONFIG_ARCH_SC5XX=y
CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_SPL_GPIO=y
-CONFIG_ENV_SIZE=0x20000
-CONFIG_ENV_OFFSET=0x180000
-CONFIG_ENV_SECT_SIZE=0x20000
CONFIG_DM_GPIO=y
CONFIG_SPL_DM_SPI=y
CONFIG_SPL_SYS_MALLOC_F_LEN=0x10000
@@ -63,7 +60,6 @@ CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y
CONFIG_OF_EMBED=y
CONFIG_ENV_OVERWRITE=y
-CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_USE_HOSTNAME=y
CONFIG_HOSTNAME="sc598-som-ezkit"
CONFIG_NET_RETRY_COUNT=20
diff --git a/configs/sc598-som-ezlite-spl_defconfig b/configs/sc598-som-ezlite-spl_defconfig
index 09fda4f4ecc..1c4f9309daa 100644
--- a/configs/sc598-som-ezlite-spl_defconfig
+++ b/configs/sc598-som-ezlite-spl_defconfig
@@ -4,9 +4,6 @@ CONFIG_COUNTER_FREQUENCY=31250000
CONFIG_ARCH_SC5XX=y
CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_SPL_GPIO=y
-CONFIG_ENV_SIZE=0x20000
-CONFIG_ENV_OFFSET=0x180000
-CONFIG_ENV_SECT_SIZE=0x20000
CONFIG_DM_GPIO=y
CONFIG_SPL_DM_SPI=y
CONFIG_SPL_SYS_MALLOC_F_LEN=0x10000
@@ -62,7 +59,6 @@ CONFIG_CMD_EXT4=y
CONFIG_CMD_EXT4_WRITE=y
CONFIG_OF_EMBED=y
CONFIG_ENV_OVERWRITE=y
-CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_USE_HOSTNAME=y
CONFIG_HOSTNAME="sc598-som-ezlite"
CONFIG_NET_RETRY_COUNT=20
--
2.34.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v6 02/16] mach-sc5xx: Remove update commands from default environment
2026-05-21 13:53 [PATCH v6 00/16] sc5xx Environment Cleanup and Fixes Caleb Ethridge
2026-05-21 13:53 ` [PATCH v6 01/16] configs: sc5xx: Do not store environment in SPI flash Caleb Ethridge
@ 2026-05-21 13:53 ` Caleb Ethridge
2026-05-21 13:53 ` [PATCH v6 03/16] mach-sc59x: Add CONFIG_SC5XX_LOADADDR Caleb Ethridge
` (14 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Caleb Ethridge @ 2026-05-21 13:53 UTC (permalink / raw)
To: u-boot; +Cc: trini, malysagreg, philip, sjg, linux, jcethrid, Caleb Ethridge
Remove the update_spi family of commands from the U-Boot
environment. These commands are not standard in U-Boot,
and boot media programming has moved to Linux, so the
commands can be safely removed.
Additionally, this commit removes the adi_stage2_offset,
adi_rfs_offset, imagefile, jffs2file, and init_ethernet variables that
were consumed by the update commands as they are no longer needed.
CONFIG_SC5XX_UBOOT_OFFSET and CONFIG_SC5XX_ROOTFS_OFFSET are also
removed.
Signed-off-by: Caleb Ethridge <caleb.ethridge@analog.com>
---
board/adi/sc573-ezkit/sc573-ezkit.env | 3 --
board/adi/sc584-ezkit/sc584-ezkit.env | 3 --
board/adi/sc589-ezkit/sc589-ezkit.env | 3 --
board/adi/sc589-mini/sc589-mini.env | 3 --
board/adi/sc594-som-ezkit/sc594-som-ezkit.env | 3 --
.../adi/sc594-som-ezlite/sc594-som-ezlite.env | 3 --
board/adi/sc598-som-ezkit/sc598-som-ezkit.env | 3 --
.../adi/sc598-som-ezlite/sc598-som-ezlite.env | 3 --
configs/sc573-ezkit_defconfig | 2 -
configs/sc584-ezkit_defconfig | 2 -
configs/sc589-ezkit_defconfig | 2 -
configs/sc589-mini_defconfig | 2 -
include/env/adi/adi_boot.env | 54 -------------------
13 files changed, 86 deletions(-)
diff --git a/board/adi/sc573-ezkit/sc573-ezkit.env b/board/adi/sc573-ezkit/sc573-ezkit.env
index 8b03a3d5da9..83cbe808efa 100644
--- a/board/adi/sc573-ezkit/sc573-ezkit.env
+++ b/board/adi/sc573-ezkit/sc573-ezkit.env
@@ -3,10 +3,7 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
-adi_stage2_offset=CONFIG_SC5XX_UBOOT_OFFSET
adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET
-adi_rfs_offset=CONFIG_SC5XX_ROOTFS_OFFSET
-jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc573-ezkit.jffs2
loadaddr=CONFIG_SC5XX_LOADADDR
#define USE_NFS
diff --git a/board/adi/sc584-ezkit/sc584-ezkit.env b/board/adi/sc584-ezkit/sc584-ezkit.env
index 8a6f7edd5e8..2640d97bab2 100644
--- a/board/adi/sc584-ezkit/sc584-ezkit.env
+++ b/board/adi/sc584-ezkit/sc584-ezkit.env
@@ -3,10 +3,7 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
-adi_stage2_offset=CONFIG_SC5XX_UBOOT_OFFSET
adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET
-adi_rfs_offset=CONFIG_SC5XX_ROOTFS_OFFSET
-jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc584-ezkit.jffs2
loadaddr=CONFIG_SC5XX_LOADADDR
#define USE_NFS
diff --git a/board/adi/sc589-ezkit/sc589-ezkit.env b/board/adi/sc589-ezkit/sc589-ezkit.env
index b8206e85179..a098f0b9c2c 100644
--- a/board/adi/sc589-ezkit/sc589-ezkit.env
+++ b/board/adi/sc589-ezkit/sc589-ezkit.env
@@ -3,10 +3,7 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
-adi_stage2_offset=CONFIG_SC5XX_UBOOT_OFFSET
adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET
-adi_rfs_offset=CONFIG_SC5XX_ROOTFS_OFFSET
-jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc589-ezkit.jffs2
loadaddr=CONFIG_SC5XX_LOADADDR
#define USE_NFS
diff --git a/board/adi/sc589-mini/sc589-mini.env b/board/adi/sc589-mini/sc589-mini.env
index f7628b0b335..bed2ddc944d 100644
--- a/board/adi/sc589-mini/sc589-mini.env
+++ b/board/adi/sc589-mini/sc589-mini.env
@@ -3,10 +3,7 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
-adi_stage2_offset=CONFIG_SC5XX_UBOOT_OFFSET
adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET
-adi_rfs_offset=CONFIG_SC5XX_ROOTFS_OFFSET
-jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc589-mini.jffs2
loadaddr=CONFIG_SC5XX_LOADADDR
#define USE_NFS
diff --git a/board/adi/sc594-som-ezkit/sc594-som-ezkit.env b/board/adi/sc594-som-ezkit/sc594-som-ezkit.env
index 069edc717da..f629f7f2cff 100644
--- a/board/adi/sc594-som-ezkit/sc594-som-ezkit.env
+++ b/board/adi/sc594-som-ezkit/sc594-som-ezkit.env
@@ -3,10 +3,7 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
-adi_stage2_offset=CONFIG_SC5XX_UBOOT_OFFSET
adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET
-adi_rfs_offset=CONFIG_SC5XX_ROOTFS_OFFSET
-jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc594-som-ezkit.jffs2
loadaddr=CONFIG_SC5XX_LOADADDR
#define USE_NFS
diff --git a/board/adi/sc594-som-ezlite/sc594-som-ezlite.env b/board/adi/sc594-som-ezlite/sc594-som-ezlite.env
index e5382b67c81..f629f7f2cff 100644
--- a/board/adi/sc594-som-ezlite/sc594-som-ezlite.env
+++ b/board/adi/sc594-som-ezlite/sc594-som-ezlite.env
@@ -3,10 +3,7 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
-adi_stage2_offset=CONFIG_SC5XX_UBOOT_OFFSET
adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET
-adi_rfs_offset=CONFIG_SC5XX_ROOTFS_OFFSET
-jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc594-som-ezlite.jffs2
loadaddr=CONFIG_SC5XX_LOADADDR
#define USE_NFS
diff --git a/board/adi/sc598-som-ezkit/sc598-som-ezkit.env b/board/adi/sc598-som-ezkit/sc598-som-ezkit.env
index 2cb475e1001..f629f7f2cff 100644
--- a/board/adi/sc598-som-ezkit/sc598-som-ezkit.env
+++ b/board/adi/sc598-som-ezkit/sc598-som-ezkit.env
@@ -3,10 +3,7 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
-adi_stage2_offset=CONFIG_SC5XX_UBOOT_OFFSET
adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET
-adi_rfs_offset=CONFIG_SC5XX_ROOTFS_OFFSET
-jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc598-som-ezkit.jffs2
loadaddr=CONFIG_SC5XX_LOADADDR
#define USE_NFS
diff --git a/board/adi/sc598-som-ezlite/sc598-som-ezlite.env b/board/adi/sc598-som-ezlite/sc598-som-ezlite.env
index 1d9ea6d188b..7b13d6fc32b 100644
--- a/board/adi/sc598-som-ezlite/sc598-som-ezlite.env
+++ b/board/adi/sc598-som-ezlite/sc598-som-ezlite.env
@@ -3,10 +3,7 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
-adi_stage2_offset=CONFIG_SC5XX_UBOOT_OFFSET
adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET
-adi_rfs_offset=CONFIG_SC5XX_ROOTFS_OFFSET
loadaddr=CONFIG_SC5XX_LOADADDR
-jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc598-som-ezlite.jffs2
#include <env/adi/adi_boot.env>
diff --git a/configs/sc573-ezkit_defconfig b/configs/sc573-ezkit_defconfig
index 976d8e0306a..7a0c7d04e84 100644
--- a/configs/sc573-ezkit_defconfig
+++ b/configs/sc573-ezkit_defconfig
@@ -6,9 +6,7 @@ CONFIG_SPL_GPIO=y
CONFIG_DM_GPIO=y
CONFIG_SPL_SYS_MALLOC_F_LEN=0x10000
CONFIG_SPL_SERIAL=y
-CONFIG_SC5XX_UBOOT_OFFSET=0x20000
CONFIG_SC5XX_FITIMAGE_OFFSET=0xE0000
-CONFIG_SC5XX_ROOTFS_OFFSET=0x6E0000
CONFIG_SC5XX_LOADADDR=0x83000000
CONFIG_WATCHDOG_TIMEOUT_MSECS=60000
CONFIG_CGU0_CLKOUTSEL=7
diff --git a/configs/sc584-ezkit_defconfig b/configs/sc584-ezkit_defconfig
index 27f55804199..7975a610ca3 100644
--- a/configs/sc584-ezkit_defconfig
+++ b/configs/sc584-ezkit_defconfig
@@ -10,9 +10,7 @@ CONFIG_SPL_STACK=0x200C0000
CONFIG_SPL_BSS_START_ADDR=0x200A0000
CONFIG_SPL_BSS_MAX_SIZE=0x8000
CONFIG_SC58X=y
-CONFIG_SC5XX_UBOOT_OFFSET=0x20000
CONFIG_SC5XX_FITIMAGE_OFFSET=0xE0000
-CONFIG_SC5XX_ROOTFS_OFFSET=0x6E0000
CONFIG_SC5XX_LOADADDR=0x89300000
CONFIG_WATCHDOG_TIMEOUT_MSECS=60000
CONFIG_ADI_BUG_EZKHW21=y
diff --git a/configs/sc589-ezkit_defconfig b/configs/sc589-ezkit_defconfig
index 180b6904d95..0ceb57f1f42 100644
--- a/configs/sc589-ezkit_defconfig
+++ b/configs/sc589-ezkit_defconfig
@@ -13,9 +13,7 @@ CONFIG_SPL_BSS_START_ADDR=0x200A0000
CONFIG_SPL_BSS_MAX_SIZE=0x8000
CONFIG_SC58X=y
CONFIG_TARGET_SC589_EZKIT=y
-CONFIG_SC5XX_UBOOT_OFFSET=0x20000
CONFIG_SC5XX_FITIMAGE_OFFSET=0xE0000
-CONFIG_SC5XX_ROOTFS_OFFSET=0x6E0000
CONFIG_SC5XX_LOADADDR=0xC3000000
CONFIG_WATCHDOG_TIMEOUT_MSECS=60000
CONFIG_ADI_USE_DMC1=y
diff --git a/configs/sc589-mini_defconfig b/configs/sc589-mini_defconfig
index 92c2741f701..32678b63a9f 100644
--- a/configs/sc589-mini_defconfig
+++ b/configs/sc589-mini_defconfig
@@ -12,9 +12,7 @@ CONFIG_SPL_BSS_START_ADDR=0x200A0000
CONFIG_SPL_BSS_MAX_SIZE=0x8000
CONFIG_SC58X=y
CONFIG_TARGET_SC589_MINI=y
-CONFIG_SC5XX_UBOOT_OFFSET=0x20000
CONFIG_SC5XX_FITIMAGE_OFFSET=0xE0000
-CONFIG_SC5XX_ROOTFS_OFFSET=0x8E0000
CONFIG_SC5XX_LOADADDR=0xC3000000
CONFIG_WATCHDOG_TIMEOUT_MSECS=60000
CONFIG_ADI_USE_DMC1=y
diff --git a/include/env/adi/adi_boot.env b/include/env/adi/adi_boot.env
index db4148b1af9..42f33ed83af 100644
--- a/include/env/adi/adi_boot.env
+++ b/include/env/adi/adi_boot.env
@@ -1,11 +1,8 @@
/*
* A target board needs to set these variables for the commands below to work:
*
- * - adi_stage2_offset, the location of stage2-boot.ldr on the SPI flash
* - adi_image_offset, location of the fitImage on the SPI flash
- * - adi_rfs_offset, location of the RFS on the SPI flash
* - loadaddr, where you want to load things
- * - jffs2file, name of the jffs2 file for update, ex adsp-sc5xx-tiny-adsp-sc573.jffs2
*/
#ifdef CONFIG_SC59X_64
@@ -15,7 +12,6 @@
#endif
/* Config options */
-imagefile=fitImage
ethaddr=02:80:ad:20:31:e8
eth1addr=02:80:ad:20:31:e9
uart_console=CONFIG_UART_CONSOLE
@@ -25,11 +21,6 @@ initrd_high=0xffffffffffffffff
initrd_high=0xffffffff
#endif
-/* Helper routines */
-init_ethernet=mii info;
- dhcp;
- setenv serverip ${tftpserverip}
-
/* Args for each boot mode */
adi_bootargs=EARLY_PRINTK console=ttySC0,CONFIG_BAUDRATE vmalloc=512M
ramargs=setenv bootargs ${adi_bootargs}
@@ -73,48 +64,3 @@ ramboot=run init_ethernet;
run ramargs;
bootm ${loadaddr}
#endif
-
-/* Update commands */
-stage1file=stage1-boot.ldr
-stage2file=stage2-boot.ldr
-
-#if defined(USE_SPI) || defined(USE_OSPI)
-update_spi_uboot_stage1=tftp ${loadaddr} ${tftp_dir_prefix}${stage1file};
- sf probe ${sfdev};
- sf update ${loadaddr} 0x0 ${filesize}
-update_spi_uboot_stage2=tftp ${loadaddr} ${tftp_dir_prefix}${stage2file};
- sf probe ${sfdev};
- sf update ${loadaddr} ${adi_stage2_offset} ${filesize}
-update_spi_uboot=run update_spi_uboot_stage1;
- run update_spi_uboot_stage2;
-update_spi_fit=tftp ${loadaddr} ${tftp_dir_prefix}${imagefile};
- sf probe ${sfdev};
- sf update ${loadaddr} ${adi_image_offset} ${filesize};
- setenv imagesize ${filesize}
-update_spi_rfs=tftp ${loadaddr} ${tftp_dir_prefix}${jffs2file};
- sf probe ${sfdev};
- sf update ${loadaddr} ${adi_rfs_offset} ${filesize}
-
-start_update_spi=run init_ethernet;
- run update_spi_uboot;
- run update_spi_fit;
- run update_spi_rfs;
-start_update_spi_uboot_only=run init_ethernet;
- run update_spi_uboot;
-#endif
-
-#if defined(USE_SPI)
-update_spi=setenv sfdev CONFIG_SC_BOOT_SPI_BUS:CONFIG_SC_BOOT_SPI_SSEL;
- setenv bootcmd run spiboot;
- setenv argscmd spiargs;
- run start_update_spi;
- saveenv
-#endif
-
-#if defined(USE_OSPI)
-update_ospi=setenv sfdev CONFIG_SC_BOOT_OSPI_BUS:CONFIG_SC_BOOT_OSPI_SSEL;
- setenv bootcmd run ospiboot;
- setenv argscmd spiargs;
- run start_update_spi;
- saveenv
-#endif
--
2.34.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v6 03/16] mach-sc59x: Add CONFIG_SC5XX_LOADADDR
2026-05-21 13:53 [PATCH v6 00/16] sc5xx Environment Cleanup and Fixes Caleb Ethridge
2026-05-21 13:53 ` [PATCH v6 01/16] configs: sc5xx: Do not store environment in SPI flash Caleb Ethridge
2026-05-21 13:53 ` [PATCH v6 02/16] mach-sc5xx: Remove update commands from default environment Caleb Ethridge
@ 2026-05-21 13:53 ` Caleb Ethridge
2026-05-21 13:53 ` [PATCH v6 04/16] mach-sc5xx: Update boot commands Caleb Ethridge
` (13 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Caleb Ethridge @ 2026-05-21 13:53 UTC (permalink / raw)
To: u-boot; +Cc: trini, malysagreg, philip, sjg, linux, jcethrid, Caleb Ethridge
Add CONFIG_SC5XX_LOADADDR to the sc59x family of
boards to set the default load address for the
loaded fit image. This value is autopopulated into
the environment variable loadaddr.
Signed-off-by: Caleb Ethridge <caleb.ethridge@analog.com>
---
configs/sc594-som-ezkit-spl_defconfig | 1 +
configs/sc594-som-ezlite-spl_defconfig | 1 +
configs/sc598-som-ezkit-spl_defconfig | 1 +
configs/sc598-som-ezlite-spl_defconfig | 1 +
4 files changed, 4 insertions(+)
diff --git a/configs/sc594-som-ezkit-spl_defconfig b/configs/sc594-som-ezkit-spl_defconfig
index c379de2c146..89ef08c1a72 100644
--- a/configs/sc594-som-ezkit-spl_defconfig
+++ b/configs/sc594-som-ezkit-spl_defconfig
@@ -74,3 +74,4 @@ CONFIG_SPL_TIMER=y
CONFIG_USB=y
CONFIG_USB_DWC2=y
CONFIG_USB_STORAGE=y
+CONFIG_SC5XX_LOADADDR=0xA2000000
diff --git a/configs/sc594-som-ezlite-spl_defconfig b/configs/sc594-som-ezlite-spl_defconfig
index 54b26ed85c2..9e907d31136 100644
--- a/configs/sc594-som-ezlite-spl_defconfig
+++ b/configs/sc594-som-ezlite-spl_defconfig
@@ -83,3 +83,4 @@ CONFIG_USB_DWC2=y
CONFIG_USB_STORAGE=y
# CONFIG_SPL_CRC8 is not set
# CONFIG_TOOLS_MKEFICAPSULE is not set
+CONFIG_SC5XX_LOADADDR=0xA2000000
diff --git a/configs/sc598-som-ezkit-spl_defconfig b/configs/sc598-som-ezkit-spl_defconfig
index 98256517b87..cd1bafd7486 100644
--- a/configs/sc598-som-ezkit-spl_defconfig
+++ b/configs/sc598-som-ezkit-spl_defconfig
@@ -107,3 +107,4 @@ CONFIG_USB_DWC2=y
CONFIG_USB_STORAGE=y
# CONFIG_SPL_CRC8 is not set
# CONFIG_TOOLS_MKEFICAPSULE is not set
+CONFIG_SC5XX_LOADADDR=0x90000000
diff --git a/configs/sc598-som-ezlite-spl_defconfig b/configs/sc598-som-ezlite-spl_defconfig
index 1c4f9309daa..e4a975eedfc 100644
--- a/configs/sc598-som-ezlite-spl_defconfig
+++ b/configs/sc598-som-ezlite-spl_defconfig
@@ -105,3 +105,4 @@ CONFIG_USB_DWC2=y
CONFIG_USB_STORAGE=y
# CONFIG_SPL_CRC8 is not set
# CONFIG_TOOLS_MKEFICAPSULE is not set
+CONFIG_SC5XX_LOADADDR=0x90000000
--
2.34.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v6 04/16] mach-sc5xx: Update boot commands
2026-05-21 13:53 [PATCH v6 00/16] sc5xx Environment Cleanup and Fixes Caleb Ethridge
` (2 preceding siblings ...)
2026-05-21 13:53 ` [PATCH v6 03/16] mach-sc59x: Add CONFIG_SC5XX_LOADADDR Caleb Ethridge
@ 2026-05-21 13:53 ` Caleb Ethridge
2026-05-21 13:53 ` [PATCH v6 05/16] mach-sc5xx: Switch from tftp to wget Caleb Ethridge
` (12 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Caleb Ethridge @ 2026-05-21 13:53 UTC (permalink / raw)
To: u-boot; +Cc: trini, malysagreg, philip, sjg, linux, jcethrid, Caleb Ethridge
Update the default boot commands to match the expected
bootargs in Linux and new SPI partitioning scheme.
Because the environment is no longer stored in the SPI
flash, imagesize has been removed and replaced with a fixed
length read to load from the SPI. Additionally the partitions
of the mmc have been updated. The first partition holds the fitImage
at /fitImage, and the second partition contains the rootfs.
With this change, the imagefile environment variable has also been
eliminated, the image in the first partition is expected to always
be named fitImage.
Signed-off-by: Caleb Ethridge <caleb.ethridge@analog.com>
---
board/adi/sc573-ezkit/sc573-ezkit.env | 2 +-
board/adi/sc584-ezkit/sc584-ezkit.env | 2 +-
board/adi/sc589-ezkit/sc589-ezkit.env | 2 +-
board/adi/sc589-mini/sc589-mini.env | 2 +-
board/adi/sc594-som-ezkit/sc594-som-ezkit.env | 2 +-
board/adi/sc594-som-ezlite/sc594-som-ezlite.env | 2 +-
board/adi/sc598-som-ezkit/sc598-som-ezkit.env | 2 +-
board/adi/sc598-som-ezlite/sc598-som-ezlite.env | 2 +-
configs/sc573-ezkit_defconfig | 1 -
configs/sc584-ezkit_defconfig | 1 -
configs/sc589-ezkit_defconfig | 1 -
configs/sc589-mini_defconfig | 1 -
include/env/adi/adi_boot.env | 16 ++++++++++------
13 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/board/adi/sc573-ezkit/sc573-ezkit.env b/board/adi/sc573-ezkit/sc573-ezkit.env
index 83cbe808efa..61381edab26 100644
--- a/board/adi/sc573-ezkit/sc573-ezkit.env
+++ b/board/adi/sc573-ezkit/sc573-ezkit.env
@@ -3,7 +3,7 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
-adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET
+adi_image_offset=0xe0000
loadaddr=CONFIG_SC5XX_LOADADDR
#define USE_NFS
diff --git a/board/adi/sc584-ezkit/sc584-ezkit.env b/board/adi/sc584-ezkit/sc584-ezkit.env
index 2640d97bab2..f676343a272 100644
--- a/board/adi/sc584-ezkit/sc584-ezkit.env
+++ b/board/adi/sc584-ezkit/sc584-ezkit.env
@@ -3,7 +3,7 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
-adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET
+adi_image_offset=0xe0000
loadaddr=CONFIG_SC5XX_LOADADDR
#define USE_NFS
diff --git a/board/adi/sc589-ezkit/sc589-ezkit.env b/board/adi/sc589-ezkit/sc589-ezkit.env
index a098f0b9c2c..8a1b9a6e92a 100644
--- a/board/adi/sc589-ezkit/sc589-ezkit.env
+++ b/board/adi/sc589-ezkit/sc589-ezkit.env
@@ -3,7 +3,7 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
-adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET
+adi_image_offset=0xe0000
loadaddr=CONFIG_SC5XX_LOADADDR
#define USE_NFS
diff --git a/board/adi/sc589-mini/sc589-mini.env b/board/adi/sc589-mini/sc589-mini.env
index bed2ddc944d..39ee0c54da0 100644
--- a/board/adi/sc589-mini/sc589-mini.env
+++ b/board/adi/sc589-mini/sc589-mini.env
@@ -3,7 +3,7 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
-adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET
+adi_image_offset=0xe0000
loadaddr=CONFIG_SC5XX_LOADADDR
#define USE_NFS
diff --git a/board/adi/sc594-som-ezkit/sc594-som-ezkit.env b/board/adi/sc594-som-ezkit/sc594-som-ezkit.env
index f629f7f2cff..12980f71ba2 100644
--- a/board/adi/sc594-som-ezkit/sc594-som-ezkit.env
+++ b/board/adi/sc594-som-ezkit/sc594-som-ezkit.env
@@ -3,7 +3,7 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
-adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET
+adi_image_offset=0x110000
loadaddr=CONFIG_SC5XX_LOADADDR
#define USE_NFS
diff --git a/board/adi/sc594-som-ezlite/sc594-som-ezlite.env b/board/adi/sc594-som-ezlite/sc594-som-ezlite.env
index f629f7f2cff..12980f71ba2 100644
--- a/board/adi/sc594-som-ezlite/sc594-som-ezlite.env
+++ b/board/adi/sc594-som-ezlite/sc594-som-ezlite.env
@@ -3,7 +3,7 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
-adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET
+adi_image_offset=0x110000
loadaddr=CONFIG_SC5XX_LOADADDR
#define USE_NFS
diff --git a/board/adi/sc598-som-ezkit/sc598-som-ezkit.env b/board/adi/sc598-som-ezkit/sc598-som-ezkit.env
index f629f7f2cff..12980f71ba2 100644
--- a/board/adi/sc598-som-ezkit/sc598-som-ezkit.env
+++ b/board/adi/sc598-som-ezkit/sc598-som-ezkit.env
@@ -3,7 +3,7 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
-adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET
+adi_image_offset=0x110000
loadaddr=CONFIG_SC5XX_LOADADDR
#define USE_NFS
diff --git a/board/adi/sc598-som-ezlite/sc598-som-ezlite.env b/board/adi/sc598-som-ezlite/sc598-som-ezlite.env
index 7b13d6fc32b..d5364df1613 100644
--- a/board/adi/sc598-som-ezlite/sc598-som-ezlite.env
+++ b/board/adi/sc598-som-ezlite/sc598-som-ezlite.env
@@ -3,7 +3,7 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
-adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET
+adi_image_offset=0x100000
loadaddr=CONFIG_SC5XX_LOADADDR
#include <env/adi/adi_boot.env>
diff --git a/configs/sc573-ezkit_defconfig b/configs/sc573-ezkit_defconfig
index 7a0c7d04e84..4320c73fd39 100644
--- a/configs/sc573-ezkit_defconfig
+++ b/configs/sc573-ezkit_defconfig
@@ -6,7 +6,6 @@ CONFIG_SPL_GPIO=y
CONFIG_DM_GPIO=y
CONFIG_SPL_SYS_MALLOC_F_LEN=0x10000
CONFIG_SPL_SERIAL=y
-CONFIG_SC5XX_FITIMAGE_OFFSET=0xE0000
CONFIG_SC5XX_LOADADDR=0x83000000
CONFIG_WATCHDOG_TIMEOUT_MSECS=60000
CONFIG_CGU0_CLKOUTSEL=7
diff --git a/configs/sc584-ezkit_defconfig b/configs/sc584-ezkit_defconfig
index 7975a610ca3..52ab7c9337b 100644
--- a/configs/sc584-ezkit_defconfig
+++ b/configs/sc584-ezkit_defconfig
@@ -10,7 +10,6 @@ CONFIG_SPL_STACK=0x200C0000
CONFIG_SPL_BSS_START_ADDR=0x200A0000
CONFIG_SPL_BSS_MAX_SIZE=0x8000
CONFIG_SC58X=y
-CONFIG_SC5XX_FITIMAGE_OFFSET=0xE0000
CONFIG_SC5XX_LOADADDR=0x89300000
CONFIG_WATCHDOG_TIMEOUT_MSECS=60000
CONFIG_ADI_BUG_EZKHW21=y
diff --git a/configs/sc589-ezkit_defconfig b/configs/sc589-ezkit_defconfig
index 0ceb57f1f42..a249fe8df7b 100644
--- a/configs/sc589-ezkit_defconfig
+++ b/configs/sc589-ezkit_defconfig
@@ -13,7 +13,6 @@ CONFIG_SPL_BSS_START_ADDR=0x200A0000
CONFIG_SPL_BSS_MAX_SIZE=0x8000
CONFIG_SC58X=y
CONFIG_TARGET_SC589_EZKIT=y
-CONFIG_SC5XX_FITIMAGE_OFFSET=0xE0000
CONFIG_SC5XX_LOADADDR=0xC3000000
CONFIG_WATCHDOG_TIMEOUT_MSECS=60000
CONFIG_ADI_USE_DMC1=y
diff --git a/configs/sc589-mini_defconfig b/configs/sc589-mini_defconfig
index 32678b63a9f..25285695367 100644
--- a/configs/sc589-mini_defconfig
+++ b/configs/sc589-mini_defconfig
@@ -12,7 +12,6 @@ CONFIG_SPL_BSS_START_ADDR=0x200A0000
CONFIG_SPL_BSS_MAX_SIZE=0x8000
CONFIG_SC58X=y
CONFIG_TARGET_SC589_MINI=y
-CONFIG_SC5XX_FITIMAGE_OFFSET=0xE0000
CONFIG_SC5XX_LOADADDR=0xC3000000
CONFIG_WATCHDOG_TIMEOUT_MSECS=60000
CONFIG_ADI_USE_DMC1=y
diff --git a/include/env/adi/adi_boot.env b/include/env/adi/adi_boot.env
index 42f33ed83af..b4b725247f7 100644
--- a/include/env/adi/adi_boot.env
+++ b/include/env/adi/adi_boot.env
@@ -39,23 +39,27 @@ nfsboot=run init_ethernet;
#endif
#if defined(USE_MMC)
-mmcargs=setenv bootargs root=/dev/mmcblk0p1 rw rootfstype=ext4 rootwait ${adi_bootargs}
+mmcargs=setenv bootargs root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait ${adi_bootargs}
mmcboot=mmc rescan;
- ext4load mmc 0:1 ${loadaddr} /boot/${imagefile};
+ ext4load mmc 0:1 ${loadaddr} /fitImage;
run mmcargs;
bootm ${loadaddr}
#endif
-#if defined(USE_SPI) || defined(USE_OSPI)
-spiargs=setenv bootargs root=/dev/mtdblock4 rw rootfstype=jffs2 ${adi_bootargs}
+#if defined(USE_SPI)
+spiargs=setenv bootargs root=/dev/mtdblock4 rw rootfstype=jffs2 ${adi_bootargs}; setenv sfdev CONFIG_SC_BOOT_SPI_BUS:CONFIG_SC_BOOT_SPI_SSEL
spiboot=run spiargs;
sf probe ${sfdev};
- sf read ${loadaddr} ${adi_image_offset} ${imagesize};
+ sf read ${loadaddr} ${adi_image_offset} 0xf00000;
bootm ${loadaddr}
#endif
#if defined(USE_OSPI)
-ospiboot=run spiboot
+ospiargs=setenv bootargs root=/dev/mtdblock4 rw rootfstype=jffs2 ${adi_bootargs}; setenv sfdev CONFIG_SC_BOOT_OSPI_BUS:CONFIG_SC_BOOT_OSPI_SSEL
+ospiboot=run ospiargs;
+ sf probe ${sfdev};
+ sf read ${loadaddr} ${adi_image_offset} 0xf00000;
+ bootm ${loadaddr}
#endif
#if defined(USE_RAM)
--
2.34.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v6 05/16] mach-sc5xx: Switch from tftp to wget
2026-05-21 13:53 [PATCH v6 00/16] sc5xx Environment Cleanup and Fixes Caleb Ethridge
` (3 preceding siblings ...)
2026-05-21 13:53 ` [PATCH v6 04/16] mach-sc5xx: Update boot commands Caleb Ethridge
@ 2026-05-21 13:53 ` Caleb Ethridge
2026-05-21 13:53 ` [PATCH v6 06/16] mach-sc5xx: Add USB boot command Caleb Ethridge
` (11 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Caleb Ethridge @ 2026-05-21 13:53 UTC (permalink / raw)
To: u-boot; +Cc: trini, malysagreg, philip, sjg, linux, jcethrid, Caleb Ethridge
Switch the nfsboot and other relevant commands to use
wget instead of tftp. This also includes the addition of
the httpdstp variable for selecting the wget port.
There is no longer any automatic DHCP configuration. Before
running a command with wget, either 'dhcp' must be run or
the 'ipaddr' and 'serverip' variables must be set. Additionally,
the nfsboot command looks for the file named 'fitImage' on the
server to use to boot.
The default port is set to 8000 instead of the usual 80
to allow for use with an unprivileged web server.
Signed-off-by: Caleb Ethridge <caleb.ethridge@analog.com>
---
include/env/adi/adi_boot.env | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/include/env/adi/adi_boot.env b/include/env/adi/adi_boot.env
index b4b725247f7..be4d8521ac9 100644
--- a/include/env/adi/adi_boot.env
+++ b/include/env/adi/adi_boot.env
@@ -14,6 +14,7 @@
/* Config options */
ethaddr=02:80:ad:20:31:e8
eth1addr=02:80:ad:20:31:e9
+httpdstp=8000
uart_console=CONFIG_UART_CONSOLE
#ifdef CONFIG_SC59X_64
initrd_high=0xffffffffffffffff
@@ -26,15 +27,14 @@ adi_bootargs=EARLY_PRINTK console=ttySC0,CONFIG_BAUDRATE vmalloc=512M
ramargs=setenv bootargs ${adi_bootargs}
addip=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}:eth0:off
+rootpath=/romfs
/* Boot modes are selectable and should be defined in the board env before including */
#if defined(USE_NFS)
-// rootpath is set by CONFIG_ROOTPATH
nfsargs=setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath},tcp,nfsvers=3 ${adi_bootargs}
-nfsboot=run init_ethernet;
- tftp ${loadaddr} ${tftp_dir_prefix}${imagefile};
- run nfsargs;
+nfsboot=run nfsargs;
run addip;
+ wget ${loadaddr} ${serverip}:/fitImage;
bootm ${loadaddr}
#endif
@@ -63,8 +63,7 @@ ospiboot=run ospiargs;
#endif
#if defined(USE_RAM)
-ramboot=run init_ethernet;
- tftp ${loadaddr} ${tfpt_dir_prefix}${imagefile};
+ramboot=wget ${loadaddr} ${serverip}:/fitImage;
run ramargs;
bootm ${loadaddr}
#endif
--
2.34.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v6 06/16] mach-sc5xx: Add USB boot command
2026-05-21 13:53 [PATCH v6 00/16] sc5xx Environment Cleanup and Fixes Caleb Ethridge
` (4 preceding siblings ...)
2026-05-21 13:53 ` [PATCH v6 05/16] mach-sc5xx: Switch from tftp to wget Caleb Ethridge
@ 2026-05-21 13:53 ` Caleb Ethridge
2026-05-21 13:53 ` [PATCH v6 07/16] mach-sc5xx: Remove preliminary binman support Caleb Ethridge
` (10 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Caleb Ethridge @ 2026-05-21 13:53 UTC (permalink / raw)
To: u-boot; +Cc: trini, malysagreg, philip, sjg, linux, jcethrid, Caleb Ethridge
Add the USB boot command to the environments
of the boards that support it.
Signed-off-by: Caleb Ethridge <caleb.ethridge@analog.com>
---
board/adi/sc573-ezkit/sc573-ezkit.env | 1 +
board/adi/sc584-ezkit/sc584-ezkit.env | 1 +
board/adi/sc589-ezkit/sc589-ezkit.env | 1 +
board/adi/sc589-mini/sc589-mini.env | 1 +
board/adi/sc594-som-ezkit/sc594-som-ezkit.env | 1 +
board/adi/sc594-som-ezlite/sc594-som-ezlite.env | 1 +
board/adi/sc598-som-ezkit/sc598-som-ezkit.env | 1 +
include/env/adi/adi_boot.env | 8 ++++++++
8 files changed, 15 insertions(+)
diff --git a/board/adi/sc573-ezkit/sc573-ezkit.env b/board/adi/sc573-ezkit/sc573-ezkit.env
index 61381edab26..e1ad4f3716f 100644
--- a/board/adi/sc573-ezkit/sc573-ezkit.env
+++ b/board/adi/sc573-ezkit/sc573-ezkit.env
@@ -10,5 +10,6 @@ loadaddr=CONFIG_SC5XX_LOADADDR
#define USE_SPI
#define USE_RAM
#define USE_MMC
+#define USE_USB
#include <env/adi/adi_boot.env>
diff --git a/board/adi/sc584-ezkit/sc584-ezkit.env b/board/adi/sc584-ezkit/sc584-ezkit.env
index f676343a272..7e70f5e200a 100644
--- a/board/adi/sc584-ezkit/sc584-ezkit.env
+++ b/board/adi/sc584-ezkit/sc584-ezkit.env
@@ -9,5 +9,6 @@ loadaddr=CONFIG_SC5XX_LOADADDR
#define USE_NFS
#define USE_SPI
#define USE_RAM
+#define USE_USB
#include <env/adi/adi_boot.env>
diff --git a/board/adi/sc589-ezkit/sc589-ezkit.env b/board/adi/sc589-ezkit/sc589-ezkit.env
index 8a1b9a6e92a..b8d9b1ef362 100644
--- a/board/adi/sc589-ezkit/sc589-ezkit.env
+++ b/board/adi/sc589-ezkit/sc589-ezkit.env
@@ -10,5 +10,6 @@ loadaddr=CONFIG_SC5XX_LOADADDR
#define USE_RAM
#define USE_MMC
#define USE_SPI
+#define USE_USB
#include <env/adi/adi_boot.env>
diff --git a/board/adi/sc589-mini/sc589-mini.env b/board/adi/sc589-mini/sc589-mini.env
index 39ee0c54da0..560efeeceeb 100644
--- a/board/adi/sc589-mini/sc589-mini.env
+++ b/board/adi/sc589-mini/sc589-mini.env
@@ -10,5 +10,6 @@ loadaddr=CONFIG_SC5XX_LOADADDR
#define USE_RAM
#define USE_SPI
#define USE_MMC
+#define USE_USB
#include <env/adi/adi_boot.env>
diff --git a/board/adi/sc594-som-ezkit/sc594-som-ezkit.env b/board/adi/sc594-som-ezkit/sc594-som-ezkit.env
index 12980f71ba2..ef47640320d 100644
--- a/board/adi/sc594-som-ezkit/sc594-som-ezkit.env
+++ b/board/adi/sc594-som-ezkit/sc594-som-ezkit.env
@@ -11,5 +11,6 @@ loadaddr=CONFIG_SC5XX_LOADADDR
#define USE_OSPI
#define USE_RAM
#define USE_MMC
+#define USE_USB
#include <env/adi/adi_boot.env>
diff --git a/board/adi/sc594-som-ezlite/sc594-som-ezlite.env b/board/adi/sc594-som-ezlite/sc594-som-ezlite.env
index 12980f71ba2..ef47640320d 100644
--- a/board/adi/sc594-som-ezlite/sc594-som-ezlite.env
+++ b/board/adi/sc594-som-ezlite/sc594-som-ezlite.env
@@ -11,5 +11,6 @@ loadaddr=CONFIG_SC5XX_LOADADDR
#define USE_OSPI
#define USE_RAM
#define USE_MMC
+#define USE_USB
#include <env/adi/adi_boot.env>
diff --git a/board/adi/sc598-som-ezkit/sc598-som-ezkit.env b/board/adi/sc598-som-ezkit/sc598-som-ezkit.env
index 12980f71ba2..ef47640320d 100644
--- a/board/adi/sc598-som-ezkit/sc598-som-ezkit.env
+++ b/board/adi/sc598-som-ezkit/sc598-som-ezkit.env
@@ -11,5 +11,6 @@ loadaddr=CONFIG_SC5XX_LOADADDR
#define USE_OSPI
#define USE_RAM
#define USE_MMC
+#define USE_USB
#include <env/adi/adi_boot.env>
diff --git a/include/env/adi/adi_boot.env b/include/env/adi/adi_boot.env
index be4d8521ac9..00757fe7c99 100644
--- a/include/env/adi/adi_boot.env
+++ b/include/env/adi/adi_boot.env
@@ -67,3 +67,11 @@ ramboot=wget ${loadaddr} ${serverip}:/fitImage;
run ramargs;
bootm ${loadaddr}
#endif
+
+#if defined(USE_USB)
+usbargs=setenv bootargs root=/dev/sda2 rw rootfstype=ext4 rootwait ${adi_bootargs}
+usbboot=usb start;
+ run usbargs;
+ ext4load usb 0:1 ${loadaddr} /fitImage;
+ bootm ${loadaddr}
+#endif
--
2.34.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v6 07/16] mach-sc5xx: Remove preliminary binman support
2026-05-21 13:53 [PATCH v6 00/16] sc5xx Environment Cleanup and Fixes Caleb Ethridge
` (5 preceding siblings ...)
2026-05-21 13:53 ` [PATCH v6 06/16] mach-sc5xx: Add USB boot command Caleb Ethridge
@ 2026-05-21 13:53 ` Caleb Ethridge
2026-05-21 13:53 ` [PATCH v6 08/16] dts: sc594: Fix gige-reset line on EZKIT Caleb Ethridge
` (9 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Caleb Ethridge @ 2026-05-21 13:53 UTC (permalink / raw)
To: u-boot; +Cc: trini, malysagreg, philip, sjg, linux, jcethrid, Caleb Ethridge
Remove preliminary binman support from all sc5xx ADSP boards.
Full support was never added because it was unused.
Signed-off-by: Caleb Ethridge <caleb.ethridge@analog.com>
---
arch/arm/dts/sc5xx.dtsi | 41 -------------------------------------
arch/arm/mach-sc5xx/Kconfig | 33 -----------------------------
2 files changed, 74 deletions(-)
diff --git a/arch/arm/dts/sc5xx.dtsi b/arch/arm/dts/sc5xx.dtsi
index 9d346ae62e0..072631e34f7 100644
--- a/arch/arm/dts/sc5xx.dtsi
+++ b/arch/arm/dts/sc5xx.dtsi
@@ -25,47 +25,6 @@
bootph-pre-ram;
};
-#ifdef CONFIG_SC5XX_USE_BINMAN
- binman {
- filename = CONFIG_SC5XX_BINMAN_FILENAME;
- stage1-boot {
- offset = <CONFIG_SC5XX_UBOOT_SPL_OFFSET>;
- type = "blob-ext";
- filename = "spl/u-boot-spl.ldr";
- };
-
- /* since falcon mode can jump from SPL to OS directly
- * full u-boot is optional
- *
- * @todo: review if we can say this given support has
- * not yet been upstreamed. Otherwise we might have to
- * invoke binman only for full u-boot.
- */
- stage2-boot {
- offset = <CONFIG_SC5XX_UBOOT_OFFSET>;
- type = "blob-ext";
- filename = "u-boot.ldr";
- optional;
- };
-
-#ifdef CONFIG_SC5XX_FITIMAGE_NAME
- fitImage {
- offset = <CONFIG_SC5XX_FITIMAGE_OFFSET>;
- type = "blob-ext";
- filename = CONFIG_SC5XX_FITIMAGE_NAME;
- };
-#endif
-
-#ifdef CONFIG_SC5XX_ROOTFS_NAME
- rfs {
- offset = <CONFIG_SC5XX_ROOTFS_OFFSET>;
- type = "blob-ext";
- filename = CONFIG_SC5XX_ROOTFS_NAME;
- };
-#endif
- };
-#endif
-
clocks {
dummy: dummy {
compatible = "fixed-clock";
diff --git a/arch/arm/mach-sc5xx/Kconfig b/arch/arm/mach-sc5xx/Kconfig
index cfa7ed46a82..70fab57fb3c 100644
--- a/arch/arm/mach-sc5xx/Kconfig
+++ b/arch/arm/mach-sc5xx/Kconfig
@@ -146,39 +146,6 @@ config SC5XX_LOADADDR
help
The default load address for u-boot.
-menu "Binman configuration"
-config SC5XX_USE_BINMAN
- bool "Use binman for final image"
- select BINMAN
- help
- If you wish to use binman to assemble an image, say 'Y' here.
- This will enable binman-specific sections in the device tree.
-
-config SC5XX_BINMAN_FILENAME
- string "Image name"
- default "sc5xx-image.img"
- depends on SC5XX_USE_BINMAN
- help
- The name of the image that will be created by binman.
- This is used to create the final image.
-
-config SC5XX_FITIMAGE_NAME
- string "FitImage name"
- default "fitImage"
- depends on SC5XX_USE_BINMAN
- help
- The name of the fitImage to be packed by binman.
- This is used to create the final image.
-
-config SC5XX_ROOTFS_NAME
- string "RootFS name"
- default "rootfs"
- depends on SC5XX_USE_BINMAN
- help
- The name of the rootfs to be packed by binman.
- This is used to create the final image.
-endmenu
-
config ADI_IMAGE
string "ADI fitImage type"
help
--
2.34.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v6 08/16] dts: sc594: Fix gige-reset line on EZKIT
2026-05-21 13:53 [PATCH v6 00/16] sc5xx Environment Cleanup and Fixes Caleb Ethridge
` (6 preceding siblings ...)
2026-05-21 13:53 ` [PATCH v6 07/16] mach-sc5xx: Remove preliminary binman support Caleb Ethridge
@ 2026-05-21 13:53 ` Caleb Ethridge
2026-05-21 13:53 ` [PATCH v6 09/16] mach-sc5xx: sc573: Rename EZKIT board to EZLITE Caleb Ethridge
` (8 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Caleb Ethridge @ 2026-05-21 13:53 UTC (permalink / raw)
To: u-boot; +Cc: trini, malysagreg, philip, sjg, linux, jcethrid, Caleb Ethridge
The gige-reset line on the EZKIT was updated for the
sc598 but not the sc594. This commit aligns the two .dts
files since they are describing the same hardware, the
EZKIT carrier board.
Fixes: be7937847b7c ("board: adi: Add support for SC594")
Signed-off-by: Caleb Ethridge <caleb.ethridge@analog.com>
---
arch/arm/dts/sc594-som-ezkit.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/dts/sc594-som-ezkit.dts b/arch/arm/dts/sc594-som-ezkit.dts
index dea9a6e27f2..396502b6745 100644
--- a/arch/arm/dts/sc594-som-ezkit.dts
+++ b/arch/arm/dts/sc594-som-ezkit.dts
@@ -130,7 +130,7 @@
gige-reset {
gpio-hog;
- gpios = <15 GPIO_ACTIVE_HIGH>;
+ gpios = <15 GPIO_ACTIVE_LOW>;
output-high;
line-name = "gige-reset";
bootph-pre-ram;
--
2.34.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v6 09/16] mach-sc5xx: sc573: Rename EZKIT board to EZLITE
2026-05-21 13:53 [PATCH v6 00/16] sc5xx Environment Cleanup and Fixes Caleb Ethridge
` (7 preceding siblings ...)
2026-05-21 13:53 ` [PATCH v6 08/16] dts: sc594: Fix gige-reset line on EZKIT Caleb Ethridge
@ 2026-05-21 13:53 ` Caleb Ethridge
2026-05-21 13:53 ` [PATCH v6 10/16] mach-sc5xx: Update image load address Caleb Ethridge
` (7 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Caleb Ethridge @ 2026-05-21 13:53 UTC (permalink / raw)
To: u-boot; +Cc: trini, malysagreg, philip, sjg, linux, jcethrid, Caleb Ethridge
Rename the SC573 EZKIT board to EZLITE across the device tree,
defconfig, board file, and related Kconfig/Makefile entries to
match with release naming. EZKIT was used internally before the
official product release.
Signed-off-by: Caleb Ethridge <caleb.ethridge@analog.com>
---
arch/arm/dts/Makefile | 2 +-
arch/arm/dts/{sc573-ezkit.dts => sc573-ezlite.dts} | 4 ++--
arch/arm/mach-sc5xx/Kconfig | 8 ++++----
arch/arm/mach-sc5xx/init/dmcinit.c | 2 +-
board/adi/{sc573-ezkit => sc573-ezlite}/Kconfig | 8 ++++----
board/adi/{sc573-ezkit => sc573-ezlite}/Makefile | 2 +-
.../sc573-ezkit.c => sc573-ezlite/sc573-ezlite.c} | 0
.../sc573-ezkit.env => sc573-ezlite/sc573-ezlite.env} | 0
configs/{sc573-ezkit_defconfig => sc573-ezlite_defconfig} | 2 +-
doc/device-tree-bindings/arm/adi/adi,sc5xx.yaml | 2 +-
include/configs/{sc573-ezkit.h => sc573-ezlite.h} | 4 ++--
11 files changed, 17 insertions(+), 17 deletions(-)
rename arch/arm/dts/{sc573-ezkit.dts => sc573-ezlite.dts} (98%)
rename board/adi/{sc573-ezkit => sc573-ezlite}/Kconfig (92%)
rename board/adi/{sc573-ezkit => sc573-ezlite}/Makefile (79%)
rename board/adi/{sc573-ezkit/sc573-ezkit.c => sc573-ezlite/sc573-ezlite.c} (100%)
rename board/adi/{sc573-ezkit/sc573-ezkit.env => sc573-ezlite/sc573-ezlite.env} (100%)
rename configs/{sc573-ezkit_defconfig => sc573-ezlite_defconfig} (98%)
rename include/configs/{sc573-ezkit.h => sc573-ezlite.h} (79%)
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index d5dd0867622..1e8676284b7 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -1178,7 +1178,7 @@ dtb-$(CONFIG_TARGET_IMX8MM_CL_IOT_GATE_OPTEE) += imx8mm-cl-iot-gate-optee.dtb \
imx8mm-cl-iot-gate-ied-tpm0.dtbo \
imx8mm-cl-iot-gate-ied-tpm1.dtbo
-dtb-$(CONFIG_TARGET_SC573_EZKIT) += sc573-ezkit.dtb
+dtb-$(CONFIG_TARGET_SC573_EZLITE) += sc573-ezlite.dtb
dtb-$(CONFIG_TARGET_SC584_EZKIT) += sc584-ezkit.dtb
dtb-$(CONFIG_TARGET_SC589_MINI) += sc589-mini.dtb
dtb-$(CONFIG_TARGET_SC589_EZKIT) += sc589-ezkit.dtb
diff --git a/arch/arm/dts/sc573-ezkit.dts b/arch/arm/dts/sc573-ezlite.dts
similarity index 98%
rename from arch/arm/dts/sc573-ezkit.dts
rename to arch/arm/dts/sc573-ezlite.dts
index 4a3d1ed5c56..57604d707f7 100644
--- a/arch/arm/dts/sc573-ezkit.dts
+++ b/arch/arm/dts/sc573-ezlite.dts
@@ -9,8 +9,8 @@
#include "sc57x.dtsi"
/ {
- model = "ADI SC573-EZKIT";
- compatible = "adi,sc573-ezkit", "adi,sc57x";
+ model = "ADI SC573-EZLITE";
+ compatible = "adi,sc573-ezlite", "adi,sc57x";
};
&i2c0 {
diff --git a/arch/arm/mach-sc5xx/Kconfig b/arch/arm/mach-sc5xx/Kconfig
index 70fab57fb3c..e311a8adf9a 100644
--- a/arch/arm/mach-sc5xx/Kconfig
+++ b/arch/arm/mach-sc5xx/Kconfig
@@ -25,7 +25,7 @@ config SC57X
bool "SC57x series"
select COMMON_CLK_ADI_SC57X
select CPU_V7A
- select TARGET_SC573_EZKIT
+ select TARGET_SC573_EZLITE
config SC58X
bool "SC58x series"
@@ -51,8 +51,8 @@ endchoice
if SC57X
-config TARGET_SC573_EZKIT
- bool "Support SC573-EZKIT"
+config TARGET_SC573_EZLITE
+ bool "Support SC573-EZLITE"
endif
@@ -600,6 +600,6 @@ source "board/adi/sc594-som-ezlite/Kconfig"
source "board/adi/sc589-ezkit/Kconfig"
source "board/adi/sc589-mini/Kconfig"
source "board/adi/sc584-ezkit/Kconfig"
-source "board/adi/sc573-ezkit/Kconfig"
+source "board/adi/sc573-ezlite/Kconfig"
endif
diff --git a/arch/arm/mach-sc5xx/init/dmcinit.c b/arch/arm/mach-sc5xx/init/dmcinit.c
index 12052613feb..2026735cc21 100644
--- a/arch/arm/mach-sc5xx/init/dmcinit.c
+++ b/arch/arm/mach-sc5xx/init/dmcinit.c
@@ -101,7 +101,7 @@
#ifdef CONFIG_TARGET_SC584_EZKIT
#define DMC_PADCTL2_VALUE 0x0078283C
-#elif CONFIG_TARGET_SC573_EZKIT
+#elif CONFIG_TARGET_SC573_EZLITE
#define DMC_PADCTL2_VALUE 0x00782828
#elif CONFIG_TARGET_SC589_MINI || CONFIG_TARGET_SC589_EZKIT
#define DMC_PADCTL2_VALUE 0x00783C3C
diff --git a/board/adi/sc573-ezkit/Kconfig b/board/adi/sc573-ezlite/Kconfig
similarity index 92%
rename from board/adi/sc573-ezkit/Kconfig
rename to board/adi/sc573-ezlite/Kconfig
index 328563c1296..f3b848ef0f7 100644
--- a/board/adi/sc573-ezkit/Kconfig
+++ b/board/adi/sc573-ezlite/Kconfig
@@ -2,19 +2,19 @@
#
# (C) Copyright 2024 - Analog Devices, Inc.
-if TARGET_SC573_EZKIT
+if TARGET_SC573_EZLITE
config SYS_BOARD
- default "sc573-ezkit"
+ default "sc573-ezlite"
config SYS_CONFIG_NAME
- default "sc573-ezkit"
+ default "sc573-ezlite"
config LDR_CPU
default "ADSP-SC573-0.0"
config DEFAULT_DEVICE_TREE
- default "sc573-ezkit"
+ default "sc573-ezlite"
config ADI_IMAGE
default "tiny"
diff --git a/board/adi/sc573-ezkit/Makefile b/board/adi/sc573-ezlite/Makefile
similarity index 79%
rename from board/adi/sc573-ezkit/Makefile
rename to board/adi/sc573-ezlite/Makefile
index 0ea725b992b..77c55af6240 100644
--- a/board/adi/sc573-ezkit/Makefile
+++ b/board/adi/sc573-ezlite/Makefile
@@ -3,4 +3,4 @@
# (C) Copyright 2025 - Analog Devices, Inc.
#
-obj-y += sc573-ezkit.o
+obj-y += sc573-ezlite.o
diff --git a/board/adi/sc573-ezkit/sc573-ezkit.c b/board/adi/sc573-ezlite/sc573-ezlite.c
similarity index 100%
rename from board/adi/sc573-ezkit/sc573-ezkit.c
rename to board/adi/sc573-ezlite/sc573-ezlite.c
diff --git a/board/adi/sc573-ezkit/sc573-ezkit.env b/board/adi/sc573-ezlite/sc573-ezlite.env
similarity index 100%
rename from board/adi/sc573-ezkit/sc573-ezkit.env
rename to board/adi/sc573-ezlite/sc573-ezlite.env
diff --git a/configs/sc573-ezkit_defconfig b/configs/sc573-ezlite_defconfig
similarity index 98%
rename from configs/sc573-ezkit_defconfig
rename to configs/sc573-ezlite_defconfig
index 4320c73fd39..f6305451c27 100644
--- a/configs/sc573-ezkit_defconfig
+++ b/configs/sc573-ezlite_defconfig
@@ -47,7 +47,7 @@ CONFIG_SPL_OF_CONTROL=y
CONFIG_OF_EMBED=y
CONFIG_ENV_OVERWRITE=y
CONFIG_USE_HOSTNAME=y
-CONFIG_HOSTNAME="sc573-ezkit"
+CONFIG_HOSTNAME="sc573-ezlite"
CONFIG_NET_RETRY_COUNT=20
CONFIG_IP_DEFRAG=y
CONFIG_SPL_CLK=y
diff --git a/doc/device-tree-bindings/arm/adi/adi,sc5xx.yaml b/doc/device-tree-bindings/arm/adi/adi,sc5xx.yaml
index df976c7ae73..ae3b5e6092a 100644
--- a/doc/device-tree-bindings/arm/adi/adi,sc5xx.yaml
+++ b/doc/device-tree-bindings/arm/adi/adi,sc5xx.yaml
@@ -18,7 +18,7 @@ properties:
oneOf:
- description: SC57X Series Boards
items:
- - const: adi,sc573-ezkit
+ - const: adi,sc573-ezlite
- const: adi,sc57x
- description: SC58X Series Boards
diff --git a/include/configs/sc573-ezkit.h b/include/configs/sc573-ezlite.h
similarity index 79%
rename from include/configs/sc573-ezkit.h
rename to include/configs/sc573-ezlite.h
index 42e42f8150b..590a8f06fb5 100644
--- a/include/configs/sc573-ezkit.h
+++ b/include/configs/sc573-ezlite.h
@@ -3,8 +3,8 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
-#ifndef __CONFIG_SC573_EZKIT_H
-#define __CONFIG_SC573_EZKIT_H
+#ifndef __CONFIG_SC573_EZLITE_H
+#define __CONFIG_SC573_EZLITE_H
/*
* Memory Settings
--
2.34.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v6 10/16] mach-sc5xx: Update image load address
2026-05-21 13:53 [PATCH v6 00/16] sc5xx Environment Cleanup and Fixes Caleb Ethridge
` (8 preceding siblings ...)
2026-05-21 13:53 ` [PATCH v6 09/16] mach-sc5xx: sc573: Rename EZKIT board to EZLITE Caleb Ethridge
@ 2026-05-21 13:53 ` Caleb Ethridge
2026-05-21 13:53 ` [PATCH v6 11/16] mach-sc5xx: Update SPI bootargs for ubifs Caleb Ethridge
` (6 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Caleb Ethridge @ 2026-05-21 13:53 UTC (permalink / raw)
To: u-boot; +Cc: trini, malysagreg, philip, sjg, linux, jcethrid, Caleb Ethridge
Update the load address for the image in
each environment to match the updated partitions
in Linux.
The partitions in Linux for the spi are named as follows:
- u-boot-spl
- u-boot
- kernel
- rootfs
The kernel partition is at 0x100000 for sc59x family boards,
and 0xd0000 for all other sc5xx boards.
Signed-off-by: Caleb Ethridge <caleb.ethridge@analog.com>
---
board/adi/sc573-ezlite/sc573-ezlite.env | 2 +-
board/adi/sc584-ezkit/sc584-ezkit.env | 2 +-
board/adi/sc589-ezkit/sc589-ezkit.env | 2 +-
board/adi/sc589-mini/sc589-mini.env | 2 +-
board/adi/sc594-som-ezkit/sc594-som-ezkit.env | 2 +-
board/adi/sc594-som-ezlite/sc594-som-ezlite.env | 2 +-
board/adi/sc598-som-ezkit/sc598-som-ezkit.env | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/board/adi/sc573-ezlite/sc573-ezlite.env b/board/adi/sc573-ezlite/sc573-ezlite.env
index e1ad4f3716f..c909b3b476a 100644
--- a/board/adi/sc573-ezlite/sc573-ezlite.env
+++ b/board/adi/sc573-ezlite/sc573-ezlite.env
@@ -3,7 +3,7 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
-adi_image_offset=0xe0000
+adi_image_offset=0xd0000
loadaddr=CONFIG_SC5XX_LOADADDR
#define USE_NFS
diff --git a/board/adi/sc584-ezkit/sc584-ezkit.env b/board/adi/sc584-ezkit/sc584-ezkit.env
index 7e70f5e200a..905523fb151 100644
--- a/board/adi/sc584-ezkit/sc584-ezkit.env
+++ b/board/adi/sc584-ezkit/sc584-ezkit.env
@@ -3,7 +3,7 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
-adi_image_offset=0xe0000
+adi_image_offset=0xd0000
loadaddr=CONFIG_SC5XX_LOADADDR
#define USE_NFS
diff --git a/board/adi/sc589-ezkit/sc589-ezkit.env b/board/adi/sc589-ezkit/sc589-ezkit.env
index b8d9b1ef362..02567830c16 100644
--- a/board/adi/sc589-ezkit/sc589-ezkit.env
+++ b/board/adi/sc589-ezkit/sc589-ezkit.env
@@ -3,7 +3,7 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
-adi_image_offset=0xe0000
+adi_image_offset=0xd0000
loadaddr=CONFIG_SC5XX_LOADADDR
#define USE_NFS
diff --git a/board/adi/sc589-mini/sc589-mini.env b/board/adi/sc589-mini/sc589-mini.env
index 560efeeceeb..661c130b835 100644
--- a/board/adi/sc589-mini/sc589-mini.env
+++ b/board/adi/sc589-mini/sc589-mini.env
@@ -3,7 +3,7 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
-adi_image_offset=0xe0000
+adi_image_offset=0xd0000
loadaddr=CONFIG_SC5XX_LOADADDR
#define USE_NFS
diff --git a/board/adi/sc594-som-ezkit/sc594-som-ezkit.env b/board/adi/sc594-som-ezkit/sc594-som-ezkit.env
index ef47640320d..f787d972339 100644
--- a/board/adi/sc594-som-ezkit/sc594-som-ezkit.env
+++ b/board/adi/sc594-som-ezkit/sc594-som-ezkit.env
@@ -3,7 +3,7 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
-adi_image_offset=0x110000
+adi_image_offset=0x100000
loadaddr=CONFIG_SC5XX_LOADADDR
#define USE_NFS
diff --git a/board/adi/sc594-som-ezlite/sc594-som-ezlite.env b/board/adi/sc594-som-ezlite/sc594-som-ezlite.env
index ef47640320d..f787d972339 100644
--- a/board/adi/sc594-som-ezlite/sc594-som-ezlite.env
+++ b/board/adi/sc594-som-ezlite/sc594-som-ezlite.env
@@ -3,7 +3,7 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
-adi_image_offset=0x110000
+adi_image_offset=0x100000
loadaddr=CONFIG_SC5XX_LOADADDR
#define USE_NFS
diff --git a/board/adi/sc598-som-ezkit/sc598-som-ezkit.env b/board/adi/sc598-som-ezkit/sc598-som-ezkit.env
index ef47640320d..f787d972339 100644
--- a/board/adi/sc598-som-ezkit/sc598-som-ezkit.env
+++ b/board/adi/sc598-som-ezkit/sc598-som-ezkit.env
@@ -3,7 +3,7 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
-adi_image_offset=0x110000
+adi_image_offset=0x100000
loadaddr=CONFIG_SC5XX_LOADADDR
#define USE_NFS
--
2.34.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v6 11/16] mach-sc5xx: Update SPI bootargs for ubifs
2026-05-21 13:53 [PATCH v6 00/16] sc5xx Environment Cleanup and Fixes Caleb Ethridge
` (9 preceding siblings ...)
2026-05-21 13:53 ` [PATCH v6 10/16] mach-sc5xx: Update image load address Caleb Ethridge
@ 2026-05-21 13:53 ` Caleb Ethridge
2026-05-21 13:53 ` [PATCH v6 12/16] configs: sc5xx: Set default bootcmd to SPI boot Caleb Ethridge
` (5 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Caleb Ethridge @ 2026-05-21 13:53 UTC (permalink / raw)
To: u-boot; +Cc: trini, malysagreg, philip, sjg, linux, jcethrid, Caleb Ethridge
Update the bootargs used in SPI/OSPI bootmode
to reflect change from jffs2 to ubifs for the
SPI's filesystem, and remove the jffs2file variable
from the environment as it is now unused.
Signed-off-by: Caleb Ethridge <caleb.ethridge@analog.com>
---
include/env/adi/adi_boot.env | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/env/adi/adi_boot.env b/include/env/adi/adi_boot.env
index 00757fe7c99..b75baabdca6 100644
--- a/include/env/adi/adi_boot.env
+++ b/include/env/adi/adi_boot.env
@@ -47,7 +47,7 @@ mmcboot=mmc rescan;
#endif
#if defined(USE_SPI)
-spiargs=setenv bootargs root=/dev/mtdblock4 rw rootfstype=jffs2 ${adi_bootargs}; setenv sfdev CONFIG_SC_BOOT_SPI_BUS:CONFIG_SC_BOOT_SPI_SSEL
+spiargs=setenv bootargs rootfstype=ubifs root=ubi0:rootfs ubi.mtd=3 rw ${adi_bootargs}; setenv sfdev CONFIG_SC_BOOT_SPI_BUS:CONFIG_SC_BOOT_SPI_SSEL
spiboot=run spiargs;
sf probe ${sfdev};
sf read ${loadaddr} ${adi_image_offset} 0xf00000;
@@ -55,7 +55,7 @@ spiboot=run spiargs;
#endif
#if defined(USE_OSPI)
-ospiargs=setenv bootargs root=/dev/mtdblock4 rw rootfstype=jffs2 ${adi_bootargs}; setenv sfdev CONFIG_SC_BOOT_OSPI_BUS:CONFIG_SC_BOOT_OSPI_SSEL
+ospiargs=setenv bootargs rootfstype=ubifs root=ubi0:rootfs ubi.mtd=3 rw ${adi_bootargs}; setenv sfdev CONFIG_SC_BOOT_OSPI_BUS:CONFIG_SC_BOOT_OSPI_SSEL
ospiboot=run ospiargs;
sf probe ${sfdev};
sf read ${loadaddr} ${adi_image_offset} 0xf00000;
--
2.34.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v6 12/16] configs: sc5xx: Set default bootcmd to SPI boot
2026-05-21 13:53 [PATCH v6 00/16] sc5xx Environment Cleanup and Fixes Caleb Ethridge
` (10 preceding siblings ...)
2026-05-21 13:53 ` [PATCH v6 11/16] mach-sc5xx: Update SPI bootargs for ubifs Caleb Ethridge
@ 2026-05-21 13:53 ` Caleb Ethridge
2026-05-21 13:53 ` [PATCH v6 13/16] arm: sc5xx: Remove SC5XX_LOADADDR Caleb Ethridge
` (4 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Caleb Ethridge @ 2026-05-21 13:53 UTC (permalink / raw)
To: u-boot; +Cc: trini, malysagreg, philip, sjg, linux, jcethrid, Caleb Ethridge
Align configs to use the same default bootcommand. With the environment
no longer stored in the SPI, SPI boot is the intended default boot
method for all sc5xx platforms, with the exception of the sc573, and the
sc584.
The sc59x boards, the sc594 and the sc598, additionally have the option
of using OSPI for boot, but the default boot method for these boards is
still SPI.
Signed-off-by: Caleb Ethridge <caleb.ethridge@analog.com>
---
configs/sc589-ezkit_defconfig | 2 +-
configs/sc589-mini_defconfig | 2 +-
configs/sc594-som-ezkit-spl_defconfig | 2 +-
configs/sc594-som-ezlite-spl_defconfig | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/configs/sc589-ezkit_defconfig b/configs/sc589-ezkit_defconfig
index a249fe8df7b..d8982f62d82 100644
--- a/configs/sc589-ezkit_defconfig
+++ b/configs/sc589-ezkit_defconfig
@@ -22,7 +22,7 @@ CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_LEGACY_IMAGE_FORMAT=y
CONFIG_USE_BOOTCOMMAND=y
-CONFIG_BOOTCOMMAND="run ramboot"
+CONFIG_BOOTCOMMAND="run spiboot"
CONFIG_SYS_CBSIZE=512
CONFIG_CYCLIC_MAX_CPU_TIME_US=1000
# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
diff --git a/configs/sc589-mini_defconfig b/configs/sc589-mini_defconfig
index 25285695367..78b39b6dd73 100644
--- a/configs/sc589-mini_defconfig
+++ b/configs/sc589-mini_defconfig
@@ -20,7 +20,7 @@ CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_LEGACY_IMAGE_FORMAT=y
CONFIG_USE_BOOTCOMMAND=y
-CONFIG_BOOTCOMMAND="run ramboot"
+CONFIG_BOOTCOMMAND="run spiboot"
CONFIG_SYS_CBSIZE=512
# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
CONFIG_SPL_I2C=y
diff --git a/configs/sc594-som-ezkit-spl_defconfig b/configs/sc594-som-ezkit-spl_defconfig
index 89ef08c1a72..23951d0b5f1 100644
--- a/configs/sc594-som-ezkit-spl_defconfig
+++ b/configs/sc594-som-ezkit-spl_defconfig
@@ -15,7 +15,7 @@ CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_LEGACY_IMAGE_FORMAT=y
CONFIG_USE_BOOTCOMMAND=y
-CONFIG_BOOTCOMMAND="run ospiboot"
+CONFIG_BOOTCOMMAND="run spiboot"
CONFIG_SYS_CBSIZE=512
CONFIG_SPL_I2C=y
CONFIG_SPL_DM_SPI_FLASH=y
diff --git a/configs/sc594-som-ezlite-spl_defconfig b/configs/sc594-som-ezlite-spl_defconfig
index 9e907d31136..b4e71b5d2eb 100644
--- a/configs/sc594-som-ezlite-spl_defconfig
+++ b/configs/sc594-som-ezlite-spl_defconfig
@@ -18,7 +18,7 @@ CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_LEGACY_IMAGE_FORMAT=y
CONFIG_USE_BOOTCOMMAND=y
-CONFIG_BOOTCOMMAND="run ospiboot"
+CONFIG_BOOTCOMMAND="run spiboot"
CONFIG_SYS_CBSIZE=512
CONFIG_CYCLIC_MAX_CPU_TIME_US=1000
CONFIG_SPL_I2C=y
--
2.34.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v6 13/16] arm: sc5xx: Remove SC5XX_LOADADDR
2026-05-21 13:53 [PATCH v6 00/16] sc5xx Environment Cleanup and Fixes Caleb Ethridge
` (11 preceding siblings ...)
2026-05-21 13:53 ` [PATCH v6 12/16] configs: sc5xx: Set default bootcmd to SPI boot Caleb Ethridge
@ 2026-05-21 13:53 ` Caleb Ethridge
2026-05-21 13:53 ` [PATCH v6 14/16] arm: sc5xx: add missing boot env selectors Caleb Ethridge
` (3 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Caleb Ethridge @ 2026-05-21 13:53 UTC (permalink / raw)
To: u-boot
Cc: trini, malysagreg, philip, sjg, linux, jcethrid, Caleb Ethridge,
Ozan Durgut
Remove the SC5XX_LOADADDR Kconfig option, replace its users with
CONFIG_SYS_LOAD_ADDR, and update the ADI boot environment to use
`loadaddr`.
SC5XX_LOADADDR was an ADI-specific duplicate of standard U-Boot
load address handling. U-Boot already uses CONFIG_SYS_LOAD_ADDR
for the default load address and `loadaddr` for boot commands,
so keeping separate SC5XX-specific names is redundant.
Signed-off-by: Ozan Durgut <ozan.durgut@analog.com>
Signed-off-by: Caleb Ethridge <caleb.ethridge@analog.com>
---
arch/arm/mach-sc5xx/Kconfig | 6 ------
board/adi/sc584-ezkit/sc584-ezkit.env | 3 ---
board/adi/sc589-ezkit/sc589-ezkit.env | 3 ---
board/adi/sc589-mini/sc589-mini.env | 3 ---
board/adi/sc594-som-ezkit/sc594-som-ezkit.env | 3 ---
.../adi/sc594-som-ezlite/sc594-som-ezlite.env | 3 ---
board/adi/sc598-som-ezkit/sc598-som-ezkit.env | 3 ---
.../adi/sc598-som-ezlite/sc598-som-ezlite.env | 2 --
configs/sc573-ezlite_defconfig | 2 +-
configs/sc584-ezkit_defconfig | 2 +-
configs/sc589-ezkit_defconfig | 2 +-
configs/sc589-mini_defconfig | 2 +-
configs/sc594-som-ezkit-spl_defconfig | 2 +-
configs/sc594-som-ezlite-spl_defconfig | 2 +-
configs/sc598-som-ezkit-spl_defconfig | 2 +-
configs/sc598-som-ezlite-spl_defconfig | 2 +-
include/env/adi/adi_boot.env | 18 ++++++++----------
17 files changed, 16 insertions(+), 44 deletions(-)
diff --git a/arch/arm/mach-sc5xx/Kconfig b/arch/arm/mach-sc5xx/Kconfig
index e311a8adf9a..44402b2568d 100644
--- a/arch/arm/mach-sc5xx/Kconfig
+++ b/arch/arm/mach-sc5xx/Kconfig
@@ -140,12 +140,6 @@ config SC5XX_ROOTFS_OFFSET
help
The default offset where the rootfs is located.
-config SC5XX_LOADADDR
- hex "Load address"
- default 0x90000000
- help
- The default load address for u-boot.
-
config ADI_IMAGE
string "ADI fitImage type"
help
diff --git a/board/adi/sc584-ezkit/sc584-ezkit.env b/board/adi/sc584-ezkit/sc584-ezkit.env
index 905523fb151..0b8035ca6b1 100644
--- a/board/adi/sc584-ezkit/sc584-ezkit.env
+++ b/board/adi/sc584-ezkit/sc584-ezkit.env
@@ -3,9 +3,6 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
-adi_image_offset=0xd0000
-loadaddr=CONFIG_SC5XX_LOADADDR
-
#define USE_NFS
#define USE_SPI
#define USE_RAM
diff --git a/board/adi/sc589-ezkit/sc589-ezkit.env b/board/adi/sc589-ezkit/sc589-ezkit.env
index 02567830c16..00f90c7942e 100644
--- a/board/adi/sc589-ezkit/sc589-ezkit.env
+++ b/board/adi/sc589-ezkit/sc589-ezkit.env
@@ -3,9 +3,6 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
-adi_image_offset=0xd0000
-loadaddr=CONFIG_SC5XX_LOADADDR
-
#define USE_NFS
#define USE_RAM
#define USE_MMC
diff --git a/board/adi/sc589-mini/sc589-mini.env b/board/adi/sc589-mini/sc589-mini.env
index 661c130b835..13079ed7527 100644
--- a/board/adi/sc589-mini/sc589-mini.env
+++ b/board/adi/sc589-mini/sc589-mini.env
@@ -3,9 +3,6 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
-adi_image_offset=0xd0000
-loadaddr=CONFIG_SC5XX_LOADADDR
-
#define USE_NFS
#define USE_RAM
#define USE_SPI
diff --git a/board/adi/sc594-som-ezkit/sc594-som-ezkit.env b/board/adi/sc594-som-ezkit/sc594-som-ezkit.env
index f787d972339..324bfae4571 100644
--- a/board/adi/sc594-som-ezkit/sc594-som-ezkit.env
+++ b/board/adi/sc594-som-ezkit/sc594-som-ezkit.env
@@ -3,9 +3,6 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
-adi_image_offset=0x100000
-loadaddr=CONFIG_SC5XX_LOADADDR
-
#define USE_NFS
#define USE_SPI
#define USE_OSPI
diff --git a/board/adi/sc594-som-ezlite/sc594-som-ezlite.env b/board/adi/sc594-som-ezlite/sc594-som-ezlite.env
index f787d972339..324bfae4571 100644
--- a/board/adi/sc594-som-ezlite/sc594-som-ezlite.env
+++ b/board/adi/sc594-som-ezlite/sc594-som-ezlite.env
@@ -3,9 +3,6 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
-adi_image_offset=0x100000
-loadaddr=CONFIG_SC5XX_LOADADDR
-
#define USE_NFS
#define USE_SPI
#define USE_OSPI
diff --git a/board/adi/sc598-som-ezkit/sc598-som-ezkit.env b/board/adi/sc598-som-ezkit/sc598-som-ezkit.env
index f787d972339..324bfae4571 100644
--- a/board/adi/sc598-som-ezkit/sc598-som-ezkit.env
+++ b/board/adi/sc598-som-ezkit/sc598-som-ezkit.env
@@ -3,9 +3,6 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
-adi_image_offset=0x100000
-loadaddr=CONFIG_SC5XX_LOADADDR
-
#define USE_NFS
#define USE_SPI
#define USE_OSPI
diff --git a/board/adi/sc598-som-ezlite/sc598-som-ezlite.env b/board/adi/sc598-som-ezlite/sc598-som-ezlite.env
index d5364df1613..fbb0565dac4 100644
--- a/board/adi/sc598-som-ezlite/sc598-som-ezlite.env
+++ b/board/adi/sc598-som-ezlite/sc598-som-ezlite.env
@@ -3,7 +3,5 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
-adi_image_offset=0x100000
-loadaddr=CONFIG_SC5XX_LOADADDR
#include <env/adi/adi_boot.env>
diff --git a/configs/sc573-ezlite_defconfig b/configs/sc573-ezlite_defconfig
index f6305451c27..cbf24234cc3 100644
--- a/configs/sc573-ezlite_defconfig
+++ b/configs/sc573-ezlite_defconfig
@@ -6,7 +6,7 @@ CONFIG_SPL_GPIO=y
CONFIG_DM_GPIO=y
CONFIG_SPL_SYS_MALLOC_F_LEN=0x10000
CONFIG_SPL_SERIAL=y
-CONFIG_SC5XX_LOADADDR=0x83000000
+CONFIG_SYS_LOAD_ADDR=0x83000000
CONFIG_WATCHDOG_TIMEOUT_MSECS=60000
CONFIG_CGU0_CLKOUTSEL=7
# CONFIG_EFI_LOADER is not set
diff --git a/configs/sc584-ezkit_defconfig b/configs/sc584-ezkit_defconfig
index 52ab7c9337b..bb24b31b2c0 100644
--- a/configs/sc584-ezkit_defconfig
+++ b/configs/sc584-ezkit_defconfig
@@ -10,7 +10,7 @@ CONFIG_SPL_STACK=0x200C0000
CONFIG_SPL_BSS_START_ADDR=0x200A0000
CONFIG_SPL_BSS_MAX_SIZE=0x8000
CONFIG_SC58X=y
-CONFIG_SC5XX_LOADADDR=0x89300000
+CONFIG_SYS_LOAD_ADDR=0x89300000
CONFIG_WATCHDOG_TIMEOUT_MSECS=60000
CONFIG_ADI_BUG_EZKHW21=y
CONFIG_CGU0_CLKOUTSEL=7
diff --git a/configs/sc589-ezkit_defconfig b/configs/sc589-ezkit_defconfig
index d8982f62d82..d3f0380bfed 100644
--- a/configs/sc589-ezkit_defconfig
+++ b/configs/sc589-ezkit_defconfig
@@ -13,7 +13,7 @@ CONFIG_SPL_BSS_START_ADDR=0x200A0000
CONFIG_SPL_BSS_MAX_SIZE=0x8000
CONFIG_SC58X=y
CONFIG_TARGET_SC589_EZKIT=y
-CONFIG_SC5XX_LOADADDR=0xC3000000
+CONFIG_SYS_LOAD_ADDR=0xC3000000
CONFIG_WATCHDOG_TIMEOUT_MSECS=60000
CONFIG_ADI_USE_DMC1=y
CONFIG_CGU0_CLKOUTSEL=7
diff --git a/configs/sc589-mini_defconfig b/configs/sc589-mini_defconfig
index 78b39b6dd73..1bdede4b739 100644
--- a/configs/sc589-mini_defconfig
+++ b/configs/sc589-mini_defconfig
@@ -12,7 +12,7 @@ CONFIG_SPL_BSS_START_ADDR=0x200A0000
CONFIG_SPL_BSS_MAX_SIZE=0x8000
CONFIG_SC58X=y
CONFIG_TARGET_SC589_MINI=y
-CONFIG_SC5XX_LOADADDR=0xC3000000
+CONFIG_SYS_LOAD_ADDR=0xC3000000
CONFIG_WATCHDOG_TIMEOUT_MSECS=60000
CONFIG_ADI_USE_DMC1=y
# CONFIG_EFI_LOADER is not set
diff --git a/configs/sc594-som-ezkit-spl_defconfig b/configs/sc594-som-ezkit-spl_defconfig
index 23951d0b5f1..4f8be110ee4 100644
--- a/configs/sc594-som-ezkit-spl_defconfig
+++ b/configs/sc594-som-ezkit-spl_defconfig
@@ -10,6 +10,7 @@ CONFIG_SPL_SYS_MALLOC_F_LEN=0x10000
CONFIG_SPL_SERIAL=y
CONFIG_SC59X=y
CONFIG_TARGET_SC594_SOM_EZKIT=y
+CONFIG_SYS_LOAD_ADDR=0xA2000000
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
@@ -74,4 +75,3 @@ CONFIG_SPL_TIMER=y
CONFIG_USB=y
CONFIG_USB_DWC2=y
CONFIG_USB_STORAGE=y
-CONFIG_SC5XX_LOADADDR=0xA2000000
diff --git a/configs/sc594-som-ezlite-spl_defconfig b/configs/sc594-som-ezlite-spl_defconfig
index b4e71b5d2eb..c045c67569b 100644
--- a/configs/sc594-som-ezlite-spl_defconfig
+++ b/configs/sc594-som-ezlite-spl_defconfig
@@ -9,6 +9,7 @@ CONFIG_SPL_SYS_MALLOC_F_LEN=0x10000
CONFIG_SPL_SERIAL=y
CONFIG_SPL_STACK=0x200E4000
CONFIG_SC59X=y
+CONFIG_SYS_LOAD_ADDR=0xA2000000
CONFIG_CGU1_DIV_S1SELEX=16
CONFIG_CDU0_CLKO10=5
CONFIG_SF_DEFAULT_BUS=0
@@ -83,4 +84,3 @@ CONFIG_USB_DWC2=y
CONFIG_USB_STORAGE=y
# CONFIG_SPL_CRC8 is not set
# CONFIG_TOOLS_MKEFICAPSULE is not set
-CONFIG_SC5XX_LOADADDR=0xA2000000
diff --git a/configs/sc598-som-ezkit-spl_defconfig b/configs/sc598-som-ezkit-spl_defconfig
index cd1bafd7486..e2fee0d0be8 100644
--- a/configs/sc598-som-ezkit-spl_defconfig
+++ b/configs/sc598-som-ezkit-spl_defconfig
@@ -11,6 +11,7 @@ CONFIG_SPL_SERIAL=y
CONFIG_SC59X_64=y
CONFIG_TARGET_SC598_SOM_EZKIT=y
CONFIG_SYS_BOOTM_LEN=0x4000000
+CONFIG_SYS_LOAD_ADDR=0x90000000
CONFIG_CGU1_PLL3_DDRCLK=y
CONFIG_CGU1_PLL3_VCO_MSEL=64
CONFIG_CGU1_PLL3_DCLK_DIV=2
@@ -107,4 +108,3 @@ CONFIG_USB_DWC2=y
CONFIG_USB_STORAGE=y
# CONFIG_SPL_CRC8 is not set
# CONFIG_TOOLS_MKEFICAPSULE is not set
-CONFIG_SC5XX_LOADADDR=0x90000000
diff --git a/configs/sc598-som-ezlite-spl_defconfig b/configs/sc598-som-ezlite-spl_defconfig
index e4a975eedfc..9afe5c0789a 100644
--- a/configs/sc598-som-ezlite-spl_defconfig
+++ b/configs/sc598-som-ezlite-spl_defconfig
@@ -11,6 +11,7 @@ CONFIG_SPL_SERIAL=y
CONFIG_SPL_STACK=0x200E4000
CONFIG_SC59X_64=y
CONFIG_SYS_BOOTM_LEN=0x4000000
+CONFIG_SYS_LOAD_ADDR=0x90000000
CONFIG_CGU1_PLL3_DDRCLK=y
CONFIG_CGU1_PLL3_VCO_MSEL=64
CONFIG_CGU1_PLL3_DCLK_DIV=2
@@ -105,4 +106,3 @@ CONFIG_USB_DWC2=y
CONFIG_USB_STORAGE=y
# CONFIG_SPL_CRC8 is not set
# CONFIG_TOOLS_MKEFICAPSULE is not set
-CONFIG_SC5XX_LOADADDR=0x90000000
diff --git a/include/env/adi/adi_boot.env b/include/env/adi/adi_boot.env
index b75baabdca6..3c83826cf9a 100644
--- a/include/env/adi/adi_boot.env
+++ b/include/env/adi/adi_boot.env
@@ -1,10 +1,3 @@
-/*
- * A target board needs to set these variables for the commands below to work:
- *
- * - adi_image_offset, location of the fitImage on the SPI flash
- * - loadaddr, where you want to load things
- */
-
#ifdef CONFIG_SC59X_64
#define EARLY_PRINTK earlycon=adi_uart,0x31003000
#else
@@ -21,6 +14,11 @@ initrd_high=0xffffffffffffffff
#else
initrd_high=0xffffffff
#endif
+#if defined(CONFIG_SC59X) || defined(CONFIG_SC59X_64)
+adi_image_offset=0x100000
+#else
+adi_image_offset=0xd0000
+#endif
/* Args for each boot mode */
adi_bootargs=EARLY_PRINTK console=ttySC0,CONFIG_BAUDRATE vmalloc=512M
@@ -35,7 +33,7 @@ nfsargs=setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath},tcp,nfs
nfsboot=run nfsargs;
run addip;
wget ${loadaddr} ${serverip}:/fitImage;
- bootm ${loadaddr}
+ bootm
#endif
#if defined(USE_MMC)
@@ -43,7 +41,7 @@ mmcargs=setenv bootargs root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait ${adi_bo
mmcboot=mmc rescan;
ext4load mmc 0:1 ${loadaddr} /fitImage;
run mmcargs;
- bootm ${loadaddr}
+ bootm
#endif
#if defined(USE_SPI)
@@ -65,7 +63,7 @@ ospiboot=run ospiargs;
#if defined(USE_RAM)
ramboot=wget ${loadaddr} ${serverip}:/fitImage;
run ramargs;
- bootm ${loadaddr}
+ bootm
#endif
#if defined(USE_USB)
--
2.34.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v6 14/16] arm: sc5xx: add missing boot env selectors
2026-05-21 13:53 [PATCH v6 00/16] sc5xx Environment Cleanup and Fixes Caleb Ethridge
` (12 preceding siblings ...)
2026-05-21 13:53 ` [PATCH v6 13/16] arm: sc5xx: Remove SC5XX_LOADADDR Caleb Ethridge
@ 2026-05-21 13:53 ` Caleb Ethridge
2026-05-21 13:53 ` [PATCH v6 15/16] arm: sc5xx: Add fdt_addr_r, kernel_addr_r, and ramdisk_addr_r Caleb Ethridge
` (2 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Caleb Ethridge @ 2026-05-21 13:53 UTC (permalink / raw)
To: u-boot
Cc: trini, malysagreg, philip, sjg, linux, jcethrid, Ozan Durgut,
Ozan Durgut
From: Ozan Durgut <ozndrgt@gmail.com>
Define the boot options for SC598 SOM EZ-LITE so the shared ADI boot
environment includes the expected boot commands for this board.
SC598 SOM EZ-LITE board environment utilizes the shared ADI boot
environment, but it does not define any of the USE_* boot mode selectors.
Without those selectors, the shared env does not generate the board boot
commands such as `spiboot`. This leaves the default `bootcmd=run spiboot`
without a matching environment command and breaks autoboot.
Fixes: c9e893d6266d ("board: adi: Add support for SC598")
Signed-off-by: Ozan Durgut <ozan.durgut@analog.com>
---
board/adi/sc598-som-ezlite/sc598-som-ezlite.env | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/board/adi/sc598-som-ezlite/sc598-som-ezlite.env b/board/adi/sc598-som-ezlite/sc598-som-ezlite.env
index fbb0565dac4..ab1acabef53 100644
--- a/board/adi/sc598-som-ezlite/sc598-som-ezlite.env
+++ b/board/adi/sc598-som-ezlite/sc598-som-ezlite.env
@@ -3,5 +3,10 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
+#define USE_NFS
+#define USE_SPI
+#define USE_RAM
+#define USE_MMC
+#define USE_USB
#include <env/adi/adi_boot.env>
--
2.34.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v6 15/16] arm: sc5xx: Add fdt_addr_r, kernel_addr_r, and ramdisk_addr_r
2026-05-21 13:53 [PATCH v6 00/16] sc5xx Environment Cleanup and Fixes Caleb Ethridge
` (13 preceding siblings ...)
2026-05-21 13:53 ` [PATCH v6 14/16] arm: sc5xx: add missing boot env selectors Caleb Ethridge
@ 2026-05-21 13:53 ` Caleb Ethridge
2026-05-21 13:53 ` [PATCH v6 16/16] mach-sc5xx: Remove unused image offset Kconfig options Caleb Ethridge
2026-06-04 23:05 ` [PATCH v6 00/16] sc5xx Environment Cleanup and Fixes Tom Rini
16 siblings, 0 replies; 18+ messages in thread
From: Caleb Ethridge @ 2026-05-21 13:53 UTC (permalink / raw)
To: u-boot; +Cc: trini, malysagreg, philip, sjg, linux, jcethrid, Caleb Ethridge
Add fdt_addr_r, kernel_addr_r, and ramdisk_addr_r to the SC5xx boards.
These variables are currently unused in the environment but will be
used in the future once support for booti commands is added to the
SC5xx boards.
Signed-off-by: Caleb Ethridge <caleb.ethridge@analog.com>
---
board/adi/sc573-ezlite/sc573-ezlite.env | 5 +++--
board/adi/sc584-ezkit/sc584-ezkit.env | 4 ++++
board/adi/sc589-ezkit/sc589-ezkit.env | 4 ++++
board/adi/sc589-mini/sc589-mini.env | 4 ++++
board/adi/sc594-som-ezkit/sc594-som-ezkit.env | 4 ++++
board/adi/sc594-som-ezlite/sc594-som-ezlite.env | 4 ++++
board/adi/sc598-som-ezkit/sc598-som-ezkit.env | 4 ++++
board/adi/sc598-som-ezlite/sc598-som-ezlite.env | 4 ++++
8 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/board/adi/sc573-ezlite/sc573-ezlite.env b/board/adi/sc573-ezlite/sc573-ezlite.env
index c909b3b476a..bc1fdf293c2 100644
--- a/board/adi/sc573-ezlite/sc573-ezlite.env
+++ b/board/adi/sc573-ezlite/sc573-ezlite.env
@@ -3,8 +3,9 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
-adi_image_offset=0xd0000
-loadaddr=CONFIG_SC5XX_LOADADDR
+fdt_addr_r=CONFIG_SYS_LOAD_ADDR
+kernel_addr_r=0x84008000
+ramdisk_addr_r=0x85000000
#define USE_NFS
#define USE_SPI
diff --git a/board/adi/sc584-ezkit/sc584-ezkit.env b/board/adi/sc584-ezkit/sc584-ezkit.env
index 0b8035ca6b1..ed25fc599a1 100644
--- a/board/adi/sc584-ezkit/sc584-ezkit.env
+++ b/board/adi/sc584-ezkit/sc584-ezkit.env
@@ -3,6 +3,10 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
+fdt_addr_r=CONFIG_SYS_LOAD_ADDR
+kernel_addr_r=0x8a308000
+ramdisk_addr_r=0x8b300000
+
#define USE_NFS
#define USE_SPI
#define USE_RAM
diff --git a/board/adi/sc589-ezkit/sc589-ezkit.env b/board/adi/sc589-ezkit/sc589-ezkit.env
index 00f90c7942e..3a1af951260 100644
--- a/board/adi/sc589-ezkit/sc589-ezkit.env
+++ b/board/adi/sc589-ezkit/sc589-ezkit.env
@@ -3,6 +3,10 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
+fdt_addr_r=CONFIG_SYS_LOAD_ADDR
+kernel_addr_r=0xc4008000
+ramdisk_addr_r=0xc5000000
+
#define USE_NFS
#define USE_RAM
#define USE_MMC
diff --git a/board/adi/sc589-mini/sc589-mini.env b/board/adi/sc589-mini/sc589-mini.env
index 13079ed7527..a21bb4e2200 100644
--- a/board/adi/sc589-mini/sc589-mini.env
+++ b/board/adi/sc589-mini/sc589-mini.env
@@ -3,6 +3,10 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
+fdt_addr_r=CONFIG_SYS_LOAD_ADDR
+kernel_addr_r=0xc4008000
+ramdisk_addr_r=0xc5000000
+
#define USE_NFS
#define USE_RAM
#define USE_SPI
diff --git a/board/adi/sc594-som-ezkit/sc594-som-ezkit.env b/board/adi/sc594-som-ezkit/sc594-som-ezkit.env
index 324bfae4571..a8f6def9f58 100644
--- a/board/adi/sc594-som-ezkit/sc594-som-ezkit.env
+++ b/board/adi/sc594-som-ezkit/sc594-som-ezkit.env
@@ -3,6 +3,10 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
+fdt_addr_r=CONFIG_SYS_LOAD_ADDR
+kernel_addr_r=0xa3008000
+ramdisk_addr_r=0xa8000000
+
#define USE_NFS
#define USE_SPI
#define USE_OSPI
diff --git a/board/adi/sc594-som-ezlite/sc594-som-ezlite.env b/board/adi/sc594-som-ezlite/sc594-som-ezlite.env
index 324bfae4571..a8f6def9f58 100644
--- a/board/adi/sc594-som-ezlite/sc594-som-ezlite.env
+++ b/board/adi/sc594-som-ezlite/sc594-som-ezlite.env
@@ -3,6 +3,10 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
+fdt_addr_r=CONFIG_SYS_LOAD_ADDR
+kernel_addr_r=0xa3008000
+ramdisk_addr_r=0xa8000000
+
#define USE_NFS
#define USE_SPI
#define USE_OSPI
diff --git a/board/adi/sc598-som-ezkit/sc598-som-ezkit.env b/board/adi/sc598-som-ezkit/sc598-som-ezkit.env
index 324bfae4571..da1ff295b0e 100644
--- a/board/adi/sc598-som-ezkit/sc598-som-ezkit.env
+++ b/board/adi/sc598-som-ezkit/sc598-som-ezkit.env
@@ -3,6 +3,10 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
+fdt_addr_r=CONFIG_SYS_LOAD_ADDR
+kernel_addr_r=0x9a200000
+ramdisk_addr_r=0x9c000000
+
#define USE_NFS
#define USE_SPI
#define USE_OSPI
diff --git a/board/adi/sc598-som-ezlite/sc598-som-ezlite.env b/board/adi/sc598-som-ezlite/sc598-som-ezlite.env
index ab1acabef53..3f65fdabe18 100644
--- a/board/adi/sc598-som-ezlite/sc598-som-ezlite.env
+++ b/board/adi/sc598-som-ezlite/sc598-som-ezlite.env
@@ -3,6 +3,10 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
+fdt_addr_r=CONFIG_SYS_LOAD_ADDR
+kernel_addr_r=0x9a200000
+ramdisk_addr_r=0x9c000000
+
#define USE_NFS
#define USE_SPI
#define USE_RAM
--
2.34.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v6 16/16] mach-sc5xx: Remove unused image offset Kconfig options
2026-05-21 13:53 [PATCH v6 00/16] sc5xx Environment Cleanup and Fixes Caleb Ethridge
` (14 preceding siblings ...)
2026-05-21 13:53 ` [PATCH v6 15/16] arm: sc5xx: Add fdt_addr_r, kernel_addr_r, and ramdisk_addr_r Caleb Ethridge
@ 2026-05-21 13:53 ` Caleb Ethridge
2026-06-04 23:05 ` [PATCH v6 00/16] sc5xx Environment Cleanup and Fixes Tom Rini
16 siblings, 0 replies; 18+ messages in thread
From: Caleb Ethridge @ 2026-05-21 13:53 UTC (permalink / raw)
To: u-boot; +Cc: trini, malysagreg, philip, sjg, linux, jcethrid, Caleb Ethridge
Remove SC5XX_UBOOT_SPL_OFFSET, SC5XX_UBOOT_OFFSET, SC5XX_FITIMAGE_OFFSET
and SC5XX_ROOTFS_OFFSET as they are no longer needed in the Kconfig.
Signed-off-by: Caleb Ethridge <caleb.ethridge@analog.com>
---
arch/arm/mach-sc5xx/Kconfig | 24 ------------------------
1 file changed, 24 deletions(-)
diff --git a/arch/arm/mach-sc5xx/Kconfig b/arch/arm/mach-sc5xx/Kconfig
index 44402b2568d..0f4e63a355e 100644
--- a/arch/arm/mach-sc5xx/Kconfig
+++ b/arch/arm/mach-sc5xx/Kconfig
@@ -116,30 +116,6 @@ endchoice
endif
-config SC5XX_UBOOT_SPL_OFFSET
- hex "SPL offset"
- default 0x0
- help
- The default offset where the SPL is located.
-
-config SC5XX_UBOOT_OFFSET
- hex "U-Boot offset"
- default 0x40000
- help
- The default offset where u-boot is located.
-
-config SC5XX_FITIMAGE_OFFSET
- hex "FitImage offset"
- default 0x1a0000
- help
- The default offset where the fitImage is located.
-
-config SC5XX_ROOTFS_OFFSET
- hex "RootFS offset"
- default 0x102000
- help
- The default offset where the rootfs is located.
-
config ADI_IMAGE
string "ADI fitImage type"
help
--
2.34.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH v6 00/16] sc5xx Environment Cleanup and Fixes
2026-05-21 13:53 [PATCH v6 00/16] sc5xx Environment Cleanup and Fixes Caleb Ethridge
` (15 preceding siblings ...)
2026-05-21 13:53 ` [PATCH v6 16/16] mach-sc5xx: Remove unused image offset Kconfig options Caleb Ethridge
@ 2026-06-04 23:05 ` Tom Rini
16 siblings, 0 replies; 18+ messages in thread
From: Tom Rini @ 2026-06-04 23:05 UTC (permalink / raw)
To: u-boot, Caleb Ethridge; +Cc: malysagreg, philip, sjg, linux, jcethrid
On Thu, 21 May 2026 09:53:11 -0400, Caleb Ethridge wrote:
> This series performs a general cleanup of the default U-boot environment
> for sc5xx boards, stemming from the decision to no longer store the
> environment in the SPI flash. The environments for each board have been
> edited to contain the minimum number of commands needed for all supported
> boot modes to avoid confusion, and the default boot command synced to spi
> for all boards that support it. The filesystem for the SPI flash has also
> been changed from jffs2 to ubifs.
>
> [...]
Applied to u-boot/next, thanks!
[01/16] configs: sc5xx: Do not store environment in SPI flash
commit: 5a21396c9745f2aefbbc5adc0867e3ac29c85edc
[02/16] mach-sc5xx: Remove update commands from default environment
commit: 77c79a2c60fddb0a394289d436e21148371260b4
[03/16] mach-sc59x: Add CONFIG_SC5XX_LOADADDR
commit: e4b04e491fe7d78ed1e64974832bb79d2d91a7a8
[04/16] mach-sc5xx: Update boot commands
commit: c1fcf76863700270ce10dceefeb72017e991d627
[05/16] mach-sc5xx: Switch from tftp to wget
commit: 3b9b94ef68c6f3a1466a49ff4c482060923aea1b
[06/16] mach-sc5xx: Add USB boot command
commit: a29a895bdce9e64f4e0b68ecad44b48927c5ca86
[07/16] mach-sc5xx: Remove preliminary binman support
commit: 78e5581f0bc21b916763892cbfd89aedac356459
[08/16] dts: sc594: Fix gige-reset line on EZKIT
commit: ad72a93757d3eefcfe9fecf27b1d8f000be49f2f
[09/16] mach-sc5xx: sc573: Rename EZKIT board to EZLITE
commit: 87ea6e67959099804faf4eb85d93a41f18db71c9
[10/16] mach-sc5xx: Update image load address
commit: 4088df81f10c43f5585516342f5963d19cdaf3d1
[11/16] mach-sc5xx: Update SPI bootargs for ubifs
commit: a6438a10267e52898448711281ae631945b87e84
[12/16] configs: sc5xx: Set default bootcmd to SPI boot
commit: 21eeb0176bbc009aabc629e89c6c0d42266e8430
[13/16] arm: sc5xx: Remove SC5XX_LOADADDR
commit: c6796425da45f63661459e31cb7809f517080417
[14/16] arm: sc5xx: add missing boot env selectors
commit: 03398e94314734f9f095b14fa84893e35365d41e
[15/16] arm: sc5xx: Add fdt_addr_r, kernel_addr_r, and ramdisk_addr_r
commit: 54026efab1070f6077828a96ee99fcaf778a0988
[16/16] mach-sc5xx: Remove unused image offset Kconfig options
commit: e8c00a5e2834b5c80930b1f3dc0d65380b927ec2
--
Tom
^ permalink raw reply [flat|nested] 18+ messages in thread