Hi Johan, On 8/13/2026 10:59 PM, Johan Jonker wrote: > Add a back to ROM section to rockchip.rst > Correct Kconfig text. > > Signed-off-by: Johan Jonker <[email protected]> > --- > arch/arm/mach-rockchip/Kconfig | 16 ++++++++-------- > doc/board/rockchip/rockchip.rst | 7 +++++++ > 2 files changed, 15 insertions(+), 8 deletions(-) > > diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig > index 1a2e7847c9e7..cb5983623bdc 100644 > --- a/arch/arm/mach-rockchip/Kconfig > +++ b/arch/arm/mach-rockchip/Kconfig > @@ -600,26 +600,26 @@ config ROCKCHIP_USB_UART > SoCs will enable this routing as a debug measure. > > config SPL_ROCKCHIP_BACK_TO_BROM > - bool "SPL returns to bootrom" > + bool "SPL returns to boot ROM" > default y if ROCKCHIP_RK3036 > select ROCKCHIP_BROM_HELPER > select SPL_BOOTROM_SUPPORT > depends on SPL > help > - Rockchip SoCs have ability to load SPL & U-Boot binary. If enabled, > - SPL will return to the boot rom, which will then load the U-Boot > - binary to keep going on. > + Some Rockchip SoCs have the ability to load a second loader binary > + after the SPL phase. If enabled, SPL will return to the boot ROM, > + which will then load and execute the U-Boot binary.
What RK SoC does not support Back to BootROM mode? To my knowledge most, if not all, RK targets use this mode during boot. E.g. this is used on all rk32xx and newer SoCs. And for older SoCs that may not have this built into BootROM they miniloader provide similar function on legacy RK SoCs. If you feel this text need to change, please be accurate and mention what legacy SoC do not support returning to BootROM (or miniloader) to load next image, as most (or all) of them do. > > config TPL_ROCKCHIP_BACK_TO_BROM > - bool "TPL returns to bootrom" > + bool "TPL returns to boot ROM" > default y > select ROCKCHIP_BROM_HELPER if !ROCKCHIP_RK3066 > select TPL_BOOTROM_SUPPORT > depends on TPL > help > - Rockchip SoCs have ability to load SPL & U-Boot binary. If enabled, > - SPL will return to the boot rom, which will then load the U-Boot > - binary to keep going on. > + Some Rockchip SoCs have the ability to load a second loader binary > + after the TPL phase. If enabled, TPL will return to the boot ROM, > + which will then load and execute a SPL binary. > > config ROCKCHIP_COMMON_BOARD > bool "Rockchip common board file" > diff --git a/doc/board/rockchip/rockchip.rst b/doc/board/rockchip/rockchip.rst > index 5e16e860bfd5..7f6570f95cf4 100644 > --- a/doc/board/rockchip/rockchip.rst > +++ b/doc/board/rockchip/rockchip.rst > @@ -218,6 +218,13 @@ For SoCs whose TF-A code is not available as open > source, use BL31 binary provid > > git clone --depth 1 https://github.com/rockchip-linux/rkbin > > +Back to ROM Should be "Back to BootROM". Side note, please name it BootROM or bootrom or BROM for short, not "boot ROM". Similar for "maskrom", it should be maskrom mode, not "mask ROM". A small glossary: BootROM: code/software part of the SoC, first code that runs when SoC is powered up BROM: short form of BootROM maskrom mode: the mode that BootROM will fallback into if no other boot option is found, listens for 471/472 usb ctrl commands maskrom: short form of "maskrom mode" loader mode: a possible second stage after "maskrom mode" after a loader blob has been loaded, listens for rockusb usb commands rockusb: rockchip usb protocol used in "loader mode" Regrads, Jonas > +^^^^^^^^^^^ > + > +Some Rockchip SoCs have the ability to load a second loader binary. > +If enabled, the TPL/SPL code will return to the boot ROM, which will then > +load and execute a SPL or U-Boot binary. > + > TPL > ^^^ >
