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

common: android: fix compile error if only enable ab system 

error: ‘reset_cpu_if_android_ab’ defined but not used
[-Werror=unused-function]

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I724ea99df27f9f572aa0913491eddb2b5e248e38
This commit is contained in:
Jason Zhu 2020-04-26 11:05:56 +08:00 committed by Jianhong Chen
parent 4736384cd0
commit f141910278
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
common/android_bootloader.c
View File

@ -122,18 +122,6 @@ static int get_partition_unique_uuid(char *partition,
return 0;
}
static void reset_cpu_if_android_ab(void)
{
printf("Reset in AB system.\n");
flushc();
/*
* Since we use the retry-count in ab system, then can
* try reboot if verify fail until the retry-count is
* equal to zero.
*/
reset_cpu(0);
}
static void update_root_uuid_if_android_ab(void)
{
/*
@ -226,11 +214,26 @@ static int decrease_tries_if_android_ab(char *slot_suffix)
return 0;
}
#else
static inline void reset_cpu_if_android_ab(void) {}
static inline void update_root_uuid_if_android_ab(void) {}
static inline int decrease_tries_if_android_ab(char *slot_suffix) { return 0; }
#endif
#if defined(CONFIG_ANDROID_AB) && defined(CONFIG_ANDROID_AVB)
static void reset_cpu_if_android_ab(void)
{
printf("Reset in AB system.\n");
flushc();
/*
* Since we use the retry-count in ab system, then can
* try reboot if verify fail until the retry-count is
* equal to zero.
*/
reset_cpu(0);
}
#else
static inline void reset_cpu_if_android_ab(void) {}
#endif
int android_bootloader_message_load(
struct blk_desc *dev_desc,
const disk_partition_t *part_info,