diff options
| author | Tom Rini <trini@konsulko.com> | 2015-07-29 18:58:39 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-07-29 18:58:39 -0400 |
| commit | cc35734358540a1bbaf042fdf9f4cb2de17389ed (patch) | |
| tree | 95163aad5ff5430fdd6fb92c52f26eae46957c2c /common | |
| parent | 488d19cbcace0b87a2d08881eab7356088198903 (diff) | |
| parent | 873e3ef90ba98c764af6e05251354332205b9d3a (diff) | |
| download | u-boot-cc35734358540a1bbaf042fdf9f4cb2de17389ed.tar.gz u-boot-cc35734358540a1bbaf042fdf9f4cb2de17389ed.tar.bz2 u-boot-cc35734358540a1bbaf042fdf9f4cb2de17389ed.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-tegra
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_pxe.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/common/cmd_pxe.c b/common/cmd_pxe.c index abf0941b57..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 |