omap3: overo: Allow boot with kernel in UBI rootfs

If regular NAND booting fails to find a valid uImage in the
kernel partition in NAND, try to boot using a zImage and dtb found
in a UBI volume in the rootfs partition.  This is the NAND analog
of mmc zImage booting for device-tree based kernels.

Signed-off-by: Ash Charles <ashcharles@gmail.com>
Signed-off-by: Arun Bharadwaj <arun@gumstix.com>
This commit is contained in:
Ash Charles 2015-04-28 16:17:54 -07:00 committed by Tom Rini
parent ce170a1c3d
commit 88d89668b9

View file

@ -140,6 +140,8 @@
"bootm ${loadaddr}\0" \ "bootm ${loadaddr}\0" \
"loadzimage=load mmc ${mmcdev}:2 ${loadaddr} ${bootdir}/${bootfile}\0" \ "loadzimage=load mmc ${mmcdev}:2 ${loadaddr} ${bootdir}/${bootfile}\0" \
"loadfdt=load mmc ${mmcdev}:2 ${fdtaddr} ${bootdir}/${fdtfile}\0" \ "loadfdt=load mmc ${mmcdev}:2 ${fdtaddr} ${bootdir}/${fdtfile}\0" \
"loadubizimage=ubifsload ${loadaddr} ${bootdir}/${bootfile}\0" \
"loadubifdt=ubifsload ${fdtaddr} ${bootdir}/${fdtfile}\0" \
"mmcbootfdt=echo Booting with DT from mmc ...; " \ "mmcbootfdt=echo Booting with DT from mmc ...; " \
"run mmcargs; " \ "run mmcargs; " \
"bootz ${loadaddr} - ${fdtaddr}\0" \ "bootz ${loadaddr} - ${fdtaddr}\0" \
@ -148,6 +150,13 @@
"if nand read ${loadaddr} linux; then " \ "if nand read ${loadaddr} linux; then " \
"bootm ${loadaddr};" \ "bootm ${loadaddr};" \
"fi;\0" \ "fi;\0" \
"nanddtsboot=echo Booting from nand with DTS...; " \
"run nandargs; " \
"ubi part rootfs; "\
"ubifsmount ubi0:rootfs; "\
"run loadubifdt; "\
"run loadubizimage; "\
"bootz ${loadaddr} - ${fdtaddr}\0" \
#define CONFIG_BOOTCOMMAND \ #define CONFIG_BOOTCOMMAND \
"mmc dev ${mmcdev}; if mmc rescan; then " \ "mmc dev ${mmcdev}; if mmc rescan; then " \
@ -175,6 +184,10 @@
"fi;" \ "fi;" \
"fi;" \ "fi;" \
"run nandboot; " \ "run nandboot; " \
"if test -z \"${fdtfile}\"; then "\
"setenv fdtfile omap3-${boardname}-${expansionname}.dtb;" \
"fi;" \
"run nanddtsboot; " \
/* /*
* Miscellaneous configurable options * Miscellaneous configurable options