armbian/linux
0
0
Fork 0
mirror of https://github.com/armbian/linux.git synced 2026-01-06 10:13:00 -08:00
Code Issues Packages Projects Releases Wiki Activity

rk30: add boot mode support

Browse Source
This commit is contained in:
黄涛
2012-03-30 14:34:57 +08:00
parent 9ea4a68985
commit fa14e144f5
2 changed files with 37 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
arch/arm/mach-rk30/common.c
View File

@@ -12,6 +12,8 @@
#include <mach/gpio.h>
#include <mach/iomux.h>
#include <mach/fiq.h>
#include <mach/pmu.h>
#include <mach/loader.h>
static void __init rk30_cpu_axi_init(void)
{
@@ -71,6 +73,26 @@ static void __init rk30_l2_cache_init(void)
#endif
}
static int boot_mode;
static void __init rk30_boot_mode_init(void)
{
u32 boot_flag = readl_relaxed(RK30_PMU_BASE + PMU_SYS_REG0);
u32 boot_mode = readl_relaxed(RK30_PMU_BASE + PMU_SYS_REG1);
if (boot_flag == (SYS_KERNRL_REBOOT_FLAG | BOOT_RECOVER)) {
boot_mode = BOOT_MODE_RECOVERY;
} else if (strstr(boot_command_line, "(parameter)")) {
boot_mode = BOOT_MODE_RECOVERY;
}
if (boot_mode || boot_flag)
printk("Boot mode: %d flag: 0x%08x\n", boot_mode, boot_flag);
}
int board_boot_mode(void)
{
return boot_mode;
}
EXPORT_SYMBOL(board_boot_mode);
void __init rk30_init_irq(void)
{
@@ -90,6 +112,7 @@ void __init rk30_map_io(void)
board_clock_init();
rk30_l2_cache_init();
rk30_iomux_init();
rk30_boot_mode_init();
}
void __init rk30_fixup(struct machine_desc *desc, struct tag *tags,

19
arch/arm/mach-rk30/reset.c
View File

@@ -5,18 +5,27 @@
#include <mach/cru.h>
#include <mach/iomux.h>
#include <mach/loader.h>
#include <mach/board.h>
#include <mach/pmu.h>
static void rk30_arch_reset(char mode, const char *cmd)
{
unsigned int reason = 0;
u32 boot_flag = 0;
u32 boot_mode = BOOT_MODE_REBOOT;
if(cmd) {
if (cmd) {
if (!strcmp(cmd, "loader") || !strcmp(cmd, "bootloader"))
reason = SYS_LOADER_REBOOT_FLAG + BOOT_LOADER;
boot_flag = SYS_LOADER_REBOOT_FLAG + BOOT_LOADER;
else if(!strcmp(cmd, "recovery"))
reason = SYS_LOADER_REBOOT_FLAG + BOOT_RECOVER;
boot_flag = SYS_LOADER_REBOOT_FLAG + BOOT_RECOVER;
else if (!strcmp(cmd, "charge"))
boot_mode = BOOT_MODE_CHARGE;
} else {
if (system_state != SYSTEM_RESTART)
boot_mode = BOOT_MODE_PANIC;
}
writel_relaxed(reason, RK30_PMU_PHYS + 0x40); //PMU_OS_REG0
writel_relaxed(boot_flag, RK30_PMU_BASE + PMU_SYS_REG0); // for loader
writel_relaxed(boot_mode, RK30_PMU_BASE + PMU_SYS_REG1); // for linux
dsb();
/* disable remap */
writel_relaxed(1 << (12 + 16), RK30_GRF_BASE + GRF_SOC_CON0);