X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=common%2Fcmd_pxe.c;h=080b3760de0074d2468a838a12ce850ac510b059;hb=b4857aa90105ea85bf029f8eb99e72fbadc0e2d0;hp=4cbb2b11734542caf44fcc9fd1c01ec21dc26e33;hpb=4a0bd1020f28c97dd89a02e666e094c8d043d6aa;p=u-boot

diff --git a/common/cmd_pxe.c b/common/cmd_pxe.c
index 4cbb2b1173..080b3760de 100644
--- a/common/cmd_pxe.c
+++ b/common/cmd_pxe.c
@@ -793,8 +793,12 @@ static int label_boot(cmd_tbl_t *cmdtp, struct pxe_label *label)
 	/* Try bootm for legacy and FIT format image */
 	if (genimg_get_format(buf) != IMAGE_FORMAT_INVALID)
 		do_bootm(cmdtp, 0, bootm_argc, bootm_argv);
-#ifdef CONFIG_CMD_BOOTZ
-	/* Try booting a zImage */
+#ifdef CONFIG_CMD_BOOTI
+	/* Try booting an AArch64 Linux kernel image */
+	else
+		do_booti(cmdtp, 0, bootm_argc, bootm_argv);
+#elif defined(CONFIG_CMD_BOOTZ)
+	/* Try booting a Image */
 	else
 		do_bootz(cmdtp, 0, bootm_argc, bootm_argv);
 #endif
@@ -1648,7 +1652,7 @@ static int do_sysboot(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
 	is_pxe = false;
 
-	if (strstr(argv[1], "-p")) {
+	if (argc > 1 && strstr(argv[1], "-p")) {
 		prompt = 1;
 		argc--;
 		argv++;