From: 黄涛 <huangtao@rock-chips.com>
Date: Fri, 10 Aug 2012 07:33:43 +0000 (+0800)
Subject: rk2928: support boot mode
X-Git-Tag: firefly_0821_release~8912^2~15
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d81f17d7a5be5063b27ea3079265ed68bdde64ad;p=firefly-linux-kernel-4.4.55.git

rk2928: support boot mode
---

diff --git a/arch/arm/mach-rk2928/common.c b/arch/arm/mach-rk2928/common.c
index 54a3c8da29d8..be088090cfd7 100644
--- a/arch/arm/mach-rk2928/common.c
+++ b/arch/arm/mach-rk2928/common.c
@@ -13,7 +13,7 @@
 #include <mach/gpio.h>
 #include <mach/iomux.h>
 #include <mach/fiq.h>
-//#include <mach/loader.h>
+#include <mach/loader.h>
 //#include <mach/ddr.h>
 
 static void __init rk2928_cpu_axi_init(void)
@@ -86,11 +86,14 @@ static void __init rk2928_l2_cache_init(void)
 static int boot_mode;
 static void __init rk2928_boot_mode_init(void)
 {
-	u32 boot_flag = 0;
-	boot_mode = readl_relaxed(RK2928_GRF_BASE + GRF_OS_REG1);
+	u32 boot_flag = (readl_relaxed(RK2928_GRF_BASE + GRF_OS_REG4) | (readl_relaxed(RK2928_GRF_BASE + GRF_OS_REG5) << 16)) - SYS_KERNRL_REBOOT_FLAG;
+	boot_mode = readl_relaxed(RK2928_GRF_BASE + GRF_OS_REG6);
 
+	if (boot_flag == BOOT_RECOVER) {
+		boot_mode = BOOT_MODE_RECOVERY;
+	}
 	if (boot_mode || boot_flag)
-		printk("Boot mode: %d flag: 0x%08x\n", boot_mode, boot_flag);
+		printk("Boot mode: %d flag: %d\n", boot_mode, boot_flag);
 }
 
 int board_boot_mode(void)