summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNishanth Menon <nm@ti.com>2013-07-15 07:11:33 -0500
committerTom Rini <trini@ti.com>2013-07-26 16:39:12 -0400
commitea70690d6636bf1461ab601fbaa00039896d76c6 (patch)
tree126c33dad6b0e2340031a937541e4cfa9e4a4d18
parent2ade496fd88ebe947f8fd8ae4a07fc3bf1f41e60 (diff)
downloadu-boot-imx-ea70690d6636bf1461ab601fbaa00039896d76c6.zip
u-boot-imx-ea70690d6636bf1461ab601fbaa00039896d76c6.tar.gz
u-boot-imx-ea70690d6636bf1461ab601fbaa00039896d76c6.tar.bz2
omap3_beagle: support booting from zImage and device tree as last option
If no other bootoption works, try loading up device tree and zImage. This is selected as the last option to allow backward compatibility as well as support the recent trend in moving kernel boot to using zImage and device tree. NOTE: if uImage is present in bootpart, it will try this first and will assume this is to be booted with bootm (so may be concatenated image or plain vanilla ATAG MACHINE_ID based image) Signed-off-by: Nishanth Menon <nm@ti.com>
-rw-r--r--include/configs/omap3_beagle.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index dacabb6..4487451 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -266,6 +266,9 @@
"mmcboot=echo Booting from mmc ...; " \
"run mmcargs; " \
"bootm ${loadaddr}\0" \
+ "mmcbootz=echo Booting with DT from mmc${mmcdev} ...; " \
+ "run mmcargs; " \
+ "bootz ${loadaddr} - ${fdtaddr}\0" \
"nandboot=echo Booting from nand ...; " \
"run nandargs; " \
"nand read ${loadaddr} 280000 400000; " \
@@ -300,6 +303,11 @@
"fi;" \
"fi;" \
"run nandboot;" \
+ "setenv bootfile zImage;" \
+ "if run loadimage; then " \
+ "run loadfdt;" \
+ "run mmcbootz; " \
+ "fi; " \
#define CONFIG_AUTO_COMPLETE 1
/*