diff options
| author | Robert Nelson <robertcnelson@gmail.com> | 2014-05-02 15:15:03 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-05-13 19:43:00 -0400 |
| commit | 4fa2427c5d8e36df5a6a2ce020c5166ec0da6bd8 (patch) | |
| tree | 37cdaa86e833014d7c91c6d69144f0594266fdb0 | |
| parent | 3d47ffb9933d82243a357c5f0df22c896e6c5a5d (diff) | |
| download | talos-obmc-uboot-4fa2427c5d8e36df5a6a2ce020c5166ec0da6bd8.tar.gz talos-obmc-uboot-4fa2427c5d8e36df5a6a2ce020c5166ec0da6bd8.zip | |
omap3_beagle: xM A/B validate new dtb exits in file system
Fall back to previous dtb used when omap3-beagle-xm-ab.dtb doesn't exist in file system
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
CC: Tom Rini <trini@ti.com>
CC: Nishanth Menon <nm@ti.com>
Acked-by: Tom Rini <trini@ti.com>
| -rw-r--r-- | include/configs/omap3_beagle.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 2390564832..d07e52dfd3 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -175,6 +175,12 @@ "setenv fdtfile omap3-beagle-xm.dtb; fi; " \ "if test $fdtfile = undefined; then " \ "echo WARNING: Could not determine device tree to use; fi; \0" \ + "validatefdt=" \ + "if test $beaglerev = xMAB; then " \ + "if test ! -e mmc ${bootpart} ${bootdir}/${fdtfile}; then " \ + "setenv fdtfile omap3-beagle-xm.dtb; " \ + "fi; " \ + "fi; \0" \ "bootenv=uEnv.txt\0" \ "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \ "importbootenv=echo Importing environment from mmc ...; " \ @@ -190,7 +196,7 @@ "rootfstype=${ramrootfstype}\0" \ "loadramdisk=load mmc ${bootpart} ${rdaddr} ${bootdir}/${ramdisk}\0" \ "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ - "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ + "loadfdt=run validatefdt; load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ "mmcboot=echo Booting from mmc ...; " \ "run mmcargs; " \ "bootm ${loadaddr}\0" \ |
