spl: riscv: add os type for next booting stage

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>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c
index c026e1a194571e47c41417165e349ce6d41437ac..70d8d5942d96c6e6017007405a1fac2a2846aaa1 100644 (file)
--- a/common/spl/spl_fit.c
+++ b/common/spl/spl_fit.c
@@ -367,7 +367,8 @@ static bool os_takes_devicetree(uint8_t os)
        case IH_OS_U_BOOT:
                return true;
        case IH_OS_LINUX:
-               return IS_ENABLED(CONFIG_SPL_OS_BOOT);
+               return IS_ENABLED(CONFIG_SPL_OS_BOOT) ||
+                      IS_ENABLED(CONFIG_SPL_OPENSBI);
        default:
                return false;
        }

diff --git a/common/spl/spl_opensbi.c b/common/spl/spl_opensbi.c
index 6583b3195300766f79dc4e2d85c7cbfd2b709a61..9801d38c0b328cb58667f66fcea7be0d525d0f8e 100644 (file)
--- a/common/spl/spl_opensbi.c
+++ b/common/spl/spl_opensbi.c
@@ -59,9 +59,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.
         */
-       os_type = IH_OS_U_BOOT;
+       if (CONFIG_IS_ENABLED(LOAD_FIT_OPENSBI_OS_BOOT))
+               os_type = IH_OS_LINUX;
+       else
+               os_type = IH_OS_U_BOOT;
+
        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",