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

rockchip: boot-mode: reinitialize static variable "boot_mode" 

Special handle:
   Once the BCB offset changes, reinitialize "boot_mode".

Background:
   1. there are two Android BCB at the 0x00 and 0x20 offset in
      misc.img to compatible legacy(0x20) SDK.
   2. android_bcb_msg_sector_offset() is for android image:
      return 0x20 if image version < 10, otherwise 0x00.
   3. If not android image, BCB at 0x20 is the valid one.

U-Boot can support booting both FIT & Android image, if FIT
boot flow enters here early than Android, the "boot_mode" is
set as BOOT_MODE_RECOVERY according to BCB at 0x20 offset.
After that, this function always return static variable "boot_mode"
as BOOT_MODE_RECOVERY even android(>=10) boot flow enter here.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I0ed05ba1b18447a58d3faff37ac50ecc79fab374
This commit is contained in:
Joseph Chen 2020-11-09 17:14:16 +08:00
parent bec557fbbd
commit 3aaa96e8af
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
arch/arm/mach-rockchip/boot_mode.c
View File

@ -37,13 +37,35 @@ int rockchip_get_boot_mode(void)
uint32_t reg_boot_mode; uint32_t reg_boot_mode;
char *env_reboot_mode; char *env_reboot_mode;
static int boot_mode = -1; /* static */ static int boot_mode = -1; /* static */
static int bcb_offset = -1; /* static */
int clear_boot_reg = 0; int clear_boot_reg = 0;
int ret, cnt; int ret, cnt;
#ifdef CONFIG_ANDROID_BOOT_IMAGE #ifdef CONFIG_ANDROID_BOOT_IMAGE
u32 bcb_offset = android_bcb_msg_sector_offset(); u32 offset = android_bcb_msg_sector_offset();
#else #else
u32 bcb_offset = BCB_MESSAGE_BLK_OFFSET; u32 offset = BCB_MESSAGE_BLK_OFFSET;
#endif #endif
/*
* Special handle:
* Once the BCB offset changes, reinitalize "boot_mode".
*
* Background:
* 1. there are two Android BCB at the 0x00 and 0x20 offset in
* misc.img to compatible legacy(0x20) SDK.
* 2. android_bcb_msg_sector_offset() is for android image:
* return 0x20 if image version < 10, otherwise 0x00.
* 3. If not android image, BCB at 0x20 is the valid one.
*
* U-Boot can support booting both FIT & Android image, if FIT
* boot flow enters here early than Android, the "boot_mode" is
* set as BOOT_MODE_RECOVERY according to BCB at 0x20 offset.
* After that, this function always return static variable "boot_mode"
* as BOOT_MODE_RECOVERY even android(>=10) boot flow enter here.
*/
if (bcb_offset != offset) {
boot_mode = -1;
bcb_offset = offset;
}
/* /*
* Here, we mainly check for: * Here, we mainly check for: