diff options
| author | Tom Rini <trini@ti.com> | 2014-05-22 14:29:41 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-05-22 14:29:41 -0400 |
| commit | f6ed9d50949eb290744bf7606e30763582e2d44b (patch) | |
| tree | 659cd954a4b4075c7227ea6d1d6ec768b0a2d78a /include/configs/omap3_beagle.h | |
| parent | 8e3812859670fda61b98458864fa9f014fcd3dcc (diff) | |
| parent | 05d134b084590684bcf4d832c0035952727b7cd9 (diff) | |
| download | u-boot-imx-f6ed9d50949eb290744bf7606e30763582e2d44b.zip u-boot-imx-f6ed9d50949eb290744bf7606e30763582e2d44b.tar.gz u-boot-imx-f6ed9d50949eb290744bf7606e30763582e2d44b.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/configs/omap3_beagle.h')
| -rw-r--r-- | include/configs/omap3_beagle.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index a5b7a40..0a7df60 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -180,11 +180,17 @@ "if test $beaglerev = C4; then " \ "setenv fdtfile omap3-beagle.dtb; fi; " \ "if test $beaglerev = xMAB; then " \ - "setenv fdtfile omap3-beagle-xm.dtb; fi; " \ + "setenv fdtfile omap3-beagle-xm-ab.dtb; fi; " \ "if test $beaglerev = xMC; then " \ "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 ...; " \ @@ -200,7 +206,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" \ |