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[]);