From 747423edb64907616669423b482da60412f40e86 Mon Sep 17 00:00:00 2001 From: Jason Zhu Date: Tue, 2 Jun 2020 18:06:39 +0800 Subject: [PATCH] rockchip: spl: bring up to kernel when CONFIG_ROCKCHIP_BOOT_MODE_REG is 0 Signed-off-by: Jason Zhu Change-Id: I3f576fa0527a42ebede6ec252586cf681974fa97 --- arch/arm/include/asm/arch-rockchip/boot_mode.h | 2 ++ arch/arm/mach-rockchip/spl.c | 1 + 2 files changed, 3 insertions(+) diff --git a/arch/arm/include/asm/arch-rockchip/boot_mode.h b/arch/arm/include/asm/arch-rockchip/boot_mode.h index f6b5835bb0..806a21d2c7 100644 --- a/arch/arm/include/asm/arch-rockchip/boot_mode.h +++ b/arch/arm/include/asm/arch-rockchip/boot_mode.h @@ -3,6 +3,8 @@ /* high 24 bits is tag, low 8 bits is type */ #define REBOOT_FLAG 0x5242C300 +/* cold boot */ +#define BOOT_COLD 0 /* normal boot */ #define BOOT_NORMAL (REBOOT_FLAG + 0) /* enter loader rockusb mode */ diff --git a/arch/arm/mach-rockchip/spl.c b/arch/arm/mach-rockchip/spl.c index ff9a2d8286..abe9588059 100644 --- a/arch/arm/mach-rockchip/spl.c +++ b/arch/arm/mach-rockchip/spl.c @@ -284,6 +284,7 @@ void spl_next_stage(struct spl_image_info *spl) reg_boot_mode = readl((void *)CONFIG_ROCKCHIP_BOOT_MODE_REG); switch (reg_boot_mode) { + case BOOT_COLD: case BOOT_PANIC: case BOOT_WATCHDOG: case BOOT_NORMAL: