From: Caleb Ethridge Date: Thu, 21 May 2026 13:53:24 +0000 (-0400) Subject: arm: sc5xx: Remove SC5XX_LOADADDR X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=c6796425da45f63661459e31cb7809f517080417;p=thirdparty%2Fu-boot.git arm: sc5xx: Remove SC5XX_LOADADDR Remove the SC5XX_LOADADDR Kconfig option, replace its users with CONFIG_SYS_LOAD_ADDR, and update the ADI boot environment to use `loadaddr`. SC5XX_LOADADDR was an ADI-specific duplicate of standard U-Boot load address handling. U-Boot already uses CONFIG_SYS_LOAD_ADDR for the default load address and `loadaddr` for boot commands, so keeping separate SC5XX-specific names is redundant. Signed-off-by: Ozan Durgut Signed-off-by: Caleb Ethridge --- diff --git a/arch/arm/mach-sc5xx/Kconfig b/arch/arm/mach-sc5xx/Kconfig index e311a8adf9a..44402b2568d 100644 --- a/arch/arm/mach-sc5xx/Kconfig +++ b/arch/arm/mach-sc5xx/Kconfig @@ -140,12 +140,6 @@ config SC5XX_ROOTFS_OFFSET help The default offset where the rootfs is located. -config SC5XX_LOADADDR - hex "Load address" - default 0x90000000 - help - The default load address for u-boot. - config ADI_IMAGE string "ADI fitImage type" help diff --git a/board/adi/sc584-ezkit/sc584-ezkit.env b/board/adi/sc584-ezkit/sc584-ezkit.env index 905523fb151..0b8035ca6b1 100644 --- a/board/adi/sc584-ezkit/sc584-ezkit.env +++ b/board/adi/sc584-ezkit/sc584-ezkit.env @@ -3,9 +3,6 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ -adi_image_offset=0xd0000 -loadaddr=CONFIG_SC5XX_LOADADDR - #define USE_NFS #define USE_SPI #define USE_RAM diff --git a/board/adi/sc589-ezkit/sc589-ezkit.env b/board/adi/sc589-ezkit/sc589-ezkit.env index 02567830c16..00f90c7942e 100644 --- a/board/adi/sc589-ezkit/sc589-ezkit.env +++ b/board/adi/sc589-ezkit/sc589-ezkit.env @@ -3,9 +3,6 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ -adi_image_offset=0xd0000 -loadaddr=CONFIG_SC5XX_LOADADDR - #define USE_NFS #define USE_RAM #define USE_MMC diff --git a/board/adi/sc589-mini/sc589-mini.env b/board/adi/sc589-mini/sc589-mini.env index 661c130b835..13079ed7527 100644 --- a/board/adi/sc589-mini/sc589-mini.env +++ b/board/adi/sc589-mini/sc589-mini.env @@ -3,9 +3,6 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ -adi_image_offset=0xd0000 -loadaddr=CONFIG_SC5XX_LOADADDR - #define USE_NFS #define USE_RAM #define USE_SPI diff --git a/board/adi/sc594-som-ezkit/sc594-som-ezkit.env b/board/adi/sc594-som-ezkit/sc594-som-ezkit.env index f787d972339..324bfae4571 100644 --- a/board/adi/sc594-som-ezkit/sc594-som-ezkit.env +++ b/board/adi/sc594-som-ezkit/sc594-som-ezkit.env @@ -3,9 +3,6 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ -adi_image_offset=0x100000 -loadaddr=CONFIG_SC5XX_LOADADDR - #define USE_NFS #define USE_SPI #define USE_OSPI diff --git a/board/adi/sc594-som-ezlite/sc594-som-ezlite.env b/board/adi/sc594-som-ezlite/sc594-som-ezlite.env index f787d972339..324bfae4571 100644 --- a/board/adi/sc594-som-ezlite/sc594-som-ezlite.env +++ b/board/adi/sc594-som-ezlite/sc594-som-ezlite.env @@ -3,9 +3,6 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ -adi_image_offset=0x100000 -loadaddr=CONFIG_SC5XX_LOADADDR - #define USE_NFS #define USE_SPI #define USE_OSPI diff --git a/board/adi/sc598-som-ezkit/sc598-som-ezkit.env b/board/adi/sc598-som-ezkit/sc598-som-ezkit.env index f787d972339..324bfae4571 100644 --- a/board/adi/sc598-som-ezkit/sc598-som-ezkit.env +++ b/board/adi/sc598-som-ezkit/sc598-som-ezkit.env @@ -3,9 +3,6 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ -adi_image_offset=0x100000 -loadaddr=CONFIG_SC5XX_LOADADDR - #define USE_NFS #define USE_SPI #define USE_OSPI diff --git a/board/adi/sc598-som-ezlite/sc598-som-ezlite.env b/board/adi/sc598-som-ezlite/sc598-som-ezlite.env index d5364df1613..fbb0565dac4 100644 --- a/board/adi/sc598-som-ezlite/sc598-som-ezlite.env +++ b/board/adi/sc598-som-ezlite/sc598-som-ezlite.env @@ -3,7 +3,5 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ -adi_image_offset=0x100000 -loadaddr=CONFIG_SC5XX_LOADADDR #include diff --git a/configs/sc573-ezlite_defconfig b/configs/sc573-ezlite_defconfig index f6305451c27..cbf24234cc3 100644 --- a/configs/sc573-ezlite_defconfig +++ b/configs/sc573-ezlite_defconfig @@ -6,7 +6,7 @@ CONFIG_SPL_GPIO=y CONFIG_DM_GPIO=y CONFIG_SPL_SYS_MALLOC_F_LEN=0x10000 CONFIG_SPL_SERIAL=y -CONFIG_SC5XX_LOADADDR=0x83000000 +CONFIG_SYS_LOAD_ADDR=0x83000000 CONFIG_WATCHDOG_TIMEOUT_MSECS=60000 CONFIG_CGU0_CLKOUTSEL=7 # CONFIG_EFI_LOADER is not set diff --git a/configs/sc584-ezkit_defconfig b/configs/sc584-ezkit_defconfig index 52ab7c9337b..bb24b31b2c0 100644 --- a/configs/sc584-ezkit_defconfig +++ b/configs/sc584-ezkit_defconfig @@ -10,7 +10,7 @@ CONFIG_SPL_STACK=0x200C0000 CONFIG_SPL_BSS_START_ADDR=0x200A0000 CONFIG_SPL_BSS_MAX_SIZE=0x8000 CONFIG_SC58X=y -CONFIG_SC5XX_LOADADDR=0x89300000 +CONFIG_SYS_LOAD_ADDR=0x89300000 CONFIG_WATCHDOG_TIMEOUT_MSECS=60000 CONFIG_ADI_BUG_EZKHW21=y CONFIG_CGU0_CLKOUTSEL=7 diff --git a/configs/sc589-ezkit_defconfig b/configs/sc589-ezkit_defconfig index d8982f62d82..d3f0380bfed 100644 --- a/configs/sc589-ezkit_defconfig +++ b/configs/sc589-ezkit_defconfig @@ -13,7 +13,7 @@ CONFIG_SPL_BSS_START_ADDR=0x200A0000 CONFIG_SPL_BSS_MAX_SIZE=0x8000 CONFIG_SC58X=y CONFIG_TARGET_SC589_EZKIT=y -CONFIG_SC5XX_LOADADDR=0xC3000000 +CONFIG_SYS_LOAD_ADDR=0xC3000000 CONFIG_WATCHDOG_TIMEOUT_MSECS=60000 CONFIG_ADI_USE_DMC1=y CONFIG_CGU0_CLKOUTSEL=7 diff --git a/configs/sc589-mini_defconfig b/configs/sc589-mini_defconfig index 78b39b6dd73..1bdede4b739 100644 --- a/configs/sc589-mini_defconfig +++ b/configs/sc589-mini_defconfig @@ -12,7 +12,7 @@ CONFIG_SPL_BSS_START_ADDR=0x200A0000 CONFIG_SPL_BSS_MAX_SIZE=0x8000 CONFIG_SC58X=y CONFIG_TARGET_SC589_MINI=y -CONFIG_SC5XX_LOADADDR=0xC3000000 +CONFIG_SYS_LOAD_ADDR=0xC3000000 CONFIG_WATCHDOG_TIMEOUT_MSECS=60000 CONFIG_ADI_USE_DMC1=y # CONFIG_EFI_LOADER is not set diff --git a/configs/sc594-som-ezkit-spl_defconfig b/configs/sc594-som-ezkit-spl_defconfig index 23951d0b5f1..4f8be110ee4 100644 --- a/configs/sc594-som-ezkit-spl_defconfig +++ b/configs/sc594-som-ezkit-spl_defconfig @@ -10,6 +10,7 @@ CONFIG_SPL_SYS_MALLOC_F_LEN=0x10000 CONFIG_SPL_SERIAL=y CONFIG_SC59X=y CONFIG_TARGET_SC594_SOM_EZKIT=y +CONFIG_SYS_LOAD_ADDR=0xA2000000 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y @@ -74,4 +75,3 @@ CONFIG_SPL_TIMER=y CONFIG_USB=y CONFIG_USB_DWC2=y CONFIG_USB_STORAGE=y -CONFIG_SC5XX_LOADADDR=0xA2000000 diff --git a/configs/sc594-som-ezlite-spl_defconfig b/configs/sc594-som-ezlite-spl_defconfig index b4e71b5d2eb..c045c67569b 100644 --- a/configs/sc594-som-ezlite-spl_defconfig +++ b/configs/sc594-som-ezlite-spl_defconfig @@ -9,6 +9,7 @@ CONFIG_SPL_SYS_MALLOC_F_LEN=0x10000 CONFIG_SPL_SERIAL=y CONFIG_SPL_STACK=0x200E4000 CONFIG_SC59X=y +CONFIG_SYS_LOAD_ADDR=0xA2000000 CONFIG_CGU1_DIV_S1SELEX=16 CONFIG_CDU0_CLKO10=5 CONFIG_SF_DEFAULT_BUS=0 @@ -83,4 +84,3 @@ CONFIG_USB_DWC2=y CONFIG_USB_STORAGE=y # CONFIG_SPL_CRC8 is not set # CONFIG_TOOLS_MKEFICAPSULE is not set -CONFIG_SC5XX_LOADADDR=0xA2000000 diff --git a/configs/sc598-som-ezkit-spl_defconfig b/configs/sc598-som-ezkit-spl_defconfig index cd1bafd7486..e2fee0d0be8 100644 --- a/configs/sc598-som-ezkit-spl_defconfig +++ b/configs/sc598-som-ezkit-spl_defconfig @@ -11,6 +11,7 @@ CONFIG_SPL_SERIAL=y CONFIG_SC59X_64=y CONFIG_TARGET_SC598_SOM_EZKIT=y CONFIG_SYS_BOOTM_LEN=0x4000000 +CONFIG_SYS_LOAD_ADDR=0x90000000 CONFIG_CGU1_PLL3_DDRCLK=y CONFIG_CGU1_PLL3_VCO_MSEL=64 CONFIG_CGU1_PLL3_DCLK_DIV=2 @@ -107,4 +108,3 @@ CONFIG_USB_DWC2=y CONFIG_USB_STORAGE=y # CONFIG_SPL_CRC8 is not set # CONFIG_TOOLS_MKEFICAPSULE is not set -CONFIG_SC5XX_LOADADDR=0x90000000 diff --git a/configs/sc598-som-ezlite-spl_defconfig b/configs/sc598-som-ezlite-spl_defconfig index e4a975eedfc..9afe5c0789a 100644 --- a/configs/sc598-som-ezlite-spl_defconfig +++ b/configs/sc598-som-ezlite-spl_defconfig @@ -11,6 +11,7 @@ CONFIG_SPL_SERIAL=y CONFIG_SPL_STACK=0x200E4000 CONFIG_SC59X_64=y CONFIG_SYS_BOOTM_LEN=0x4000000 +CONFIG_SYS_LOAD_ADDR=0x90000000 CONFIG_CGU1_PLL3_DDRCLK=y CONFIG_CGU1_PLL3_VCO_MSEL=64 CONFIG_CGU1_PLL3_DCLK_DIV=2 @@ -105,4 +106,3 @@ CONFIG_USB_DWC2=y CONFIG_USB_STORAGE=y # CONFIG_SPL_CRC8 is not set # CONFIG_TOOLS_MKEFICAPSULE is not set -CONFIG_SC5XX_LOADADDR=0x90000000 diff --git a/include/env/adi/adi_boot.env b/include/env/adi/adi_boot.env index b75baabdca6..3c83826cf9a 100644 --- a/include/env/adi/adi_boot.env +++ b/include/env/adi/adi_boot.env @@ -1,10 +1,3 @@ -/* - * A target board needs to set these variables for the commands below to work: - * - * - adi_image_offset, location of the fitImage on the SPI flash - * - loadaddr, where you want to load things - */ - #ifdef CONFIG_SC59X_64 #define EARLY_PRINTK earlycon=adi_uart,0x31003000 #else @@ -21,6 +14,11 @@ initrd_high=0xffffffffffffffff #else initrd_high=0xffffffff #endif +#if defined(CONFIG_SC59X) || defined(CONFIG_SC59X_64) +adi_image_offset=0x100000 +#else +adi_image_offset=0xd0000 +#endif /* Args for each boot mode */ adi_bootargs=EARLY_PRINTK console=ttySC0,CONFIG_BAUDRATE vmalloc=512M @@ -35,7 +33,7 @@ nfsargs=setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath},tcp,nfs nfsboot=run nfsargs; run addip; wget ${loadaddr} ${serverip}:/fitImage; - bootm ${loadaddr} + bootm #endif #if defined(USE_MMC) @@ -43,7 +41,7 @@ mmcargs=setenv bootargs root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait ${adi_bo mmcboot=mmc rescan; ext4load mmc 0:1 ${loadaddr} /fitImage; run mmcargs; - bootm ${loadaddr} + bootm #endif #if defined(USE_SPI) @@ -65,7 +63,7 @@ ospiboot=run ospiargs; #if defined(USE_RAM) ramboot=wget ${loadaddr} ${serverip}:/fitImage; run ramargs; - bootm ${loadaddr} + bootm #endif #if defined(USE_USB)