Skip to contentSkip to conversation

sc5xx Environment Cleanup and Fixes

PATCH RESEND Superseded Caleb Ethridge 4 participants 38 messages Apr 17 – Apr 25

Subsystems (2)

v4 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

v4 cover sc5xx Environment Cleanup and Fixes

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.

A bug with the Ethernet reset line on the sc594 has been fixed, and the sc573 has been renamed from the EZKIT to the EZLITE to match the name of the publically available board. EZKIT was only used internally before release. Preliminary binman support for sc5xx boards has been removed as it was unused and full support never added.

Caleb Ethridge (13):
configs: sc5xx: Do not store environment in SPI flash
mach-sc5xx: Remove update commands from default environment
mach-sc5xx: Update boot commands
mach-sc5xx: Switch from tftp to wget
mach-sc5xx: Add USB boot command
mach-sc5xx: Remove preliminary binman support
dts: sc594: Fix gige-reset line on EZKIT
mach-sc5xx: sc573: Rename EZKIT board to EZLITE
mach-sc5xx: Update image load address
mach-sc5xx: Update SPI bootargs for ubifs
configs: sc5xx: Set default bootcmd to SPI boot
arm: sc5xx: Remove SC5XX_LOADADDR
arm: sc5xx: Add fdt_addr_r, kernel_addr_r, and initrd_addr

Ozan Durgut (1):
arm: sc5xx: add missing boot env selectors

 arch/arm/dts/Makefile                         |  2 +-
 .../dts/{sc573-ezkit.dts => sc573-ezlite.dts} |  4 +-
 arch/arm/dts/sc594-som-ezkit.dts              |  2 +-
 arch/arm/dts/sc5xx.dtsi                       | 41 --------
 arch/arm/mach-sc5xx/Kconfig                   | 47 +--------
 arch/arm/mach-sc5xx/init/dmcinit.c            |  2 +-
 board/adi/sc573-ezkit/sc573-ezkit.env         | 17 ----
 .../adi/{sc573-ezkit => sc573-ezlite}/Kconfig |  8 +-
 .../{sc573-ezkit => sc573-ezlite}/Makefile    |  2 +-
 .../sc573-ezlite.c}                           |  0
 board/adi/sc573-ezlite/sc573-ezlite.env       | 16 +++
 board/adi/sc584-ezkit/sc584-ezkit.env         |  8 +-
 board/adi/sc589-ezkit/sc589-ezkit.env         |  9 +-
 board/adi/sc589-mini/sc589-mini.env           |  9 +-
 board/adi/sc594-som-ezkit/sc594-som-ezkit.env |  9 +-
 .../adi/sc594-som-ezlite/sc594-som-ezlite.env |  8 +-
 board/adi/sc598-som-ezkit/sc598-som-ezkit.env |  9 +-
 .../adi/sc598-som-ezlite/sc598-som-ezlite.env | 14 ++-
 ...ezkit_defconfig => sc573-ezlite_defconfig} | 11 +--
 configs/sc584-ezkit_defconfig                 | 10 +-
 configs/sc589-ezkit_defconfig                 | 12 +--
 configs/sc589-mini_defconfig                  | 12 +--
 configs/sc594-som-ezkit-spl_defconfig         |  7 +-
 configs/sc594-som-ezlite-spl_defconfig        |  7 +-
 configs/sc598-som-ezkit-spl_defconfig         |  5 +-
 configs/sc598-som-ezlite-spl_defconfig        |  5 +-
 .../arm/adi/adi,sc5xx.yaml                    |  2 +-
 .../configs/{sc573-ezkit.h => sc573-ezlite.h} |  4 +-
 include/env/adi/adi_boot.env                  | 98 ++++++-------------
 29 files changed, 106 insertions(+), 274 deletions(-)
 rename arch/arm/dts/{sc573-ezkit.dts => sc573-ezlite.dts} (98%)
 delete mode 100644 board/adi/sc573-ezkit/sc573-ezkit.env
 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%)
 create mode 100644 board/adi/sc573-ezlite/sc573-ezlite.env
 rename configs/{sc573-ezkit_defconfig => sc573-ezlite_defconfig} (87%)
 rename include/configs/{sc573-ezkit.h => sc573-ezlite.h} (79%)
Signature · 1 line
2.34.1
#1 lore raw

PATCH RESEND v4 1/14 configs: sc5xx: Do not store environment in SPI flash

From: Caleb Ethridge <[email protected]>

Remove config option enabling storage of the environment in the SPI flash, to match shift of programming boot media to Linux.

---
 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(-)
configs/sc573-ezkit_defconfig +0 -4
index fc4ce13cc70..976d8e0306a 100644
@@ -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
configs/sc584-ezkit_defconfig +0 -5
index a8c6b9f1224..27f55804199 100644
@@ -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
configs/sc589-ezkit_defconfig +0 -5
index 9cd204e40ab..180b6904d95 100644
@@ -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
configs/sc589-mini_defconfig +0 -5
index 0908ab1708b..92c2741f701 100644
@@ -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
configs/sc594-som-ezkit-spl_defconfig +0 -4
index c62097a2ac9..c379de2c146 100644
@@ -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
configs/sc594-som-ezlite-spl_defconfig +0 -4
index 39481351102..54b26ed85c2 100644
@@ -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
configs/sc598-som-ezkit-spl_defconfig +0 -4
index ad3a6fcc236..7027a7f8a2a 100644
@@ -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
configs/sc598-som-ezlite-spl_defconfig +0 -4
index 34dbedf12b4..0b59b36f264 100644
@@ -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
Signature · 1 line
2.34.1
Reviewed-by on v4 1/14
#2 lore raw

Re: [RESEND v4 01/14] configs: sc5xx: Do not store environment in SPI flash

Quoted 9 lines · Caleb Ethridge

configs: sc5xx: Do not store environment in SPI flash

Remove config option enabling storage of the environment in the SPI flash, to match shift of programming boot media to Linux.

configs/sc573-ezkit_defconfig | 4 ----

Quoted 8 lines
 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(-)
#3 lore raw

PATCH RESEND v4 2/14 mach-sc5xx: Remove update commands from default environment

In reply to 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.

---
 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 -
 .../adi/sc594-som-ezlite/sc594-som-ezlite.env |  2 -
 board/adi/sc598-som-ezkit/sc598-som-ezkit.env |  2 -
 .../adi/sc598-som-ezlite/sc598-som-ezlite.env |  2 -
 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                  | 53 -------------------
 13 files changed, 77 deletions(-)
board/adi/sc573-ezkit/sc573-ezkit.env +0 -2
index 8b03a3d5da9..c8781aaad82 100644
@@ -3,9 +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
 
board/adi/sc584-ezkit/sc584-ezkit.env +0 -2
index 8a6f7edd5e8..2a76c005d1c 100644
@@ -3,9 +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
 
board/adi/sc589-ezkit/sc589-ezkit.env +0 -2
index b8206e85179..8eaa776cc6e 100644
@@ -3,9 +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
 
board/adi/sc589-mini/sc589-mini.env +0 -2
index f7628b0b335..a7addcd3957 100644
@@ -3,9 +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
 
board/adi/sc594-som-ezkit/sc594-som-ezkit.env +0 -2
index 069edc717da..85fa8c8d49c 100644
@@ -3,9 +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
 
board/adi/sc594-som-ezlite/sc594-som-ezlite.env +0 -2
index e5382b67c81..f2ee8d06801 100644
@@ -3,9 +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
 
board/adi/sc598-som-ezkit/sc598-som-ezkit.env +0 -2
index 2cb475e1001..080afaef406 100644
@@ -3,9 +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
 
board/adi/sc598-som-ezlite/sc598-som-ezlite.env +0 -2
index 1d9ea6d188b..a3486de503e 100644
@@ -3,9 +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
 
configs/sc573-ezkit_defconfig +0 -2
index 976d8e0306a..7a0c7d04e84 100644
@@ -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
configs/sc584-ezkit_defconfig +0 -2
index 27f55804199..7975a610ca3 100644
@@ -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
configs/sc589-ezkit_defconfig +0 -2
index 180b6904d95..0ceb57f1f42 100644
@@ -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
configs/sc589-mini_defconfig +0 -2
index 92c2741f701..32678b63a9f 100644
@@ -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
include/env/adi/adi_boot.env +0 -53

75 lines not on this page · raw message

Signature · 1 line
2.34.1
#4 lore raw

Re: [RESEND v4 02/14] mach-sc5xx: Remove update commands from default environment

Hi Caleb,

Quoted 26 lines · Caleb Ethridge

mach-sc5xx: Remove update commands from default environment

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.

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                   |  2 -
 configs/sc584-ezkit_defconfig                   |  2 -
 configs/sc589-ezkit_defconfig                   |  2 -
 configs/sc589-mini_defconfig                    |  2 -
 include/env/adi/adi_boot.env                    | 53 -------------------------
 13 files changed, 77 deletions(-)

include/env/adi/adi_boot.env line 6

