Skip to content

arm: sc5xx: Remove kernel_addr_r from bootm commands#87

Open
CalebEthridgeADI wants to merge 8 commits intoadi-u-boot-2025.10.yfrom
remove-redundant-kernel-addr-r
Open

arm: sc5xx: Remove kernel_addr_r from bootm commands#87
CalebEthridgeADI wants to merge 8 commits intoadi-u-boot-2025.10.yfrom
remove-redundant-kernel-addr-r

Conversation

@CalebEthridgeADI
Copy link
Copy Markdown

bootm defaults to using loadaddr and implies the loading of a fit image, so using kernel_addr_r is both redundant and not reflective of the actual image being loaded.

Requested by Greg on the mailing list here: https://lore.kernel.org/u-boot/CABdDSeXQz2TXpjahEXpe5JqT=K5Tbh4N6oEAcVknkG_T5_YHRg@mail.gmail.com/

@CalebEthridgeADI CalebEthridgeADI requested review from a team, ozan956 and pamolloy April 6, 2026 19:24
Comment thread include/env/adi/adi_boot.env Outdated
Comment thread include/env/adi/adi_boot.env Outdated
@CalebEthridgeADI CalebEthridgeADI force-pushed the remove-redundant-kernel-addr-r branch from 55ccc02 to b9c2e6c Compare April 7, 2026 13:20
@pamolloy
Copy link
Copy Markdown
Collaborator

pamolloy commented Apr 7, 2026

Sorry, I haven't had a chance to keep up, but we should have loadaddr, kernel_addr_r and fdt_addr_r (for booti and bootm) always defined for all boards. Standard variables like those don't need to be documented with comments. And please revert commits and apply the the latest upstream commits

@CalebEthridgeADI CalebEthridgeADI force-pushed the remove-redundant-kernel-addr-r branch 2 times, most recently from 2b597d8 to a106c29 Compare April 7, 2026 16:25
@CalebEthridgeADI
Copy link
Copy Markdown
Author

As mentioned above, I have added the fdt_addr_r and initrd_addr variables to the environment for each board for future use with booti. The addresses currently match the ones in Yocto that are used with the fitImage, so whether you use booti with these variables or bootm with the Yocto fitImage the addresses are the same.

@CalebEthridgeADI CalebEthridgeADI requested a review from ozan956 April 7, 2026 16:27
@CalebEthridgeADI
Copy link
Copy Markdown
Author

Lore links for the patches, will update commits with the Reviewed by once Greg runs it through his CI and signs off on the mailing list.
https://lore.kernel.org/u-boot/758243098fff1c2fc1b486dbb590922a822a4167.1775829166.git.jcethrid@gmail.com/
https://lore.kernel.org/u-boot/bf1821a5b0f561df15ab1fd1d7783bb3184d3db9.1775829166.git.jcethrid@gmail.com/

@CalebEthridgeADI CalebEthridgeADI force-pushed the remove-redundant-kernel-addr-r branch from a106c29 to f940d22 Compare April 21, 2026 13:25
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.

The default port is set to 8000 instead of the usual 80
to allow for use with an unprivileged web server.

Signed-off-by: Caleb Ethridge <caleb.ethridge@analog.com>
@CalebEthridgeADI CalebEthridgeADI force-pushed the remove-redundant-kernel-addr-r branch 2 times, most recently from b3922d9 to 8ba686e Compare April 23, 2026 12:45
Add the USB boot command to the environments
of the boards that support it.

Signed-off-by: Caleb Ethridge <caleb.ethridge@analog.com>
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 <ozan.durgut@analog.com>
Signed-off-by: Caleb Ethridge <caleb.ethridge@analog.com>
Add fdt_addr_r, kernel_addr_r, and ramdisk_addr_r to the SC5xx boards.
These variables are currently unused in the environment but will be
used in the future once support for booti commands is added to the
SC5xx boards.

Signed-off-by: Caleb Ethridge <caleb.ethridge@analog.com>
Remove SC5XX_UBOOT_SPL_OFFSET, SC5XX_UBOOT_OFFSET, SC5XX_FITIMAGE_OFFSET
and SC5XX_ROOTFS_OFFSET as they are no longer needed in the Kconfig.

Signed-off-by: Caleb Ethridge <caleb.ethridge@analog.com>
@CalebEthridgeADI CalebEthridgeADI force-pushed the remove-redundant-kernel-addr-r branch from 8ba686e to 9fa9f3d Compare April 23, 2026 13:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants