qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

common: rkimg: clear boot mode register when its value is not reboot reason 

It's not safe to drop clear operation, example: using "reboot fastboot" from
kernel to enter U-Boot fastboot mode and finally reset system by fastboot
command "fastboot reboot", the system reboot and enter U-Boot fastboot mode
again but not boot to kernel.

Take back the clear operation which was dropped on:
(9d2bc40 boot_rkimg: don't override BOOT_MODE_REG)

Change-Id: I5e17e19e53700ec5244660122d837efc9cd30d4f
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
This commit is contained in:
Joseph Chen 2019-06-27 20:28:20 +08:00 committed by Jianhong Chen
parent 791112ddc0
commit 0bc1964007
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
common/boot_rkimg.c
View File

@ -393,6 +393,7 @@ int rockchip_get_boot_mode(void)
int ret;
uint32_t reg_boot_mode;
char *env_reboot_mode;
int clear_boot_reg = 0;
/*
* Here, we mainly check for:
@ -446,29 +447,44 @@ fallback:
if (reg_boot_mode == BOOT_LOADER) {
printf("boot mode: loader\n");
boot_mode = BOOT_MODE_LOADER;
clear_boot_reg = 1;
} else if (reg_boot_mode == BOOT_FASTBOOT) {
printf("boot mode: bootloader\n");
boot_mode = BOOT_MODE_BOOTLOADER;
clear_boot_reg = 1;
} else if (bmsg && !strcmp(bmsg->command, "boot-recovery")) {
printf("boot mode: recovery\n");
boot_mode = BOOT_MODE_RECOVERY;
clear_boot_reg = 1;
} else {
switch (reg_boot_mode) {
case BOOT_NORMAL:
printf("boot mode: normal\n");
boot_mode = BOOT_MODE_NORMAL;
clear_boot_reg = 1;
break;
case BOOT_RECOVERY:
/* printf("boot mode: recovery\n"); */
boot_mode = BOOT_MODE_RECOVERY;
clear_boot_reg = 1;
break;
case BOOT_UMS:
printf("boot mode: ums\n");
boot_mode = BOOT_MODE_UMS;
clear_boot_reg = 1;
break;
case BOOT_CHARGING:
printf("boot mode: charging\n");
boot_mode = BOOT_MODE_CHARGING;
clear_boot_reg = 1;
break;
case BOOT_PANIC:
printf("boot mode: panic\n");
boot_mode = BOOT_MODE_PANIC;
break;
case BOOT_WATCHDOG:
printf("boot mode: watchdog\n");
boot_mode = BOOT_MODE_WATCHDOG;
break;
default:
printf("boot mode: None\n");
@ -476,6 +492,13 @@ fallback:
}
}
/*
* We don't clear boot mode reg when its value stands for the reboot
* reason or others(in the future), the kernel will need and clear it.
*/
if (clear_boot_reg)
writel(BOOT_NORMAL, (void *)CONFIG_ROCKCHIP_BOOT_MODE_REG);
return boot_mode;
}

2
include/boot_rkimg.h
View File

@ -16,6 +16,8 @@ enum _boot_mode {
BOOT_MODE_CHARGING,
BOOT_MODE_UMS,
BOOT_MODE_BROM_DOWNLOAD,
BOOT_MODE_PANIC,
BOOT_MODE_WATCHDOG,
BOOT_MODE_UNDEFINE,
};