Quoted 8 lines
include/env/adi/adi_boot.env +0 -2
@@ -1,9 +1,7 @@
 /*
  * 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

The comment mentions jffs2file as still required. Patch 10 removes jffs2file from all boards. Please can you also update this comment in that patch.

BTW, CONFIG_SC5XX_UBOOT_OFFSET, CONFIG_SC5XX_FITIMAGE_OFFSET, and CONFIG_SC5XX_ROOTFS_OFFSET are left orphaned in Kconfig after this series. You may want to add a patch to clean those up.

Regards,
Simon

#5 lore raw

Re: [RESEND v4 02/14] mach-sc5xx: Remove update commands from default environment

Hi Simon,

This comment is updated in the ubifs patch to remove the reference to the jffs2file. I will also update the commit message for that patch in the next version as you mentioned in your reply to the ubifs patch.

Thanks,

Caleb Ethridge

#6 lore raw

PATCH RESEND v4 3/14 mach-sc5xx: Update boot commands

In reply to Caleb Ethridge

From: Caleb Ethridge <[email protected]>

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

---
 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 -
 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 ++++++++++------
 17 files changed, 22 insertions(+), 18 deletions(-)
board/adi/sc573-ezkit/sc573-ezkit.env +1 -1
index c8781aaad82..51157ff36aa 100644
@@ -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
board/adi/sc584-ezkit/sc584-ezkit.env +1 -1
index 2a76c005d1c..6d4b20d70f6 100644
@@ -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
board/adi/sc589-ezkit/sc589-ezkit.env +1 -1
index 8eaa776cc6e..d068b44573f 100644
@@ -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
board/adi/sc589-mini/sc589-mini.env +1 -1
index a7addcd3957..3827cf4e9a5 100644
@@ -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
board/adi/sc594-som-ezkit/sc594-som-ezkit.env +1 -1
index 85fa8c8d49c..69d2ec3ba03 100644
@@ -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
board/adi/sc594-som-ezlite/sc594-som-ezlite.env +1 -1
index f2ee8d06801..f915175e041 100644
@@ -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
board/adi/sc598-som-ezkit/sc598-som-ezkit.env +1 -1
index 080afaef406..b6f477c8402 100644
@@ -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
board/adi/sc598-som-ezlite/sc598-som-ezlite.env +1 -1
index a3486de503e..cbf5d5e60f1 100644
@@ -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
 
configs/sc573-ezkit_defconfig +0 -1
index 7a0c7d04e84..4320c73fd39 100644
@@ -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
configs/sc584-ezkit_defconfig +0 -1
index 7975a610ca3..52ab7c9337b 100644
@@ -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
configs/sc589-ezkit_defconfig +0 -1
index 0ceb57f1f42..a249fe8df7b 100644
@@ -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
configs/sc589-mini_defconfig +0 -1
index 32678b63a9f..25285695367 100644
@@ -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
configs/sc594-som-ezkit-spl_defconfig +1 -0
index c379de2c146..89ef08c1a72 100644
@@ -74,3 +74,4 @@ CONFIG_SPL_TIMER=y
 CONFIG_USB=y
 CONFIG_USB_DWC2=y
 CONFIG_USB_STORAGE=y
+CONFIG_SC5XX_LOADADDR=0xA2000000
configs/sc594-som-ezlite-spl_defconfig +1 -0
index 54b26ed85c2..9e907d31136 100644
@@ -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
configs/sc598-som-ezkit-spl_defconfig +1 -0
index 7027a7f8a2a..ea1e0b6202c 100644
@@ -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
configs/sc598-som-ezlite-spl_defconfig +1 -0
index 0b59b36f264..0b47f6febba 100644
@@ -106,3 +106,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
include/env/adi/adi_boot.env +10 -6
index b574892e0a0..3c196e40603 100644
@@ -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)
Signature · 1 line
2.34.1
Reviewed-by on v4 3/14
#7 lore raw

Re: [RESEND v4 03/14] mach-sc5xx: Update boot commands

Quoted 17 lines · Caleb Ethridge

mach-sc5xx: Update boot commands

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

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 -
Quoted 8 lines
 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 ++++++++++------
 17 files changed, 22 insertions(+), 18 deletions(-)
#8 lore raw

PATCH RESEND v4 4/14 mach-sc5xx: Switch from tftp to wget

In reply to Caleb Ethridge

From: Caleb Ethridge <[email protected]>

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.

---
 include/env/adi/adi_boot.env | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
include/env/adi/adi_boot.env +5 -6
index 3c196e40603..eb098dd2256 100644
@@ -15,6 +15,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
@@ -27,15 +28,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
 
@@ -64,8 +64,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
Signature · 1 line
2.34.1
Reviewed-by on v4 4/14
#9 lore raw

Re: [RESEND v4 04/14] mach-sc5xx: Switch from tftp to wget

Hi Caleb,

Quoted 13 lines · Caleb Ethridge

mach-sc5xx: Switch from tftp to wget

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.

include/env/adi/adi_boot.env | 11 +++++------

 1 file changed, 5 insertions(+), 6 deletions(-)

include/env/adi/adi_boot.env line 15

Quoted 1 line
include/env/adi/adi_boot.env +1 -0
@@ -15,6 +15,7 @@
+httpdstp=8000

The default HTTP port is 80. The commit message does not explain why 8000 is chosen. Please can you add a comment explaining the rationale, or use port 80 if there is no specific need for a non-standard port?

Regards,
Simon

#10 lore raw

Re: [RESEND v4 04/14] mach-sc5xx: Switch from tftp to wget

Hi Simon,

Thanks so much for this and the other reviews on the series. We really appreciate it!

Quoted 14 lines · Simon Glass

Hi Caleb,

Quoted 10 lines · Caleb Ethridge

mach-sc5xx: Switch from tftp to wget

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.

include/env/adi/adi_boot.env | 11 +++++------

 1 file changed, 5 insertions(+), 6 deletions(-)
Quoted 7 lines

include/env/adi/adi_boot.env line 15

Quoted 3 lines
include/env/adi/adi_boot.env +1 -0
@@ -15,6 +15,7 @@
+httpdstp=8000

The default HTTP port is 80. The commit message does not explain why 8000 is chosen. Please can you add a comment explaining the rationale, or use port 80 if there is no specific need for a non-standard port?

Explaining it in the commit message sounds good. It allows us to run an unprivileged web server.[1] 8000 is the default for python3 -m http.server.

[1]: https://analogdevicesinc.github.io/documentation/products/adsp/setup.html#boot-linux

#11 lore raw

Re: [RESEND v4 04/14] mach-sc5xx: Switch from tftp to wget

Hi Philip,

Quoted 4 lines · Philip Molloy

Hi Simon,

Thanks so much for this and the other reviews on the series. We really appreciate it!

You're welcome!

Quoted 24 lines · Simon Glass
Quoted 14 lines

Hi Caleb,

Quoted 10 lines · Caleb Ethridge

mach-sc5xx: Switch from tftp to wget

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.

include/env/adi/adi_boot.env | 11 +++++------

 1 file changed, 5 insertions(+), 6 deletions(-)
Quoted 7 lines

include/env/adi/adi_boot.env line 15

Quoted 3 lines
include/env/adi/adi_boot.env +1 -0
@@ -15,6 +15,7 @@
+httpdstp=8000

The default HTTP port is 80. The commit message does not explain why 8000 is chosen. Please can you add a comment explaining the rationale, or use port 80 if there is no specific need for a non-standard port?

Quoted 1 line

Explaining it in the commit message sounds good. It allows us to run an unprivileged web server.[1] 8000 is the default for python3 -m http.server.

Sounds good.

Quoted 2 lines

[1]: https://analogdevicesinc.github.io/documentation/products/adsp/setup.html#boot-linux

Regards,
Simon

#12 lore raw

PATCH RESEND v4 5/14 mach-sc5xx: Add USB boot command

In reply to Caleb Ethridge

From: Caleb Ethridge <[email protected]>

Add the USB boot command to the environments
of the boards that support it.

---
 board/adi/sc573-ezkit/sc573-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/sc598-som-ezkit/sc598-som-ezkit.env | 1 +
 include/env/adi/adi_boot.env                  | 7 +++++++
 6 files changed, 12 insertions(+)
board/adi/sc573-ezkit/sc573-ezkit.env +1 -0
index 51157ff36aa..36bd207f410 100644
@@ -11,5 +11,6 @@ loadaddr=CONFIG_SC5XX_LOADADDR
 #define USE_SPI
 #define USE_RAM
 #define USE_MMC
+#define USE_USB
 
 #include <env/adi/adi_boot.env>
board/adi/sc589-ezkit/sc589-ezkit.env +1 -0
index d068b44573f..a4a686158ca 100644
@@ -11,5 +11,6 @@ loadaddr=CONFIG_SC5XX_LOADADDR
 #define USE_RAM
 #define USE_MMC
 #define USE_SPI
+#define USE_USB
 
 #include <env/adi/adi_boot.env>
board/adi/sc589-mini/sc589-mini.env +1 -0
index 3827cf4e9a5..2a322bc6761 100644
@@ -11,5 +11,6 @@ loadaddr=CONFIG_SC5XX_LOADADDR
 #define USE_RAM
 #define USE_SPI
 #define USE_MMC
+#define USE_USB
 
 #include <env/adi/adi_boot.env>
board/adi/sc594-som-ezkit/sc594-som-ezkit.env +1 -0
index 69d2ec3ba03..a4c72f2e9c7 100644
@@ -12,5 +12,6 @@ loadaddr=CONFIG_SC5XX_LOADADDR
 #define USE_OSPI
 #define USE_RAM
 #define USE_MMC
+#define USE_USB
 
 #include <env/adi/adi_boot.env>
board/adi/sc598-som-ezkit/sc598-som-ezkit.env +1 -0
index b6f477c8402..754dcece976 100644
@@ -12,5 +12,6 @@ loadaddr=CONFIG_SC5XX_LOADADDR
 #define USE_OSPI
 #define USE_RAM
 #define USE_MMC
+#define USE_USB
 
 #include <env/adi/adi_boot.env>
include/env/adi/adi_boot.env +7 -0
index eb098dd2256..d6caa95325e 100644
@@ -68,3 +68,10 @@ 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;
+	ext4load usb 0:1 ${loadaddr} /fitImage; run usbargs;
+	bootm ${loadaddr}
+#endif
Signature · 1 line
2.34.1
Reviewed-by on v4 5/14
#13 lore raw

Re: [RESEND v4 05/14] mach-sc5xx: Add USB boot command

Hi Caleb,

Quoted 17 lines · Caleb Ethridge

mach-sc5xx: Add USB boot command

Add the USB boot command to the environments
of the boards that support it.

board/adi/sc573-ezkit/sc573-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/sc598-som-ezkit/sc598-som-ezkit.env | 1 +
 include/env/adi/adi_boot.env                  | 7 +++++++
 6 files changed, 12 insertions(+)

board/adi/sc598-som-ezkit/sc598-som-ezkit.env loadaddr=CONFIG_SC5XX_LOADADDR · line 12

Quoted 1 line
board/adi/sc598-som-ezkit/sc598-som-ezkit.env +1 -0
@@ -12,5 +12,6 @@ loadaddr=CONFIG_SC5XX_LOADADDR
+#define USE_USB

Just to check - sc584-ezkit has CONFIG_USB enabled in its defconfig but this patch does not add USE_USB to that board. Is that intentional?

Regards,
Simon

#14 lore raw

Re: [RESEND v4 05/14] mach-sc5xx: Add USB boot command

Hi Simon,

Quoted 3 lines

Just to check - sc584-ezkit has CONFIG_USB enabled in its defconfig but this patch does not add USE_USB to that board. Is that intentional?

Thanks for catching this, no it is not intentional. I will fix this with the next version of the series.

Thanks,

Caleb Ethridge

#15 lore raw

PATCH RESEND v4 6/14 mach-sc5xx: Remove preliminary binman support

In reply to Caleb Ethridge

From: Caleb Ethridge <[email protected]>

Remove preliminary binman support from all sc5xx ADSP boards. Full support was never added because it was unused.

---
 arch/arm/dts/sc5xx.dtsi     | 41 -------------------------------------
 arch/arm/mach-sc5xx/Kconfig | 33 -----------------------------
 2 files changed, 74 deletions(-)
arch/arm/dts/sc5xx.dtsi +0 -41
index 9d346ae62e0..072631e34f7 100644
@@ -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";
arch/arm/mach-sc5xx/Kconfig +0 -33
index cfa7ed46a82..70fab57fb3c 100644
@@ -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
Signature · 1 line
2.34.1
Reviewed-by on v4 6/14
#16 lore raw

Re: [RESEND v4 06/14] mach-sc5xx: Remove preliminary binman support

Hi Caleb,

Quoted 13 lines · Caleb Ethridge

mach-sc5xx: Remove preliminary binman support

Remove preliminary binman support from all sc5xx ADSP boards. Full support was never added because it was unused.

arch/arm/dts/sc5xx.dtsi | 41 -----------------------------------------

 arch/arm/mach-sc5xx/Kconfig | 33 ---------------------------------
 2 files changed, 74 deletions(-)

arch/arm/mach-sc5xx/Kconfig config SC5XX_LOADADDR · line 145

Quoted 3 lines
arch/arm/mach-sc5xx/Kconfig +0 -3
@@ -143,39 +143,6 @@ config SC5XX_LOADADDR
-menu "Binman configuration"
-config SC5XX_USE_BINMAN
-     bool "Use binman for final image"

This leaves behind SC5XX_UBOOT_SPL_OFFSET, SC5XX_UBOOT_OFFSET, SC5XX_FITIMAGE_OFFSET and SC5XX_ROOTFS_OFFSET should you remove them as well?

Regards,
Simon

#17 lore raw

PATCH RESEND v4 7/14 dts: sc594: Fix gige-reset line on EZKIT

In reply to Caleb Ethridge

From: Caleb Ethridge <[email protected]>

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 be79378 ("board: adi: Add support for SC594")
---
 arch/arm/dts/sc594-som-ezkit.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/dts/sc594-som-ezkit.dts +1 -1
index dea9a6e27f2..396502b6745 100644
@@ -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;
Signature · 1 line
2.34.1
Reviewed-by on v4 7/14
#18 lore raw

Re: [RESEND v4 07/14] dts: sc594: Fix gige-reset line on EZKIT

Quoted 7 lines · Caleb Ethridge

dts: sc594: Fix gige-reset line on EZKIT

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.

Quoted 5 lines
Fixes be79378 ("board: adi: Add support for SC594")

arch/arm/dts/sc594-som-ezkit.dts | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)
#19 lore raw

PATCH RESEND v4 8/14 mach-sc5xx: sc573: Rename EZKIT board to EZLITE

In reply to Caleb Ethridge

From: Caleb Ethridge <[email protected]>

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.

---
 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%)
arch/arm/dts/Makefile +1 -1
index 4085d4c2de1..5e7ddb56ddc 100644
@@ -1181,7 +1181,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
arch/arm/dts/sc573-ezlite.dts renamed from arch/arm/dts/sc573-ezkit.dts +2 -2
similarity index 98%
rename from arch/arm/dts/sc573-ezkit.dts
rename to arch/arm/dts/sc573-ezlite.dts
index 4a3d1ed5c56..57604d707f7 100644
@@ -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 {
arch/arm/mach-sc5xx/Kconfig +4 -4
index 70fab57fb3c..e311a8adf9a 100644
@@ -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
arch/arm/mach-sc5xx/init/dmcinit.c +1 -1
index 12052613feb..2026735cc21 100644
@@ -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
board/adi/sc573-ezlite/Kconfig renamed from board/adi/sc573-ezkit/Kconfig +4 -4
similarity index 92%
rename from board/adi/sc573-ezkit/Kconfig
rename to board/adi/sc573-ezlite/Kconfig
index 328563c1296..f3b848ef0f7 100644
@@ -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"
board/adi/sc573-ezlite/Makefile renamed from board/adi/sc573-ezkit/Makefile +1 -1
similarity index 79%
rename from board/adi/sc573-ezkit/Makefile
rename to board/adi/sc573-ezlite/Makefile
index 0ea725b992b..77c55af6240 100644
@@ -3,4 +3,4 @@
 # (C) Copyright 2025 - Analog Devices, Inc.
 #
 
-obj-y	+= sc573-ezkit.o
+obj-y	+= sc573-ezlite.o
board/adi/sc573-ezlite/sc573-ezlite.c renamed from board/adi/sc573-ezkit/sc573-ezkit.c +0 -0
similarity index 100%
rename from board/adi/sc573-ezkit/sc573-ezkit.c
rename to board/adi/sc573-ezlite/sc573-ezlite.c
board/adi/sc573-ezlite/sc573-ezlite.env renamed from board/adi/sc573-ezkit/sc573-ezkit.env +0 -0
similarity index 100%
rename from board/adi/sc573-ezkit/sc573-ezkit.env
rename to board/adi/sc573-ezlite/sc573-ezlite.env
configs/sc573-ezlite_defconfig renamed from configs/sc573-ezkit_defconfig +1 -1
similarity index 98%
rename from configs/sc573-ezkit_defconfig
rename to configs/sc573-ezlite_defconfig
index 4320c73fd39..f6305451c27 100644
@@ -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
doc/device-tree-bindings/arm/adi/adi,sc5xx.yaml +1 -1
index df976c7ae73..ae3b5e6092a 100644
@@ -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
include/configs/sc573-ezlite.h renamed from include/configs/sc573-ezkit.h +2 -2
similarity index 79%
rename from include/configs/sc573-ezkit.h
rename to include/configs/sc573-ezlite.h
index 42e42f8150b..590a8f06fb5 100644
@@ -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
Signature · 1 line
2.34.1
Reviewed-by on v4 8/14
#20 lore raw

Re: [RESEND v4 08/14] mach-sc5xx: sc573: Rename EZKIT board to EZLITE

Quoted 10 lines · Caleb Ethridge

mach-sc5xx: sc573: Rename EZKIT board to EZLITE

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.

arch/arm/dts/Makefile | 2 +-

Quoted 11 lines
 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/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(-)
#21 lore raw

PATCH RESEND v4 9/14 mach-sc5xx: Update image load address

In reply to Caleb Ethridge

From: Caleb Ethridge <[email protected]>

Update the load address for the image in
each environment to match the updated partitions
in Linux.

---
 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(-)
board/adi/sc573-ezlite/sc573-ezlite.env +1 -1
index 36bd207f410..4ee08deb1b3 100644
@@ -4,7 +4,7 @@
  */
 
 jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc573-ezkit.jffs2
