diff options
| author | Ash Charles <ashcharles@gmail.com> | 2015-04-28 16:17:54 -0700 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-05-10 07:29:39 -0400 |
| commit | 88d89668b9d9d4553e630c1c4ce3b0bee725e6ec (patch) | |
| tree | b913a4583e2d23910018f39633814d82d31f5042 | |
| parent | ce170a1c3d7223d678491e4180b088d196379eef (diff) | |
| download | u-boot-88d89668b9d9d4553e630c1c4ce3b0bee725e6ec.tar.gz u-boot-88d89668b9d9d4553e630c1c4ce3b0bee725e6ec.tar.bz2 u-boot-88d89668b9d9d4553e630c1c4ce3b0bee725e6ec.zip | |
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>
| -rw-r--r-- | include/configs/omap3_overo.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index 61213df9a8..e1db29ad28 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -140,6 +140,8 @@ "bootm ${loadaddr}\0" \ "loadzimage=load mmc ${mmcdev}:2 ${loadaddr} ${bootdir}/${bootfile}\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 ...; " \ "run mmcargs; " \ "bootz ${loadaddr} - ${fdtaddr}\0" \ @@ -148,6 +150,13 @@ "if nand read ${loadaddr} linux; then " \ "bootm ${loadaddr};" \ "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 \ "mmc dev ${mmcdev}; if mmc rescan; then " \ @@ -175,6 +184,10 @@ "fi;" \ "fi;" \ "run nandboot; " \ + "if test -z \"${fdtfile}\"; then "\ + "setenv fdtfile omap3-${boardname}-${expansionname}.dtb;" \ + "fi;" \ + "run nanddtsboot; " \ /* * Miscellaneous configurable options |