[RESEND v2 03/13] mach-sc5xx: Update boot commands

Caleb Ethridge
2026-04-02T15:48:28Z

Update the default boot commands to match the expected
bootargs in Linux and new SPI partitioning scheme.

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/sc584-ezkit_defconfig | 1 -
configs/sc589-ezkit_defconfig | 1 -
configs/sc589-mini_defconfig | 1 -
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 +
include/env/adi/adi_boot.env | 16 ++++++++++------
16 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/board/adi/sc573-ezkit/sc573-ezkit.env b/board/adi/sc573-ezkit/sc573-ezkit.env
index c8781aaad82..51157ff36aa 100644
--- a/board/adi/sc573-ezkit/sc573-ezkit.env
+++ b/board/adi/sc573-ezkit/sc573-ezkit.env
@@ -3,8 +3,8 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/

-adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET
jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc573-ezkit.jffs2
+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 2a76c005d1c..6d4b20d70f6 100644
--- a/board/adi/sc584-ezkit/sc584-ezkit.env
+++ b/board/adi/sc584-ezkit/sc584-ezkit.env
@@ -3,8 +3,8 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/

-adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET
jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc584-ezkit.jffs2
+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 8eaa776cc6e..d068b44573f 100644
--- a/board/adi/sc589-ezkit/sc589-ezkit.env
+++ b/board/adi/sc589-ezkit/sc589-ezkit.env
@@ -3,8 +3,8 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/

-adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET
jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc589-ezkit.jffs2
+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 a7addcd3957..3827cf4e9a5 100644
--- a/board/adi/sc589-mini/sc589-mini.env
+++ b/board/adi/sc589-mini/sc589-mini.env
@@ -3,8 +3,8 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/

-adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET
jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc589-mini.jffs2
+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 85fa8c8d49c..69d2ec3ba03 100644
--- a/board/adi/sc594-som-ezkit/sc594-som-ezkit.env
+++ b/board/adi/sc594-som-ezkit/sc594-som-ezkit.env
@@ -3,8 +3,8 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/

-adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET
jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc594-som-ezkit.jffs2
+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 f2ee8d06801..f915175e041 100644
--- a/board/adi/sc594-som-ezlite/sc594-som-ezlite.env
+++ b/board/adi/sc594-som-ezlite/sc594-som-ezlite.env
@@ -3,8 +3,8 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/

-adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET
jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc594-som-ezlite.jffs2
+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 080afaef406..b6f477c8402 100644
--- a/board/adi/sc598-som-ezkit/sc598-som-ezkit.env
+++ b/board/adi/sc598-som-ezkit/sc598-som-ezkit.env
@@ -3,8 +3,8 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/

-adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET
jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc598-som-ezkit.jffs2
+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 a3486de503e..cbf5d5e60f1 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
jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc598-som-ezlite.jffs2

diff --git a/configs/sc584-ezkit_defconfig b/configs/sc584-ezkit_defconfig
index b327389ba54..3a55a50544a 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 836f2a39bee..e4fe4db774f 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 02c9a10ef07..ebc9761607a 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/configs/sc594-som-ezkit-spl_defconfig b/configs/sc594-som-ezkit-spl_defconfig
index 7f196e673f4..ef23b97b89c 100644
--- a/configs/sc594-som-ezkit-spl_defconfig
+++ b/configs/sc594-som-ezkit-spl_defconfig
@@ -71,3 +71,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 433b3964188..05711b85824 100644
--- a/configs/sc594-som-ezlite-spl_defconfig
+++ b/configs/sc594-som-ezlite-spl_defconfig
@@ -80,3 +80,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 7027a7f8a2a..ea1e0b6202c 100644
--- a/configs/sc598-som-ezkit-spl_defconfig
+++ b/configs/sc598-som-ezkit-spl_defconfig
@@ -108,3 +108,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 668605c50f6..585a35d2789 100644
--- a/configs/sc598-som-ezlite-spl_defconfig
+++ b/configs/sc598-som-ezlite-spl_defconfig
@@ -103,3 +103,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/include/env/adi/adi_boot.env b/include/env/adi/adi_boot.env
index b574892e0a0..3c196e40603 100644
--- a/include/env/adi/adi_boot.env
+++ b/include/env/adi/adi_boot.env
@@ -40,23 +40,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