-adi_image_offset=0xe0000
+adi_image_offset=0xd0000
 loadaddr=CONFIG_SC5XX_LOADADDR
 
 #define USE_NFS
board/adi/sc584-ezkit/sc584-ezkit.env +1 -1
index 6d4b20d70f6..20e5ee0eb76 100644
@@ -4,7 +4,7 @@
  */
 
 jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc584-ezkit.jffs2
-adi_image_offset=0xe0000
+adi_image_offset=0xd0000
 loadaddr=CONFIG_SC5XX_LOADADDR
 
 #define USE_NFS
board/adi/sc589-ezkit/sc589-ezkit.env +1 -1
index a4a686158ca..6f314542ecc 100644
@@ -4,7 +4,7 @@
  */
 
 jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc589-ezkit.jffs2
-adi_image_offset=0xe0000
+adi_image_offset=0xd0000
 loadaddr=CONFIG_SC5XX_LOADADDR
 
 #define USE_NFS
board/adi/sc589-mini/sc589-mini.env +1 -1
index 2a322bc6761..c5ea555411e 100644
@@ -4,7 +4,7 @@
  */
 
 jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc589-mini.jffs2
-adi_image_offset=0xe0000
+adi_image_offset=0xd0000
 loadaddr=CONFIG_SC5XX_LOADADDR
 
 #define USE_NFS
