diff options
| author | Dennis Gilmore <dennis@ausil.us> | 2014-04-26 10:57:05 -0500 |
|---|---|---|
| committer | Dennis Gilmore <dennis@ausil.us> | 2014-04-26 10:57:05 -0500 |
| commit | abc7809628fb201f32da2069158305540b64e5c8 (patch) | |
| tree | b650e55f91f01ca2a0a2f250b26c1c580b70f66d | |
| parent | fb578a53288ecf8b0d9bbc5ebfbaead6f5b9a5e9 (diff) | |
| download | u-boot-abc7809628fb201f32da2069158305540b64e5c8.tar.gz u-boot-abc7809628fb201f32da2069158305540b64e5c8.tar.xz u-boot-abc7809628fb201f32da2069158305540b64e5c8.zip | |
PXE: distros implementing syslinux will be using raw kernels and initramfs
Since we are not detecting if the image is raw or wrapped and we expect
distros to be using raw images attempt bootz before bootm. This prevents
the user from getting a confusing error message:
Wrong Image Format for sysboot command
ERROR: can't get kernel image!
| -rw-r--r-- | common/cmd_pxe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/cmd_pxe.c b/common/cmd_pxe.c index 18e140dfbe..250243a520 100644 --- a/common/cmd_pxe.c +++ b/common/cmd_pxe.c @@ -793,12 +793,12 @@ static int label_boot(cmd_tbl_t *cmdtp, struct pxe_label *label) if (bootm_argv[3]) bootm_argc = 4; - do_bootm(cmdtp, 0, bootm_argc, bootm_argv); - #ifdef CONFIG_CMD_BOOTZ /* Try booting a zImage if do_bootm returns */ do_bootz(cmdtp, 0, bootm_argc, bootm_argv); #endif + + do_bootm(cmdtp, 0, bootm_argc, bootm_argv); return 1; } |