From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kory Maincent Date: Tue, 2 Feb 2021 16:42:29 +0100 Subject: [PATCH v5 3/3] sysboot: add zboot support to boot x86 Linux kernel image In-Reply-To: <20210202154229.26103-1-kory.maincent@bootlin.com> References: <20210202154229.26103-1-kory.maincent@bootlin.com> Message-ID: <20210202154229.26103-3-kory.maincent@bootlin.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Add "zboot" command to the list of supported boot in the label_boot function. Signed-off-by: Kory Maincent Reviewed-by: Simon Glass Reviewed-by: Bin Meng --- Change since v1: - Modify comment. Change since v2: - Update do_zboot to do_zboot_parent function to follow the patch: 5588e776b0 Change since v3: - Follow review from Simon Glass - Add clean-up paches Change since v4: - Use 'if (IS_ENABLED(CONFIG...))' instead of '#if or #ifdef' 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 e062c9edcf..4cf31119f4 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.17.1