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

spl: fit: support decreasing 1 if verify fail when enable a/b 

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I922b929ac37181f61e820b6c2b2de750e816a99d
This commit is contained in:
Jason Zhu 2021-01-04 15:40:54 +08:00
parent 093f4d990f
commit 1f5c7b6414
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/spl/spl_fit.c
View File

@ -9,9 +9,10 @@
#include <boot_rkimg.h> #include <boot_rkimg.h>
#include <errno.h> #include <errno.h>
#include <image.h> #include <image.h>
#include <spl.h>
#include <malloc.h> #include <malloc.h>
#include <mtd_blk.h> #include <mtd_blk.h>
#include <spl.h>
#include <spl_ab.h>
#include <linux/libfdt.h> #include <linux/libfdt.h>
#ifndef CONFIG_SYS_BOOTM_LEN #ifndef CONFIG_SYS_BOOTM_LEN
@ -790,10 +791,19 @@ int spl_load_simple_fit(struct spl_image_info *spl_image,
#ifdef CONFIG_SPL_KERNEL_BOOT #ifdef CONFIG_SPL_KERNEL_BOOT
ret = spl_load_kernel_fit(spl_image, info); ret = spl_load_kernel_fit(spl_image, info);
#endif #endif
return ret; break;
} }
} }
#ifdef CONFIG_SPL_AB
/*
* If boot fail in spl, spl must decrease 1. If boot
* successfully, it is no need to do that and U-boot will
* always to decrease 1. If in thunderboot process,
* always need to decrease 1.
*/
if (IS_ENABLED(CONFIG_SPL_KERNEL_BOOT) || ret)
spl_ab_decrease_tries(info->dev);
#endif
return ret; return ret;
} }