Skip to contentSkip to conversation

sysboot: add zboot support to boot x86 image

PATCH Superseded Kory Maincent 2 participants 2 messages Dec 10, 2020 – Dec 22, 2020

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sysboot: add zboot support to boot x86 image

---
 cmd/pxe_utils.c   | 4 ++++
 include/command.h | 2 ++
 2 files changed, 6 insertions(+)
cmd/pxe_utils.c +4 -0
index 53af04d7dc..deaedcf347 100644
@@ -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 Image */
+	else
+		do_zboot(cmdtp, 0, bootm_argc, bootm_argv);
 #endif
 	unmap_sysmem(buf);
 
include/command.h +2 -0
index d1063774ce..57fe65000b 100644
@@ -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[]);
 
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/1 sysboot: add zboot support to boot x86 image

Hi Kory,

Quoted 1 line · Kory Maincent

Please put some commit message here.

Quoted 11 lines
---
 cmd/pxe_utils.c   | 4 ++++
 include/command.h | 2 ++
 2 files changed, 6 insertions(+)
cmd/pxe_utils.c +0 -0
index 53af04d7dc..deaedcf347 100644

cmd/pxe_utils.c static int label_boot(cmd_tbl_t *cmdtp, struct pxe_label *label) · line 552

Quoted 5 lines
cmd/pxe_utils.c +2 -0
@@ -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 Image */

What about x86?

Quoted 10 lines
cmd/pxe_utils.c +2 -0
+       else
+               do_zboot(cmdtp, 0, bootm_argc, bootm_argv);
 #endif
        unmap_sysmem(buf);
 
include/command.h +0 -0
index d1063774ce..57fe65000b 100644

include/command.h extern int do_bootz(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); · line 140

Quoted 8 lines
include/command.h +2 -0
@@ -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[]);
 

Regards,
Bin