Skip to content

arm: sc5xx: Remove kernel_addr_r from bootm commands #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CalebEthridgeADI wants to merge 8 commits into
base: adi-u-boot-2025.10.y
Choose a base branch
from
Open

arm: sc5xx: Remove kernel_addr_r from bootm commands #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6ae6235
Revert "arm: sc5xx: remove LOADADDR and use kernel_addr_r"
CalebEthridgeADI Apr 7, 2026
de56900
Revert "mach-sc5xx: Switch from tftp to wget"
CalebEthridgeADI Apr 21, 2026
c2b5e75
Revert "mach-sc5xx: Add USB boot command"
CalebEthridgeADI Apr 21, 2026
67db65e
mach-sc5xx: Switch from tftp to wget
CalebEthridgeADI Apr 21, 2026
c09d161
mach-sc5xx: Add USB boot command
CalebEthridgeADI Apr 23, 2026
2c2045f
arm: sc5xx: Remove SC5XX_LOADADDR
CalebEthridgeADI Apr 7, 2026
d7f5200
arm: sc5xx: Add fdt_addr_r, kernel_addr_r, and ramdisk_addr_r
CalebEthridgeADI Apr 7, 2026
9fa9f3d
mach-sc5xx: Remove unused image offset Kconfig options
CalebEthridgeADI Apr 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 0 additions & 24 deletions arch/arm/mach-sc5xx/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# SPDX-License-Identifier: GPL-2.0-or-later
#
# (C) Copyright 2022 - Analog Devices, Inc.
Expand Down Expand Up @@ -116,30 +116,6 @@

endif

config SC5XX_UBOOT_SPL_OFFSET
hex "SPL offset"
default 0x0
help
The default offset where the SPL is located.

config SC5XX_UBOOT_OFFSET
hex "U-Boot offset"
default 0x40000
help
The default offset where u-boot is located.

config SC5XX_FITIMAGE_OFFSET
hex "FitImage offset"
default 0x1a0000
help
The default offset where the fitImage is located.

config SC5XX_ROOTFS_OFFSET
hex "RootFS offset"
default 0x102000
help
The default offset where the rootfs is located.

config ADI_IMAGE
string "ADI fitImage type"
help
Expand Down
4 changes: 4 additions & 0 deletions board/adi/sc573-ezlite/sc573-ezlite.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
/* SPDX-License-Identifier: GPL-2.0-or-later+ */

/*
* (C) Copyright 2024 - Analog Devices, Inc.
*/

fdt_addr_r=CONFIG_SYS_LOAD_ADDR
kernel_addr_r=0x84008000
ramdisk_addr_r=0x85000000

#define USE_NFS
#define USE_SPI
#define USE_RAM
Expand Down
5 changes: 5 additions & 0 deletions board/adi/sc584-ezkit/sc584-ezkit.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,13 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/

fdt_addr_r=CONFIG_SYS_LOAD_ADDR
kernel_addr_r=0x8A308000
ramdisk_addr_r=0x8A800000

#define USE_NFS
#define USE_SPI
#define USE_RAM
#define USE_USB

#include <env/adi/adi_boot.env>
4 changes: 4 additions & 0 deletions board/adi/sc589-ezkit/sc589-ezkit.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/

fdt_addr_r=CONFIG_SYS_LOAD_ADDR
kernel_addr_r=0xC4008000
ramdisk_addr_r=0xC5000000

#define USE_NFS
#define USE_RAM
#define USE_MMC
Expand Down
4 changes: 4 additions & 0 deletions board/adi/sc589-mini/sc589-mini.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/

fdt_addr_r=CONFIG_SYS_LOAD_ADDR
kernel_addr_r=0xC4008000
ramdisk_addr_r=0xC5000000

#define USE_NFS
#define USE_RAM
#define USE_SPI
Expand Down
4 changes: 4 additions & 0 deletions board/adi/sc594-som-ezkit/sc594-som-ezkit.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/

fdt_addr_r=CONFIG_SYS_LOAD_ADDR
kernel_addr_r=0xA3008000
ramdisk_addr_r=0xA8000000

#define USE_NFS
#define USE_SPI
#define USE_OSPI
Expand Down
5 changes: 5 additions & 0 deletions board/adi/sc594-som-ezlite/sc594-som-ezlite.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,15 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/

fdt_addr_r=CONFIG_SYS_LOAD_ADDR
kernel_addr_r=0xA3008000
ramdisk_addr_r=0xA8000000

#define USE_NFS
#define USE_SPI
#define USE_OSPI
#define USE_RAM
#define USE_MMC
#define USE_USB

#include <env/adi/adi_boot.env>
4 changes: 4 additions & 0 deletions board/adi/sc598-som-ezkit/sc598-som-ezkit.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/

fdt_addr_r=CONFIG_SYS_LOAD_ADDR
kernel_addr_r=0x9a200000
ramdisk_addr_r=0x9c000000

#define USE_NFS
#define USE_SPI
#define USE_OSPI
Expand Down
4 changes: 4 additions & 0 deletions board/adi/sc598-som-ezlite/sc598-som-ezlite.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/

fdt_addr_r=CONFIG_SYS_LOAD_ADDR
kernel_addr_r=0x9a200000
ramdisk_addr_r=0x9c000000

#define USE_NFS
#define USE_SPI
#define USE_RAM
Expand Down
20 changes: 6 additions & 14 deletions include/env/adi/adi_boot.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,10 @@
/*
* 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
* - kernel_addr_r, where you want to load things
*/

#ifdef CONFIG_SC59X_64
#define EARLY_PRINTK earlycon=adi_uart,0x31003000
#else
#define EARLY_PRINTK earlyprintk=serial,uart0,CONFIG_BAUDRATE
#endif

/* Config options */
kernel_addr_r=CONFIG_SYS_LOAD_ADDR
ethaddr=02:80:ad:20:31:e8
eth1addr=02:80:ad:20:31:e9
httpdstp=8000
Expand Down Expand Up @@ -40,14 +32,14 @@
nfsargs=setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath},tcp,nfsvers=3 ${adi_bootargs}
nfsboot= run nfsargs;
run addip;
wget ${kernel_addr_r} ${serverip}:/fitImage;
wget ${loadaddr} ${serverip}:/fitImage;
bootm
#endif

#if defined(USE_MMC)
mmcargs=setenv bootargs root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait ${adi_bootargs}
mmcboot=mmc rescan;
ext4load mmc 0:1 ${kernel_addr_r} /fitImage;
ext4load mmc 0:1 ${loadaddr} /fitImage;
run mmcargs;
bootm
#endif
Expand All @@ -56,27 +48,27 @@
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 ${kernel_addr_r} ${adi_image_offset} 0xF00000;
sf read ${loadaddr} ${adi_image_offset} 0xF00000;
bootm
#endif

#if defined(USE_OSPI)
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 ${kernel_addr_r} ${adi_image_offset} 0xF00000;
sf read ${loadaddr} ${adi_image_offset} 0xF00000;
bootm
#endif

#if defined(USE_RAM)
ramboot= wget ${kernel_addr_r} ${serverip}:/fitImage;
ramboot= wget ${loadaddr} ${serverip}:/fitImage;
run ramargs;
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 ${kernel_addr_r} /fitImage; run usbargs;
ext4load usb 0:1 ${loadaddr} /fitImage; run usbargs;
bootm
#endif
Loading