If SPL_LOAD_FIT_OPENSBI_OS_BOOT is enabled, the function spl_invoke_opensbi should change the target OS type to IH_OS_LINUX. OpenSBI will load the Linux image as the next boot stage. The os_takes_devicetree function returns a value of true or false depending on whether or not SPL_LOAD_FIT_OPENSBI_OS_BOOT is enabled.
Signed-off-by: Randolph randolph@andestech.com --- common/spl/spl_fit.c | 4 ++++ common/spl/spl_opensbi.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index 730639f756..750562721a 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -351,7 +351,11 @@ static bool os_takes_devicetree(uint8_t os) case IH_OS_U_BOOT: return true; case IH_OS_LINUX: +#ifdef CONFIG_RISCV + return IS_ENABLED(CONFIG_SPL_LOAD_FIT_OPENSBI_OS_BOOT); +#else return IS_ENABLED(CONFIG_SPL_OS_BOOT); +#endif default: return false; } diff --git a/common/spl/spl_opensbi.c b/common/spl/spl_opensbi.c index a0c5f35dab..708869ad48 100644 --- a/common/spl/spl_opensbi.c +++ b/common/spl/spl_opensbi.c @@ -58,9 +58,14 @@ void __noreturn spl_invoke_opensbi(struct spl_image_info *spl_image)
/* * Find next os image in /fit-images - * The next os image default is u-boot proper + * The next os image default is u-boot proper, once enable + * OpenSBI OS boot mode, the OS image should be linux. */ +#if CONFIG_IS_ENABLED(LOAD_FIT_OPENSBI_OS_BOOT) + os_type = IH_OS_LINUX; +#else os_type = IH_OS_U_BOOT; +#endif ret = spl_opensbi_find_os_node(spl_image->fdt_addr, &os_node, os_type); if (ret) { pr_err("Can't find %s node for opensbi, %d\n",