From: Kory Maincent <kory.maincent@bootlin.com>
To: u-boot@lists.denx.de
Subject: [PATCH v5 3/3] sysboot: add zboot support to boot x86 Linux kernel image
Date: Tue, 2 Feb 2021 16:42:29 +0100 [thread overview]
Message-ID: <20210202154229.26103-3-kory.maincent@bootlin.com> (raw)
In-Reply-To: <20210202154229.26103-1-kory.maincent@bootlin.com>
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>
---
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
next prev parent reply other threads:[~2021-02-02 15:42 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-02 15:42 [PATCH v5 1/3] command.h: Clean-up patch, remove extern from the header Kory Maincent
2021-02-02 15:42 ` [PATCH v5 2/3] pxe_utils: clean-up, replace ifdef by IS_ENABLED Kory Maincent
2021-02-03 6:28 ` Bin Meng
2021-02-03 12:59 ` Simon Glass
2021-02-03 13:37 ` Bin Meng
2021-02-02 15:42 ` Kory Maincent [this message]
2021-02-03 6:28 ` [PATCH v5 3/3] sysboot: add zboot support to boot x86 Linux kernel image Bin Meng
2021-02-03 6:28 ` [PATCH v5 1/3] command.h: Clean-up patch, remove extern from the header Bin Meng
2021-02-03 12:59 ` Simon Glass
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210202154229.26103-3-kory.maincent@bootlin.com \
--to=kory.maincent@bootlin.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox