[PATCH v5 03/15] mach-sc5xx: Update boot commands

[Simon Glass]

Hi Caleb,

On 2026-04-23T14:24:50, Caleb Ethridge <jcethrid at gmail.com> wrote:
> mach-sc5xx: Update boot commands
>
> Update the default boot commands to match the expected
> bootargs in Linux and new SPI partitioning scheme.
>
> Signed-off-by: Caleb Ethridge <caleb.ethridge at analog.com>
>
> board/adi/sc573-ezkit/sc573-ezkit.env           |  2 +-
>  board/adi/sc584-ezkit/sc584-ezkit.env           |  2 +-
>  board/adi/sc589-ezkit/sc589-ezkit.env           |  2 +-
>  board/adi/sc589-mini/sc589-mini.env             |  2 +-
>  board/adi/sc594-som-ezkit/sc594-som-ezkit.env   |  2 +-
>  board/adi/sc594-som-ezlite/sc594-som-ezlite.env |  2 +-
>  board/adi/sc598-som-ezkit/sc598-som-ezkit.env   |  2 +-
>  board/adi/sc598-som-ezlite/sc598-som-ezlite.env |  2 +-
>  configs/sc573-ezkit_defconfig                   |  1 -
>  configs/sc584-ezkit_defconfig                   |  1 -
>  configs/sc589-ezkit_defconfig                   |  1 -
>  configs/sc589-mini_defconfig                    |  1 -
>  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(-)

> diff --git a/configs/sc594-som-ezkit-spl_defconfig b/configs/sc594-som-ezkit-spl_defconfig
> @@ -74,3 +74,4 @@ CONFIG_SPL_TIMER=y
>  CONFIG_USB=y
>  CONFIG_USB_DWC2=y
>  CONFIG_USB_STORAGE=y
> +CONFIG_SC5XX_LOADADDR=0xA2000000

Adding CONFIG_SC5XX_LOADADDR to the four sc594/sc598 SPL defconfigs
seems like it doesn't relate to "update boot commands" - maybe have
its own patch.

> diff --git a/include/env/adi/adi_boot.env b/include/env/adi/adi_boot.env
> @@ -40,23 +40,27 @@ nfsboot=run init_ethernet;
>  #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

Cramming setenv sfdev onto the end of spiargs makes the variable name
confusing - I'm not sure if there is a better way.

> diff --git a/include/env/adi/adi_boot.env b/include/env/adi/adi_boot.env
> @@ -40,23 +40,27 @@ nfsboot=run init_ethernet;
>  spiboot=run spiargs;
>       sf probe ${sfdev};
> -     sf read ${loadaddr} ${adi_image_offset} ${imagesize};
> +     sf read ${loadaddr} ${adi_image_offset} 0xF00000;
>       bootm ${loadaddr}

Hardcoding 0xf00000 (please use lower case) loses the previous
${imagesize} indirection - please explain in the commit message why a
fixed read length is correct for every board if needed. Also the new
ospiboot is now a verbatim copy of spiboot with only sfdev differing -
previously it was a one-line 'run spiboot'. Don't you want to keep the
de-duplication, e.g. by setting sfdev in ospiboot and then 'run
spiboot' ?

> diff --git a/include/env/adi/adi_boot.env b/include/env/adi/adi_boot.env
> @@ -40,23 +40,27 @@ nfsboot=run init_ethernet;
> -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;

The shift from mmcblk0p1 to mmcblk0p2 silently changes the on-disk
layout assumption - please mention this in the commit message so users
updating from older builds know they need to repartition. Same for
dropping ${imagefile} in favour of a hardcoded /fitImage path.

Regards,
Simon