Add a back to ROM section to rockchip.rst
Correct Kconfig text.
Signed-off-by: Johan Jonker <[email protected]>
Reviewed-by: Simon Glass <[email protected]>
---
Changed V7:
Move under a 'Boot flow' heading
Remove "Some"
---
arch/arm/mach-rockchip/Kconfig | 16 ++++++++--------
doc/board/rockchip/rockchip.rst | 11 +++++++++++
2 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index 1a2e7847c9e7..c1dbcce1e27c 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.
+ 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.
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.
+ 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..d5945e805ba8 100644
--- a/doc/board/rockchip/rockchip.rst
+++ b/doc/board/rockchip/rockchip.rst
@@ -560,5 +560,16 @@ config-flash.ini:
PATH=RK30xxLoader_uboot.bin
+Boot flow
+---------
+
+Back to ROM
+^^^^^^^^^^^
+
+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.
+
+
.. Jagan Teki <[email protected]>
.. Wednesday 28 October 2020 06:47:26 PM IST
--
2.39.5
