Update the default boot commands to match the expected bootargs in Linux and new SPI partitioning scheme.
Because the environment is no longer stored in the SPI flash, imagesize has been removed and replaced with a fixed length read to load from the SPI. Additionally the partitions of the mmc have been updated. The first partition holds the fitImage at /fitImage, and the second partition contains the rootfs. With this change, the imagefile environment variable has also been eliminated, the image in the first partition is expected to always be named fitImage. Signed-off-by: Caleb Ethridge <[email protected]> --- board/adi/sc573-ezkit/sc573-ezkit.env | 2 +- board/adi/sc584-ezkit/sc584-ezkit.env | 2 +- board/adi/sc589-ezkit/sc589-ezkit.env | 2 +- board/adi/sc589-mini/sc589-mini.env | 2 +- board/adi/sc594-som-ezkit/sc594-som-ezkit.env | 2 +- board/adi/sc594-som-ezlite/sc594-som-ezlite.env | 2 +- board/adi/sc598-som-ezkit/sc598-som-ezkit.env | 2 +- board/adi/sc598-som-ezlite/sc598-som-ezlite.env | 2 +- configs/sc573-ezkit_defconfig | 1 - configs/sc584-ezkit_defconfig | 1 - configs/sc589-ezkit_defconfig | 1 - configs/sc589-mini_defconfig | 1 - include/env/adi/adi_boot.env | 16 ++++++++++------ 13 files changed, 18 insertions(+), 18 deletions(-) diff --git a/board/adi/sc573-ezkit/sc573-ezkit.env b/board/adi/sc573-ezkit/sc573-ezkit.env index 83cbe808efa..61381edab26 100644 --- a/board/adi/sc573-ezkit/sc573-ezkit.env +++ b/board/adi/sc573-ezkit/sc573-ezkit.env @@ -3,7 +3,7 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ -adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET +adi_image_offset=0xe0000 loadaddr=CONFIG_SC5XX_LOADADDR #define USE_NFS diff --git a/board/adi/sc584-ezkit/sc584-ezkit.env b/board/adi/sc584-ezkit/sc584-ezkit.env index 2640d97bab2..f676343a272 100644 --- a/board/adi/sc584-ezkit/sc584-ezkit.env +++ b/board/adi/sc584-ezkit/sc584-ezkit.env @@ -3,7 +3,7 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ -adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET +adi_image_offset=0xe0000 loadaddr=CONFIG_SC5XX_LOADADDR #define USE_NFS diff --git a/board/adi/sc589-ezkit/sc589-ezkit.env b/board/adi/sc589-ezkit/sc589-ezkit.env index a098f0b9c2c..8a1b9a6e92a 100644 --- a/board/adi/sc589-ezkit/sc589-ezkit.env +++ b/board/adi/sc589-ezkit/sc589-ezkit.env @@ -3,7 +3,7 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ -adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET +adi_image_offset=0xe0000 loadaddr=CONFIG_SC5XX_LOADADDR #define USE_NFS diff --git a/board/adi/sc589-mini/sc589-mini.env b/board/adi/sc589-mini/sc589-mini.env index bed2ddc944d..39ee0c54da0 100644 --- a/board/adi/sc589-mini/sc589-mini.env +++ b/board/adi/sc589-mini/sc589-mini.env @@ -3,7 +3,7 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ -adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET +adi_image_offset=0xe0000 loadaddr=CONFIG_SC5XX_LOADADDR #define USE_NFS diff --git a/board/adi/sc594-som-ezkit/sc594-som-ezkit.env b/board/adi/sc594-som-ezkit/sc594-som-ezkit.env index f629f7f2cff..12980f71ba2 100644 --- a/board/adi/sc594-som-ezkit/sc594-som-ezkit.env +++ b/board/adi/sc594-som-ezkit/sc594-som-ezkit.env @@ -3,7 +3,7 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ -adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET +adi_image_offset=0x110000 loadaddr=CONFIG_SC5XX_LOADADDR #define USE_NFS diff --git a/board/adi/sc594-som-ezlite/sc594-som-ezlite.env b/board/adi/sc594-som-ezlite/sc594-som-ezlite.env index f629f7f2cff..12980f71ba2 100644 --- a/board/adi/sc594-som-ezlite/sc594-som-ezlite.env +++ b/board/adi/sc594-som-ezlite/sc594-som-ezlite.env @@ -3,7 +3,7 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ -adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET +adi_image_offset=0x110000 loadaddr=CONFIG_SC5XX_LOADADDR #define USE_NFS diff --git a/board/adi/sc598-som-ezkit/sc598-som-ezkit.env b/board/adi/sc598-som-ezkit/sc598-som-ezkit.env index f629f7f2cff..12980f71ba2 100644 --- a/board/adi/sc598-som-ezkit/sc598-som-ezkit.env +++ b/board/adi/sc598-som-ezkit/sc598-som-ezkit.env @@ -3,7 +3,7 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ -adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET +adi_image_offset=0x110000 loadaddr=CONFIG_SC5XX_LOADADDR #define USE_NFS diff --git a/board/adi/sc598-som-ezlite/sc598-som-ezlite.env b/board/adi/sc598-som-ezlite/sc598-som-ezlite.env index 7b13d6fc32b..d5364df1613 100644 --- a/board/adi/sc598-som-ezlite/sc598-som-ezlite.env +++ b/board/adi/sc598-som-ezlite/sc598-som-ezlite.env @@ -3,7 +3,7 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ -adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET +adi_image_offset=0x100000 loadaddr=CONFIG_SC5XX_LOADADDR #include <env/adi/adi_boot.env> diff --git a/configs/sc573-ezkit_defconfig b/configs/sc573-ezkit_defconfig index 7a0c7d04e84..4320c73fd39 100644 --- a/configs/sc573-ezkit_defconfig +++ b/configs/sc573-ezkit_defconfig @@ -6,7 +6,6 @@ CONFIG_SPL_GPIO=y CONFIG_DM_GPIO=y CONFIG_SPL_SYS_MALLOC_F_LEN=0x10000 CONFIG_SPL_SERIAL=y -CONFIG_SC5XX_FITIMAGE_OFFSET=0xE0000 CONFIG_SC5XX_LOADADDR=0x83000000 CONFIG_WATCHDOG_TIMEOUT_MSECS=60000 CONFIG_CGU0_CLKOUTSEL=7 diff --git a/configs/sc584-ezkit_defconfig b/configs/sc584-ezkit_defconfig index 7975a610ca3..52ab7c9337b 100644 --- a/configs/sc584-ezkit_defconfig +++ b/configs/sc584-ezkit_defconfig @@ -10,7 +10,6 @@ CONFIG_SPL_STACK=0x200C0000 CONFIG_SPL_BSS_START_ADDR=0x200A0000 CONFIG_SPL_BSS_MAX_SIZE=0x8000 CONFIG_SC58X=y -CONFIG_SC5XX_FITIMAGE_OFFSET=0xE0000 CONFIG_SC5XX_LOADADDR=0x89300000 CONFIG_WATCHDOG_TIMEOUT_MSECS=60000 CONFIG_ADI_BUG_EZKHW21=y diff --git a/configs/sc589-ezkit_defconfig b/configs/sc589-ezkit_defconfig index 0ceb57f1f42..a249fe8df7b 100644 --- a/configs/sc589-ezkit_defconfig +++ b/configs/sc589-ezkit_defconfig @@ -13,7 +13,6 @@ CONFIG_SPL_BSS_START_ADDR=0x200A0000 CONFIG_SPL_BSS_MAX_SIZE=0x8000 CONFIG_SC58X=y CONFIG_TARGET_SC589_EZKIT=y -CONFIG_SC5XX_FITIMAGE_OFFSET=0xE0000 CONFIG_SC5XX_LOADADDR=0xC3000000 CONFIG_WATCHDOG_TIMEOUT_MSECS=60000 CONFIG_ADI_USE_DMC1=y diff --git a/configs/sc589-mini_defconfig b/configs/sc589-mini_defconfig index 32678b63a9f..25285695367 100644 --- a/configs/sc589-mini_defconfig +++ b/configs/sc589-mini_defconfig @@ -12,7 +12,6 @@ CONFIG_SPL_BSS_START_ADDR=0x200A0000 CONFIG_SPL_BSS_MAX_SIZE=0x8000 CONFIG_SC58X=y CONFIG_TARGET_SC589_MINI=y -CONFIG_SC5XX_FITIMAGE_OFFSET=0xE0000 CONFIG_SC5XX_LOADADDR=0xC3000000 CONFIG_WATCHDOG_TIMEOUT_MSECS=60000 CONFIG_ADI_USE_DMC1=y diff --git a/include/env/adi/adi_boot.env b/include/env/adi/adi_boot.env index 42f33ed83af..b4b725247f7 100644 --- a/include/env/adi/adi_boot.env +++ b/include/env/adi/adi_boot.env @@ -39,23 +39,27 @@ nfsboot=run init_ethernet; #endif #if defined(USE_MMC) -mmcargs=setenv bootargs root=/dev/mmcblk0p1 rw rootfstype=ext4 rootwait ${adi_bootargs} +mmcargs=setenv bootargs root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait ${adi_bootargs} mmcboot=mmc rescan; - ext4load mmc 0:1 ${loadaddr} /boot/${imagefile}; + ext4load mmc 0:1 ${loadaddr} /fitImage; run mmcargs; bootm ${loadaddr} #endif -#if defined(USE_SPI) || defined(USE_OSPI) -spiargs=setenv bootargs root=/dev/mtdblock4 rw rootfstype=jffs2 ${adi_bootargs} +#if defined(USE_SPI) +spiargs=setenv bootargs root=/dev/mtdblock4 rw rootfstype=jffs2 ${adi_bootargs}; setenv sfdev CONFIG_SC_BOOT_SPI_BUS:CONFIG_SC_BOOT_SPI_SSEL spiboot=run spiargs; sf probe ${sfdev}; - sf read ${loadaddr} ${adi_image_offset} ${imagesize}; + sf read ${loadaddr} ${adi_image_offset} 0xf00000; bootm ${loadaddr} #endif #if defined(USE_OSPI) -ospiboot=run spiboot +ospiargs=setenv bootargs root=/dev/mtdblock4 rw rootfstype=jffs2 ${adi_bootargs}; setenv sfdev CONFIG_SC_BOOT_OSPI_BUS:CONFIG_SC_BOOT_OSPI_SSEL +ospiboot=run ospiargs; + sf probe ${sfdev}; + sf read ${loadaddr} ${adi_image_offset} 0xf00000; + bootm ${loadaddr} #endif #if defined(USE_RAM) -- 2.34.1
