[PATCH v2] sysboot: add zboot support to boot x86 Linux kernel image

[PATCH v2] sysboot: add zboot support to boot x86 Linux kernel image

[Kory Maincent]

Add "zboot" command to the list of supported boot in the label_boot function.

Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
---

Change since v1:
 - Modify comment

 cmd/pxe_utils.c   | 4 ++++
 include/command.h | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/cmd/pxe_utils.c b/cmd/pxe_utils.c
index 53af04d7dc..1de02e7353 100644
--- a/cmd/pxe_utils.c
+++ b/cmd/pxe_utils.c
@@ -548,6 +548,10 @@ static int label_boot(cmd_tbl_t *cmdtp, struct pxe_label *label)
 	/* Try booting a Image */
 	else
 		do_bootz(cmdtp, 0, bootm_argc, bootm_argv);
+#elif defined(CONFIG_CMD_ZBOOT)
+	/* Try booting an x86_64 Linux kernel image */
+	else
+		do_zboot(cmdtp, 0, bootm_argc, bootm_argv);
 #endif
 	unmap_sysmem(buf);
 
diff --git a/include/command.h b/include/command.h
index d1063774ce..57fe65000b 100644
--- a/include/command.h
+++ b/include/command.h
@@ -133,6 +133,8 @@ extern int do_bootz(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
 
 extern int do_booti(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
 
+extern int do_zboot(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
+
 extern int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc,
 			   char *const argv[]);
 
-- 
2.17.1

[PATCH v2] sysboot: add zboot support to boot x86 Linux kernel image

[Bin Meng]

On Sat, Dec 26, 2020 at 5:25 AM Kory Maincent <kory.maincent@bootlin.com> wrote:
>
> Add "zboot" command to the list of supported boot in the label_boot function.
>
> Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
> ---
>
> Change since v1:
>  - Modify comment
>
>  cmd/pxe_utils.c   | 4 ++++
>  include/command.h | 2 ++
>  2 files changed, 6 insertions(+)
>

applied to u-boot-x86, thanks!

[PATCH v2] sysboot: add zboot support to boot x86 Linux kernel image

[Bin Meng]

Hi Kory,

On Thu, Jan 21, 2021 at 11:01 AM Bin Meng <bmeng.cn@gmail.com> wrote:
>
> On Sat, Dec 26, 2020 at 5:25 AM Kory Maincent <kory.maincent@bootlin.com> wrote:
> >
> > Add "zboot" command to the list of supported boot in the label_boot function.
> >
> > Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
> > ---
> >
> > Change since v1:
> >  - Modify comment
> >
> >  cmd/pxe_utils.c   | 4 ++++
> >  include/command.h | 2 ++
> >  2 files changed, 6 insertions(+)
> >
>
> applied to u-boot-x86, thanks!

This patch unfortunately does not compile, due to the following commit
made by Simon:

commit 5588e776b02d65afeae612d3dde92e7add2e03cc
Author: Simon Glass <sjg@chromium.org>
Date:   Sat Sep 5 14:50:43 2020 -0600

    x86: zboot: Set up a sub-command structure

    Add subcommands to zboot. At present there is only one called 'start'
    which does the whole boot. It is the default command so is optional.

    Change the 's' string variable to const while we are here.

Could you please rework? Thanks!

Regards,
Bin