From: Philipp Tomsich Date: Fri, 24 Nov 2017 13:44:59 +0000 (+0100) Subject: rockchip: defconfig: puma-rk3399: bypass ADC-based boot_mode check X-Git-Tag: v2018.01-rc1~67^2 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e5ee24dda20af5dc87971b497268f9fb1c83027e;p=u-boot rockchip: defconfig: puma-rk3399: bypass ADC-based boot_mode check 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 --- diff --git a/configs/puma-rk3399_defconfig b/configs/puma-rk3399_defconfig index 4591cc2c6b..18705ed534 100644 --- a/configs/puma-rk3399_defconfig +++ b/configs/puma-rk3399_defconfig @@ -6,6 +6,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_ROCKCHIP_RK3399=y CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0 +CONFIG_ROCKCHIP_BOOT_MODE_REG=0x0 CONFIG_TARGET_PUMA_RK3399=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y