From 18c25821836b4673aa67a43c792a4a82480f47fa Mon Sep 17 00:00:00 2001 From: Kory Maincent <kory.maincent@bootlin.com> Date: Tue, 2 Feb 2021 16:42:29 +0100 Subject: [PATCH] cmd: pxe_utils: sysboot: Add zboot support to boot x86 Linux kernel image Add "zboot" command to the list of supported boot in the label_boot function. Signed-off-by: Kory Maincent <kory.maincent@bootlin.com> Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> [bmeng: add component tags in the summary] Signed-off-by: Bin Meng <bmeng.cn@gmail.com> --- cmd/pxe_utils.c | 3 +++ include/command.h | 3 +++ 2 files changed, 6 insertions(+) diff --git a/cmd/pxe_utils.c b/cmd/pxe_utils.c index 81150b162b..71c5af4c25 100644 --- a/cmd/pxe_utils.c +++ b/cmd/pxe_utils.c @@ -655,6 +655,9 @@ static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label) /* Try booting a Image */ else if (IS_ENABLED(CONFIG_CMD_BOOTZ)) do_bootz(cmdtp, 0, bootm_argc, bootm_argv); + /* Try booting an x86_64 Linux kernel image */ + else if (IS_ENABLED(CONFIG_CMD_ZBOOT)) + do_zboot_parent(cmdtp, 0, bootm_argc, bootm_argv, NULL); unmap_sysmem(buf); diff --git a/include/command.h b/include/command.h index 27604758a4..747f8f8095 100644 --- a/include/command.h +++ b/include/command.h @@ -165,6 +165,9 @@ int do_bootz(struct cmd_tbl *cmdtp, int flag, int argc, int do_booti(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); +int do_zboot_parent(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[], int *repeatable); + int common_diskboot(struct cmd_tbl *cmdtp, const char *intf, int argc, char *const argv[]); -- 2.39.5