aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2012-12-03 13:17:21 -0600
committerFathi Boudra <fabo@debian.org>2013-07-10 13:58:34 +0300
commit43ee87aabf17e51d35a5d82848a4052e60f2c7bb (patch)
treeb7525161a329d64b31a4254f6b7752e38ebb90b7
parent73b7f20597227985351b2a1b3a911a35c6b1793d (diff)
downloadu-boot-linaro-stable-master.tar.gz
pxe: try bootz if bootm fails to find a valid imageHEADmaster
Standard pxelinux servers will typically use a zImage rather than u-boot image format, so fallback to bootz if bootm fails. Signed-off-by: Rob Herring <rob.herring@calxeda.com> [tushar.behera@linaro.org: Cherry-picked to current tracking branch] Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
-rw-r--r--common/cmd_pxe.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/common/cmd_pxe.c b/common/cmd_pxe.c
index 9f1c14d..346eb61 100644
--- a/common/cmd_pxe.c
+++ b/common/cmd_pxe.c
@@ -711,10 +711,11 @@ static int label_boot(struct pxe_label *label)
if (bootm_argv[3])
bootm_argc = 4;
+ do_bootm(NULL, 0, bootm_argc, bootm_argv);
+
#ifdef CONFIG_CMD_BOOTZ
+ /* Try booting a zImage if do_bootm returns */
do_bootz(NULL, 0, bootm_argc, bootm_argv);
-#else
- do_bootm(NULL, 0, bootm_argc, bootm_argv);
#endif
return 1;
}