For future extension to other architectures, make do_bootm_vxworks() a non-static function.

Signed-off-by: Bin Meng bmeng.cn@gmail.com ---

common/bootm_os.c | 4 ++-- include/bootm.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/common/bootm_os.c b/common/bootm_os.c index da938c5..473b940 100644 --- a/common/bootm_os.c +++ b/common/bootm_os.c @@ -317,8 +317,8 @@ static void do_bootvx_fdt(bootm_headers_t *images) puts("## vxWorks terminated\n"); }

-static int do_bootm_vxworks(int flag, int argc, char * const argv[], - bootm_headers_t *images) +int do_bootm_vxworks(int flag, int argc, char * const argv[], + bootm_headers_t *images) { if (flag != BOOTM_STATE_OS_GO) return 0; diff --git a/include/bootm.h b/include/bootm.h index 0501414..dbd6f49 100644 --- a/include/bootm.h +++ b/include/bootm.h @@ -35,6 +35,8 @@ typedef int boot_os_fn(int flag, int argc, char * const argv[], bootm_headers_t *images);

extern boot_os_fn do_bootm_linux; +extern boot_os_fn do_bootm_vxworks; + int do_bootelf(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); void lynxkdi_boot(image_header_t *hdr);

Register the 'bootm' function for booting VxWorks kernel for RISC-V architecture.

Signed-off-by: Bin Meng bmeng.cn@gmail.com

---

arch/riscv/lib/bootm.c | 8 +++++++- common/bootm_os.c | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/arch/riscv/lib/bootm.c b/arch/riscv/lib/bootm.c index 60b32cc..f36b870 100644 --- a/arch/riscv/lib/bootm.c +++ b/arch/riscv/lib/bootm.c @@ -86,7 +86,7 @@ static void boot_jump_linux(bootm_headers_t *images, int flag)

bootstage_mark(BOOTSTAGE_ID_RUN_OS);

- debug("## Transferring control to Linux (at address %08lx) ...\n", + debug("## Transferring control to kernel (at address %08lx) ...\n", (ulong)kernel);

announce_and_cleanup(fake); @@ -118,3 +118,9 @@ int do_bootm_linux(int flag, int argc, char * const argv[], boot_jump_linux(images, flag); return 0; } + +int do_bootm_vxworks(int flag, int argc, char * const argv[], + bootm_headers_t *images) +{ + return do_bootm_linux(flag, argc, argv, images); +} diff --git a/common/bootm_os.c b/common/bootm_os.c index 473b940..855c471 100644 --- a/common/bootm_os.c +++ b/common/bootm_os.c @@ -482,7 +482,7 @@ static boot_os_fn *boot_os[] = { [IH_OS_PLAN9] = do_bootm_plan9, #endif #if defined(CONFIG_BOOTM_VXWORKS) && \ - (defined(CONFIG_PPC) || defined(CONFIG_ARM)) + (defined(CONFIG_PPC) || defined(CONFIG_ARM) || defined(CONFIG_RISCV)) [IH_OS_VXWORKS] = do_bootm_vxworks, #endif #if defined(CONFIG_CMD_ELF)