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

spl: rkfw: support bring up different next stage 

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: Idfca034d4d3eb5a4f757678e62efd7765bf89840
This commit is contained in:
Jason Zhu 2020-03-12 19:14:07 +08:00 committed by Jianhong Chen
parent 6f35c03e4a
commit fcb65c6194
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
common/spl/spl_rkfw.c
View File

@ -7,6 +7,7 @@
#include <android_image.h>
#include <errno.h>
#include <malloc.h>
#include <spl.h>
#include <spl_rkfw.h>
#include <linux/kernel.h>
#include <asm/arch/spl_resource_img.h>
@ -362,20 +363,27 @@ int spl_load_rkfw_image(struct spl_image_info *spl_image,
printf("Load trust image failed! ret=%d\n", ret);
goto out;
}
ret = rkfw_load_uboot(info, uboot_sector,
&spl_image->entry_point_bl33, try_count);
if (ret)
printf("Load uboot image failed! ret=%d\n", ret);
else
goto boot;
ret = rkfw_load_kernel(info, boot_sector,
&spl_image->entry_point_bl33, try_count);
if (ret) {
printf("Load kernel image failed! ret=%d\n", ret);
goto out;
#ifdef CONFIG_SPL_KERNEL_BOOT
if (spl_image->next_stage == SPL_NEXT_STAGE_UBOOT) {
#endif
ret = rkfw_load_uboot(info, uboot_sector,
&spl_image->entry_point_bl33, try_count);
if (ret)
printf("Load uboot image failed! ret=%d\n", ret);
else
goto boot;
#ifdef CONFIG_SPL_KERNEL_BOOT
} else if (spl_image->next_stage == SPL_NEXT_STAGE_KERNEL) {
#endif
ret = rkfw_load_kernel(info, boot_sector,
&spl_image->entry_point_bl33, try_count);
if (ret) {
printf("Load kernel image failed! ret=%d\n", ret);
goto out;
}
#ifdef CONFIG_SPL_KERNEL_BOOT
}
#endif
boot:
#if CONFIG_IS_ENABLED(LOAD_FIT)