From: Nishanth Menon <nm@ti.com>
Date: Mon, 15 Jul 2013 12:11:33 +0000 (-0500)
Subject: omap3_beagle: support booting from zImage and device tree as last option
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=ea70690d6636bf1461ab601fbaa00039896d76c6;p=u-boot.git

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>
---

diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index dacabb6910..4487451acd 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
 /*