diff mbox series

[U-Boot,2/2] rockchip: defconfig: puma-rk3399: bypass ADC-based boot_mode check

Message ID 1511531099-53117-2-git-send-email-philipp.tomsich@theobroma-systems.com
State Accepted
Delegated to: Philipp Tomsich
Headers show
Series [U-Boot,1/2] rockchip: fix turning off boot-mode via Kconfig | expand

Commit Message

Philipp Tomsich Nov. 24, 2017, 1:44 p.m. UTC
The boot (and fallback/emergency boot) concept for the RK3399-Q7
differs from Rockchip's reference platforms.

On the RK3399-Q7, some of this functionality is present in the
bootloader itself (and configurable); some is backed in hardware by
the Qseven BIOS_DISABLE signal to invoke the final stages of fallbacks
(i.e. either an external boot bypassing on-module memories or falling
back to the BROM for USB recovery).

In summary: the ADC-based boot_mode check does not apply for the
RK3399-Q7 and we therefore disable it (in this commit) by setting
CONFIG_BOOT_MODE_REG to 0.

Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
---

 configs/puma-rk3399_defconfig | 1 +
 1 file changed, 1 insertion(+)

Comments

Philipp Tomsich Nov. 25, 2017, 11:39 p.m. UTC | #1
> The boot (and fallback/emergency boot) concept for the RK3399-Q7
> differs from Rockchip's reference platforms.
> 
> On the RK3399-Q7, some of this functionality is present in the
> bootloader itself (and configurable); some is backed in hardware by
> the Qseven BIOS_DISABLE signal to invoke the final stages of fallbacks
> (i.e. either an external boot bypassing on-module memories or falling
> back to the BROM for USB recovery).
> 
> In summary: the ADC-based boot_mode check does not apply for the
> RK3399-Q7 and we therefore disable it (in this commit) by setting
> CONFIG_BOOT_MODE_REG to 0.
> 
> Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> ---
> 
>  configs/puma-rk3399_defconfig | 1 +
>  1 file changed, 1 insertion(+)
> 

Applied to u-boot-rockchip, thanks!
diff mbox series

Patch

diff --git a/configs/puma-rk3399_defconfig b/configs/puma-rk3399_defconfig
index ebbf8a9..6d2c615 100644
--- a/configs/puma-rk3399_defconfig
+++ b/configs/puma-rk3399_defconfig
@@ -5,6 +5,7 @@  CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SYS_MALLOC_F_LEN=0x4000
 CONFIG_ROCKCHIP_RK3399=y
+CONFIG_ROCKCHIP_BOOT_MODE_REG=0x0
 CONFIG_TARGET_PUMA_RK3399=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y