board/adi/sc594-som-ezkit/sc594-som-ezkit.env +1 -1
index a4c72f2e9c7..4d86eafe145 100644
@@ -4,7 +4,7 @@
  */
 
 jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc594-som-ezkit.jffs2
-adi_image_offset=0x110000
+adi_image_offset=0x100000
 loadaddr=CONFIG_SC5XX_LOADADDR
 
 #define USE_NFS
board/adi/sc594-som-ezlite/sc594-som-ezlite.env +1 -1
index f915175e041..bfce3a9c9b0 100644
@@ -4,7 +4,7 @@
  */
 
 jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc594-som-ezlite.jffs2
-adi_image_offset=0x110000
+adi_image_offset=0x100000
 loadaddr=CONFIG_SC5XX_LOADADDR
 
 #define USE_NFS
board/adi/sc598-som-ezkit/sc598-som-ezkit.env +1 -1
index 754dcece976..cbc5a57c755 100644
@@ -4,7 +4,7 @@
  */
 
 jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc598-som-ezkit.jffs2
-adi_image_offset=0x110000
+adi_image_offset=0x100000
 loadaddr=CONFIG_SC5XX_LOADADDR
 
 #define USE_NFS
Signature · 1 line
2.34.1
Reviewed-by on v4 9/14
#22 lore raw

Re: [RESEND v4 09/14] mach-sc5xx: Update image load address

Hi Caleb,

Quoted 19 lines · Caleb Ethridge

mach-sc5xx: Update image load address

Update the load address for the image in
each environment to match the updated partitions
in Linux.

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(-)

board/adi/sc573-ezlite/sc573-ezlite.env line 5

Quoted 3 lines
board/adi/sc573-ezlite/sc573-ezlite.env +1 -1
@@ -4,7 +4,7 @@
 jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc573-ezkit.jffs2
-adi_image_offset=0xe0000
+adi_image_offset=0xd0000

Doesn't this commit actually update the fitImage offset in SPI flash?

Regards,
Simon

#23 lore raw

Re: [RESEND v4 09/14] mach-sc5xx: Update image load address

Hi Simon,

Yes, this does change the location of the fitImage in the SPI flash.
The U-boot environment before was stored right before the fitImage partition, with it gone we are moving the start of the fitImage partition so there isn't an empty hole in the middle of the SPI flash. I can reword the commit message to make it clear that this is the fitImage, I believe that answers your question?

Thanks,

Caleb

#24 lore raw

Re: [RESEND v4 09/14] mach-sc5xx: Update image load address

Hi Caleb,

Quoted 8 lines · Caleb Ethridge

Hi Simon,

Yes, this does change the location of the fitImage in the SPI flash.
The U-boot environment before was stored right before the fitImage partition, with it gone we are moving the start of the fitImage partition so there isn't an empty hole in the middle of the SPI flash. I can reword the commit message to make it clear that this is the fitImage, I believe that answers your question?

Yes, I see. If you think a wording change helps, please go ahead.

Regards,
Simon

#25 lore raw

Re: [RESEND v4 09/14] mach-sc5xx: Update image load address

Hi Simon,

I have decided to keep the commit message as is, since with the coming booti support the image at this address may not always be a fitImage, though all images will be stored in the SPI flash at the same address.

Thanks,

Caleb Ethridge

#26 lore raw

PATCH RESEND v4 10/14 mach-sc5xx: Update SPI bootargs for ubifs

In reply to Caleb Ethridge

From: Caleb Ethridge <[email protected]>

Update the bootargs used in SPI/OSPI bootmode
to reflect change from jffs to ubifs for the
SPI's filesystem.

---
 board/adi/sc573-ezlite/sc573-ezlite.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 -
 board/adi/sc598-som-ezlite/sc598-som-ezlite.env | 1 -
 include/env/adi/adi_boot.env                    | 5 ++---
 9 files changed, 2 insertions(+), 11 deletions(-)
board/adi/sc573-ezlite/sc573-ezlite.env +0 -1
index 4ee08deb1b3..c909b3b476a 100644
@@ -3,7 +3,6 @@
  * (C) Copyright 2024 - Analog Devices, Inc.
  */
 
-jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc573-ezkit.jffs2
 adi_image_offset=0xd0000
 loadaddr=CONFIG_SC5XX_LOADADDR
 
board/adi/sc584-ezkit/sc584-ezkit.env +0 -1
index 20e5ee0eb76..1090d2731a5 100644
@@ -3,7 +3,6 @@
  * (C) Copyright 2024 - Analog Devices, Inc.
  */
 
-jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc584-ezkit.jffs2
 adi_image_offset=0xd0000
 loadaddr=CONFIG_SC5XX_LOADADDR
 
board/adi/sc589-ezkit/sc589-ezkit.env +0 -1
index 6f314542ecc..02567830c16 100644
@@ -3,7 +3,6 @@
  * (C) Copyright 2024 - Analog Devices, Inc.
  */
 
-jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc589-ezkit.jffs2
 adi_image_offset=0xd0000
 loadaddr=CONFIG_SC5XX_LOADADDR
 
board/adi/sc589-mini/sc589-mini.env +0 -1
index c5ea555411e..661c130b835 100644
@@ -3,7 +3,6 @@
  * (C) Copyright 2024 - Analog Devices, Inc.
  */
 
-jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc589-mini.jffs2
 adi_image_offset=0xd0000
 loadaddr=CONFIG_SC5XX_LOADADDR
 
board/adi/sc594-som-ezkit/sc594-som-ezkit.env +0 -1
index 4d86eafe145..f787d972339 100644
@@ -3,7 +3,6 @@
  * (C) Copyright 2024 - Analog Devices, Inc.
  */
 
-jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc594-som-ezkit.jffs2
 adi_image_offset=0x100000
 loadaddr=CONFIG_SC5XX_LOADADDR
 
board/adi/sc594-som-ezlite/sc594-som-ezlite.env +0 -1
index bfce3a9c9b0..9db35ac8d59 100644
@@ -3,7 +3,6 @@
  * (C) Copyright 2024 - Analog Devices, Inc.
  */
 
-jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc594-som-ezlite.jffs2
 adi_image_offset=0x100000
 loadaddr=CONFIG_SC5XX_LOADADDR
 
board/adi/sc598-som-ezkit/sc598-som-ezkit.env +0 -1
index cbc5a57c755..f787d972339 100644
@@ -3,7 +3,6 @@
  * (C) Copyright 2024 - Analog Devices, Inc.
  */
 
-jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc598-som-ezkit.jffs2
 adi_image_offset=0x100000
 loadaddr=CONFIG_SC5XX_LOADADDR
 
board/adi/sc598-som-ezlite/sc598-som-ezlite.env +0 -1
index cbf5d5e60f1..d5364df1613 100644
@@ -5,6 +5,5 @@
 
 adi_image_offset=0x100000
 loadaddr=CONFIG_SC5XX_LOADADDR
-jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc598-som-ezlite.jffs2
 
 #include <env/adi/adi_boot.env>
include/env/adi/adi_boot.env +2 -3
index d6caa95325e..046f4f8a410 100644
@@ -3,7 +3,6 @@
  *
  * - adi_image_offset, location of the fitImage 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
@@ -48,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;
@@ -56,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;
Signature · 1 line
2.34.1
Reviewed-by on v4 10/14
#27 lore raw

Re: [RESEND v4 10/14] mach-sc5xx: Update SPI bootargs for ubifs

Hi Caleb,

Quoted 21 lines · Caleb Ethridge

mach-sc5xx: Update SPI bootargs for ubifs

Update the bootargs used in SPI/OSPI bootmode
to reflect change from jffs to ubifs for the
SPI's filesystem.

board/adi/sc573-ezlite/sc573-ezlite.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 -
 board/adi/sc598-som-ezlite/sc598-som-ezlite.env | 1 -
 include/env/adi/adi_boot.env                    | 5 ++---
 9 files changed, 2 insertions(+), 11 deletions(-)

board/adi/sc573-ezlite/sc573-ezlite.env line 3

Quoted 1 line
board/adi/sc573-ezlite/sc573-ezlite.env +0 -1
@@ -3,7 +3,6 @@
-jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc573-ezkit.jffs2

The commit message could also mention removing jffs2file from all board .env files

Regards,
Simon

#28 lore raw

PATCH RESEND v4 11/14 configs: sc5xx: Set default bootcmd to SPI boot

In reply to Caleb Ethridge

From: Caleb Ethridge <[email protected]>

Align configs to use the same default bootcommand.

---
 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(-)
configs/sc589-ezkit_defconfig +1 -1
index a249fe8df7b..d8982f62d82 100644
@@ -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
configs/sc589-mini_defconfig +1 -1
index 25285695367..78b39b6dd73 100644
@@ -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
configs/sc594-som-ezkit-spl_defconfig +1 -1
index 89ef08c1a72..23951d0b5f1 100644
@@ -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
configs/sc594-som-ezlite-spl_defconfig +1 -1
index 9e907d31136..b4e71b5d2eb 100644
@@ -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
Signature · 1 line
2.34.1
Reviewed-by on v4 11/14
#29 lore raw

Re: [RESEND v4 11/14] configs: sc5xx: Set default bootcmd to SPI boot

Quoted 14 lines · Caleb Ethridge

configs: sc5xx: Set default bootcmd to SPI boot

Align configs to use the same default bootcommand.

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(-)

configs/sc594-som-ezkit-spl_defconfig CONFIG_FIT=y · line 15

Quoted 2 lines
configs/sc594-som-ezkit-spl_defconfig +1 -1
@@ -15,7 +15,7 @@ CONFIG_FIT=y
-CONFIG_BOOTCOMMAND="run ospiboot"
+CONFIG_BOOTCOMMAND="run spiboot"
#30 lore raw

PATCH RESEND v4 12/14 arm: sc5xx: Remove SC5XX_LOADADDR

In reply to Caleb Ethridge

From: Caleb Ethridge <[email protected]>

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.

---
 arch/arm/mach-sc5xx/Kconfig                    |  6 ------
 board/adi/sc573-ezlite/sc573-ezlite.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-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 +++++++++++-------
 18 files changed, 19 insertions(+), 45 deletions(-)
arch/arm/mach-sc5xx/Kconfig +0 -6
index e311a8adf9a..44402b2568d 100644
@@ -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
board/adi/sc573-ezlite/sc573-ezlite.env +0 -3
index c909b3b476a..ab1acabef53 100644
@@ -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
board/adi/sc584-ezkit/sc584-ezkit.env +0 -3
index 1090d2731a5..740b7b554cb 100644
@@ -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
board/adi/sc589-ezkit/sc589-ezkit.env +0 -3
index 02567830c16..00f90c7942e 100644
@@ -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
board/adi/sc589-mini/sc589-mini.env +0 -3
index 661c130b835..13079ed7527 100644
@@ -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
board/adi/sc594-som-ezkit/sc594-som-ezkit.env +0 -3
index f787d972339..324bfae4571 100644
@@ -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
board/adi/sc594-som-ezlite/sc594-som-ezlite.env +0 -3
index 9db35ac8d59..bdbfaf0dabe 100644
@@ -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
board/adi/sc598-som-ezkit/sc598-som-ezkit.env +0 -3
index f787d972339..324bfae4571 100644
@@ -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
board/adi/sc598-som-ezlite/sc598-som-ezlite.env +0 -3
index d5364df1613..c7d7932064a 100644
@@ -3,7 +3,4 @@
  * (C) Copyright 2024 - Analog Devices, Inc.
  */
 
-adi_image_offset=0x100000
-loadaddr=CONFIG_SC5XX_LOADADDR
-
 #include <env/adi/adi_boot.env>
configs/sc573-ezlite_defconfig +1 -1
index f6305451c27..cbf24234cc3 100644
@@ -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
configs/sc584-ezkit_defconfig +1 -1
index 52ab7c9337b..bb24b31b2c0 100644
@@ -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
configs/sc589-ezkit_defconfig +1 -1
index d8982f62d82..d3f0380bfed 100644
@@ -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
configs/sc589-mini_defconfig +1 -1
index 78b39b6dd73..1bdede4b739 100644
@@ -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
configs/sc594-som-ezkit-spl_defconfig +1 -1
index 23951d0b5f1..4f8be110ee4 100644
@@ -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
configs/sc594-som-ezlite-spl_defconfig +1 -1
index b4e71b5d2eb..c045c67569b 100644
@@ -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
configs/sc598-som-ezkit-spl_defconfig +1 -1
index ea1e0b6202c..3c22ee299b9 100644
@@ -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
@@ -108,4 +109,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
configs/sc598-som-ezlite-spl_defconfig +1 -1
index 0b47f6febba..d93ed06f65e 100644
@@ -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
@@ -106,4 +107,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
include/env/adi/adi_boot.env +11 -7
index 046f4f8a410..abf7726ab94 100644
@@ -2,7 +2,6 @@
  * 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
@@ -21,6 +20,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 +39,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 +47,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)
@@ -51,7 +55,7 @@ spiargs=setenv bootargs rootfstype=ubifs root=ubi0:rootfs ubi.mtd=3 rw ${adi_boo
 spiboot=run spiargs;
 	sf probe ${sfdev};
 	sf read ${loadaddr} ${adi_image_offset} 0xF00000;
-	bootm ${loadaddr}
+	bootm
 #endif
 
 #if defined(USE_OSPI)
@@ -59,18 +63,18 @@ ospiargs=setenv bootargs rootfstype=ubifs root=ubi0:rootfs ubi.mtd=3 rw ${adi_bo
 ospiboot=run ospiargs;
 	sf probe ${sfdev};
 	sf read ${loadaddr} ${adi_image_offset} 0xF00000;
-	bootm ${loadaddr}
+	bootm
 #endif
 
 #if defined(USE_RAM)
 ramboot= wget ${loadaddr} ${serverip}:/fitImage;
 	run ramargs;
-	bootm ${loadaddr}
+	bootm
 #endif
 
 #if defined(USE_USB)
 usbargs=setenv bootargs root=/dev/sda2 rw rootfstype=ext4 rootwait ${adi_bootargs}
 usbboot=usb start;
 	ext4load usb 0:1 ${loadaddr} /fitImage; run usbargs;
-	bootm ${loadaddr}
+	bootm
 #endif
Signature · 1 line
2.34.1
Reviewed-by on v4 12/14
#31 lore raw

Re: [RESEND v4 12/14] arm: sc5xx: Remove SC5XX_LOADADDR

Hi Caleb,

Quoted 32 lines · Caleb Ethridge

arm: sc5xx: Remove SC5XX_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.

arch/arm/mach-sc5xx/Kconfig | 6 ------

 board/adi/sc573-ezlite/sc573-ezlite.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 ---
 board/adi/sc594-som-ezlite/sc594-som-ezlite.env |  3 ---
 board/adi/sc598-som-ezkit/sc598-som-ezkit.env   |  3 ---
 board/adi/sc598-som-ezlite/sc598-som-ezlite.env |  3 ---
 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 +++++++++++-------
 18 files changed, 19 insertions(+), 45 deletions(-)

include/env/adi/adi_boot.env line 5

Quoted 4 lines
include/env/adi/adi_boot.env +0 -1
@@ -2,7 +2,6 @@
 * 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

The comment header now says boards need to set adi_image_offset, but this patch moves adi_image_offset into adi_boot.env itself. Since no board-level variables are needed anymore, please can you remove or update this entire comment block?

Regards,
Simon

#32 lore raw

PATCH RESEND v4 13/14 arm: sc5xx: add missing boot env selectors

In reply to Caleb Ethridge

From: Ozan Durgut <[email protected]>

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 c9e893d ("board: adi: Add support for SC598")
---
 board/adi/sc598-som-ezlite/sc598-som-ezlite.env | 6 ++++++
 1 file changed, 6 insertions(+)
board/adi/sc598-som-ezlite/sc598-som-ezlite.env +6 -0
index c7d7932064a..ab1acabef53 100644
@@ -3,4 +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>
Signature · 1 line
2.34.1
Reviewed-by on v4 13/14
#33 lore raw

Re: [RESEND v4 13/14] arm: sc5xx: add missing boot env selectors

Quoted 11 lines · Caleb Ethridge

arm: sc5xx: add missing boot env selectors

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.

Quoted 5 lines
Fixes c9e893d ("board: adi: Add support for SC598")

board/adi/sc598-som-ezlite/sc598-som-ezlite.env | 6 ++++++

 1 file changed, 6 insertions(+)
#34 lore raw

PATCH RESEND v4 14/14 arm: sc5xx: Add fdt_addr_r, kernel_addr_r, and initrd_addr

In reply to Caleb Ethridge

From: Caleb Ethridge <[email protected]>

Add fdt_addr_r, kernel_addr_r, and initrd_addr to the SC5xx boards, to be used by the booti command.

---
 board/adi/sc573-ezlite/sc573-ezlite.env         | 4 ++++
 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, 32 insertions(+)
board/adi/sc573-ezlite/sc573-ezlite.env +4 -0
index ab1acabef53..2a62526717d 100644
@@ -3,6 +3,10 @@
  * (C) Copyright 2024 - Analog Devices, Inc.
  */
 
+fdt_addr_r=CONFIG_SYS_LOAD_ADDR
+kernel_addr_r=0x84008000
+initrd_addr=0x85000000
+
 #define USE_NFS
 #define USE_SPI
 #define USE_RAM
board/adi/sc584-ezkit/sc584-ezkit.env +4 -0
index 740b7b554cb..48bdb6fb2cd 100644
@@ -3,6 +3,10 @@
  * (C) Copyright 2024 - Analog Devices, Inc.
  */
 
+fdt_addr_r=CONFIG_SYS_LOAD_ADDR
+kernel_addr_r=0x8A308000
+initrd_addr=0x8A800000
+
 #define USE_NFS
 #define USE_SPI
 #define USE_RAM
board/adi/sc589-ezkit/sc589-ezkit.env +4 -0
index 00f90c7942e..1cc0e735672 100644
@@ -3,6 +3,10 @@
  * (C) Copyright 2024 - Analog Devices, Inc.
  */
 
+fdt_addr_r=CONFIG_SYS_LOAD_ADDR
+kernel_addr_r=0xC4008000
+initrd_addr=0xC5000000
+
 #define USE_NFS
 #define USE_RAM
 #define USE_MMC
board/adi/sc589-mini/sc589-mini.env +4 -0
index 13079ed7527..f3d21f3afc3 100644
@@ -3,6 +3,10 @@
  * (C) Copyright 2024 - Analog Devices, Inc.
  */
 
+fdt_addr_r=CONFIG_SYS_LOAD_ADDR
+kernel_addr_r=0xC4008000
+initrd_addr=0xC5000000
+
 #define USE_NFS
 #define USE_RAM
 #define USE_SPI
board/adi/sc594-som-ezkit/sc594-som-ezkit.env +4 -0
index 324bfae4571..2e88b8099bd 100644
@@ -3,6 +3,10 @@
  * (C) Copyright 2024 - Analog Devices, Inc.
  */
 
+fdt_addr_r=CONFIG_SYS_LOAD_ADDR
+kernel_addr_r=0xA3008000
+initrd_addr=0xA8000000
+
 #define USE_NFS
 #define USE_SPI
 #define USE_OSPI
board/adi/sc594-som-ezlite/sc594-som-ezlite.env +4 -0
index bdbfaf0dabe..8cdc7006d1d 100644
@@ -3,6 +3,10 @@
  * (C) Copyright 2024 - Analog Devices, Inc.
  */
 
+fdt_addr_r=CONFIG_SYS_LOAD_ADDR
+kernel_addr_r=0x80008000
+initrd_addr=0x85000000
+
 #define USE_NFS
 #define USE_SPI
 #define USE_OSPI
board/adi/sc598-som-ezkit/sc598-som-ezkit.env +4 -0
index 324bfae4571..b9934b0ac5d 100644
@@ -3,6 +3,10 @@
  * (C) Copyright 2024 - Analog Devices, Inc.
  */
 
+fdt_addr_r=CONFIG_SYS_LOAD_ADDR
+kernel_addr_r=0x9a200000
+initrd_addr=0x9c000000
+
 #define USE_NFS
 #define USE_SPI
 #define USE_OSPI
board/adi/sc598-som-ezlite/sc598-som-ezlite.env +4 -0
index ab1acabef53..ceb8e4e7776 100644
@@ -3,6 +3,10 @@
  * (C) Copyright 2024 - Analog Devices, Inc.
  */
 
+fdt_addr_r=CONFIG_SYS_LOAD_ADDR
+kernel_addr_r=0x9a200000
+initrd_addr=0x9c000000
+
 #define USE_NFS
 #define USE_SPI
 #define USE_RAM
Signature · 1 line
2.34.1
Reviewed-by on v4 14/14
#35 lore raw

Re: [RESEND v4 14/14] arm: sc5xx: Add fdt_addr_r, kernel_addr_r, and initrd_addr

Hi Caleb,

Quoted 19 lines · Caleb Ethridge

arm: sc5xx: Add fdt_addr_r, kernel_addr_r, and initrd_addr

Add fdt_addr_r, kernel_addr_r, and initrd_addr to the SC5xx boards, to be used by the booti command.

board/adi/sc573-ezlite/sc573-ezlite.env | 4 ++++

 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, 32 insertions(+)

board/adi/sc594-som-ezlite/sc594-som-ezlite.env line 5

Quoted 3 lines
board/adi/sc594-som-ezlite/sc594-som-ezlite.env +3 -0
@@ -3,6 +3,10 @@
+fdt_addr_r=CONFIG_SYS_LOAD_ADDR
+kernel_addr_r=0x80008000
+initrd_addr=0x85000000

The kernel_addr_r value 0x80008000 looks incorrect for this board. CONFIG_SYS_LOAD_ADDR is a2000000, and sc594-som-ezkit uses kernel_addr_r=a3008000. I suspect this should be a3008000

Similarly, initrd_addr=85000000 seems inconsistent when the load address is around Aa000000; sc594-som-ezkit uses A8000000. Please can you check?

board/adi/sc573-ezlite/sc573-ezlite.env line 3

Quoted 3 lines
board/adi/sc573-ezlite/sc573-ezlite.env +1 -0
@@ -3,6 +3,10 @@
+initrd_addr=0x85000000

The standard U-Boot naming convention is ramdisk_addr_r - would it make sense to use that name?

board/adi/sc573-ezlite/sc573-ezlite.env line 5

Quoted 5 lines
board/adi/sc573-ezlite/sc573-ezlite.env +3 -0
@@ -3,6 +3,10 @@
+fdt_addr_r=CONFIG_SYS_LOAD_ADDR
+kernel_addr_r=0x84008000
+initrd_addr=0x85000000

The commit message says these are for booti, but adi_boot.env uses bootm with fitImage and does not reference these variables. Is this preparatory work for a future patch? If so, please mention that in the commit message.

Regards,
Simon

#36 lore raw

Re: [RESEND v4 14/14] arm: sc5xx: Add fdt_addr_r, kernel_addr_r, and initrd_addr

Hi Simon,

Quoted 3 lines

Similarly, initrd_addr=85000000 seems inconsistent when the load address is around Aa000000; sc594-som-ezkit uses A8000000. Please can you check?

That is correct, these should be A******* to match the sc594-ezkit. I will fix this in the next version.

Quoted 2 lines

The standard U-Boot naming convention is ramdisk_addr_r - would it make sense to use that name?

Yes, I will update from initrd_addr to ramdisk_addr_r.

Quoted 4 lines

The commit message says these are for booti, but adi_boot.env uses bootm with fitImage and does not reference these variables. Is this preparatory work for a future patch? If so, please mention that in the commit message.

Yes, currently there are no boot commands that use the booti command and its structure, but there will be in the future. This patch is just laying the groundwork for this future work, I will update the commit message.

Thanks,

Caleb Ethridge

Reviewed-by on the v4 series
#37 lore raw
In reply to Caleb Ethridge

Hi Caleb,

Quoted 74 lines · Caleb Ethridge

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.

A bug with the Ethernet reset line on the sc594 has been fixed, and the sc573 has been renamed from the EZKIT to the EZLITE to match the name of the publically available board. EZKIT was only used internally before release. Preliminary binman support for sc5xx boards has been removed as it was unused and full support never added.

Caleb Ethridge (13):
configs: sc5xx: Do not store environment in SPI flash
mach-sc5xx: Remove update commands from default environment
mach-sc5xx: Update boot commands
mach-sc5xx: Switch from tftp to wget
mach-sc5xx: Add USB boot command
mach-sc5xx: Remove preliminary binman support
dts: sc594: Fix gige-reset line on EZKIT
mach-sc5xx: sc573: Rename EZKIT board to EZLITE
mach-sc5xx: Update image load address
mach-sc5xx: Update SPI bootargs for ubifs
configs: sc5xx: Set default bootcmd to SPI boot
arm: sc5xx: Remove SC5XX_LOADADDR
arm: sc5xx: Add fdt_addr_r, kernel_addr_r, and initrd_addr

Ozan Durgut (1):
arm: sc5xx: add missing boot env selectors

 arch/arm/dts/Makefile                         |  2 +-
 .../dts/{sc573-ezkit.dts => sc573-ezlite.dts} |  4 +-
 arch/arm/dts/sc594-som-ezkit.dts              |  2 +-
 arch/arm/dts/sc5xx.dtsi                       | 41 --------
 arch/arm/mach-sc5xx/Kconfig                   | 47 +--------
 arch/arm/mach-sc5xx/init/dmcinit.c            |  2 +-
 board/adi/sc573-ezkit/sc573-ezkit.env         | 17 ----
 .../adi/{sc573-ezkit => sc573-ezlite}/Kconfig |  8 +-
 .../{sc573-ezkit => sc573-ezlite}/Makefile    |  2 +-
 .../sc573-ezlite.c}                           |  0
 board/adi/sc573-ezlite/sc573-ezlite.env       | 16 +++
 board/adi/sc584-ezkit/sc584-ezkit.env         |  8 +-
 board/adi/sc589-ezkit/sc589-ezkit.env         |  9 +-
 board/adi/sc589-mini/sc589-mini.env           |  9 +-
 board/adi/sc594-som-ezkit/sc594-som-ezkit.env |  9 +-
 .../adi/sc594-som-ezlite/sc594-som-ezlite.env |  8 +-
 board/adi/sc598-som-ezkit/sc598-som-ezkit.env |  9 +-
 .../adi/sc598-som-ezlite/sc598-som-ezlite.env | 14 ++-
 ...ezkit_defconfig => sc573-ezlite_defconfig} | 11 +--
 configs/sc584-ezkit_defconfig                 | 10 +-
 configs/sc589-ezkit_defconfig                 | 12 +--
 configs/sc589-mini_defconfig                  | 12 +--
 configs/sc594-som-ezkit-spl_defconfig         |  7 +-
 configs/sc594-som-ezlite-spl_defconfig        |  7 +-
 configs/sc598-som-ezkit-spl_defconfig         |  5 +-
 configs/sc598-som-ezlite-spl_defconfig        |  5 +-
 .../arm/adi/adi,sc5xx.yaml                    |  2 +-
 .../configs/{sc573-ezkit.h => sc573-ezlite.h} |  4 +-
 include/env/adi/adi_boot.env                  | 98 ++++++-------------
 29 files changed, 106 insertions(+), 274 deletions(-)
 rename arch/arm/dts/{sc573-ezkit.dts => sc573-ezlite.dts} (98%)
 delete mode 100644 board/adi/sc573-ezkit/sc573-ezkit.env
 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%)
 create mode 100644 board/adi/sc573-ezlite/sc573-ezlite.env
 rename configs/{sc573-ezkit_defconfig => sc573-ezlite_defconfig} (87%)
 rename include/configs/{sc573-ezkit.h => sc573-ezlite.h} (79%)
Quoted 3 lines

--
2.34.1

For the series,

Thanks,
Greg