[U-Boot] [PATCH 1/3] bootm: vxworks: Make do_bootvx_fdt() static

[U-Boot] [PATCH 1/3] bootm: vxworks: Make do_bootvx_fdt() static

[Bin Meng]

Change the scope of do_bootvx_fdt() to static since it is only
used in common/bootm_os.c.

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

 common/bootm_os.c | 2 +-
 include/vxworks.h | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/common/bootm_os.c b/common/bootm_os.c
index f302135..da938c5 100644
--- a/common/bootm_os.c
+++ b/common/bootm_os.c
@@ -260,7 +260,7 @@ static int do_bootm_plan9(int flag, int argc, char * const argv[],
 #if defined(CONFIG_BOOTM_VXWORKS) && \
 	(defined(CONFIG_PPC) || defined(CONFIG_ARM))
 
-void do_bootvx_fdt(bootm_headers_t *images)
+static void do_bootvx_fdt(bootm_headers_t *images)
 {
 #if defined(CONFIG_OF_LIBFDT)
 	int ret;
diff --git a/include/vxworks.h b/include/vxworks.h
index 60c0efa..1a29509 100644
--- a/include/vxworks.h
+++ b/include/vxworks.h
@@ -83,6 +83,5 @@ struct efi_gop_info {
 int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
 void boot_prep_vxworks(bootm_headers_t *images);
 void boot_jump_vxworks(bootm_headers_t *images);
-void do_bootvx_fdt(bootm_headers_t *images);
 
 #endif
-- 
2.7.4

[U-Boot] [PATCH 2/3] bootm: vxworks: Make do_bootm_vxworks() non-static

[Bin Meng]

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);
 
-- 
2.7.4

[U-Boot] [PATCH 3/3] riscv: bootm: Support booting VxWorks

[Bin Meng]

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)
-- 
2.7.4

[U-Boot] [PATCH 1/3] bootm: vxworks: Make do_bootvx_fdt() static

[Bin Meng]

Hi Tom,

On Fri, Dec 21, 2018 at 11:08 PM Bin Meng <bmeng.cn@gmail.com> wrote:
>
> Change the scope of do_bootvx_fdt() to static since it is only
> used in common/bootm_os.c.
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> ---
>
>  common/bootm_os.c | 2 +-
>  include/vxworks.h | 1 -
>  2 files changed, 1 insertion(+), 2 deletions(-)
>

I hope this series can get into v2019.01.

Regards,
Bin

[U-Boot] [U-Boot, 1/3] bootm: vxworks: Make do_bootvx_fdt() static

[Tom Rini]

On Fri, Dec 21, 2018 at 07:13:39AM -0800, Bin Meng wrote:

> Change the scope of do_bootvx_fdt() to static since it is only
> used in common/bootm_os.c.
> 
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190101/c9a404a3/attachment.sig>

[U-Boot] [U-Boot, 2/3] bootm: vxworks: Make do_bootm_vxworks() non-static

[Tom Rini]

On Fri, Dec 21, 2018 at 07:13:40AM -0800, Bin Meng wrote:

> For future extension to other architectures, make do_bootm_vxworks()
> a non-static function.
> 
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190101/57f5ed14/attachment.sig>

[U-Boot] [U-Boot,3/3] riscv: bootm: Support booting VxWorks

[Tom Rini]

On Fri, Dec 21, 2018 at 07:13:41AM -0800, Bin Meng wrote:

> Register the 'bootm' function for booting VxWorks kernel for
> RISC-V architecture.
> 
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190101/50a8bb9c/attachment.sig>