[U-Boot] [PATCH 2/2] omap3_beagle: xM A/B validate new dtb exits in file system
From: Robert Nelson robertcnelson@gmail.com
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 --- include/configs/omap3_beagle.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index a1d38ff..06b9006 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -248,6 +248,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 ...; " \ @@ -263,7 +269,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" \
On Fri, May 2, 2014 at 3:15 PM, robertcnelson robertcnelson@gmail.com wrote:
From: Robert Nelson robertcnelson@gmail.com
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
include/configs/omap3_beagle.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index a1d38ff..06b9006 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -248,6 +248,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 ...; " \@@ -263,7 +269,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" \-- 1.9.2
Little git send-email failure here, I was trying to send this second as patch as [RFC].
This is my first thoughts of keeping backward compatibility with less then v3.15-rc3 kernels.
Thoughts?
Regards,
On Fri, May 02, 2014 at 03:17:59PM -0500, Robert Nelson wrote:
On Fri, May 2, 2014 at 3:15 PM, robertcnelson robertcnelson@gmail.com wrote:
From: Robert Nelson robertcnelson@gmail.com
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
include/configs/omap3_beagle.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index a1d38ff..06b9006 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -248,6 +248,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 ...; " \@@ -263,7 +269,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" \-- 1.9.2
Little git send-email failure here, I was trying to send this second as patch as [RFC].
This is my first thoughts of keeping backward compatibility with less then v3.15-rc3 kernels.
Thoughts?
Work for me since everything else in the sequence is MMC-centric.
Acked-by: Tom Rini trini@ti.com
On Fri, May 02, 2014 at 03:15:03PM -0500, robertcnelson@gmail.com wrote:
From: Robert Nelson robertcnelson@gmail.com
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
Applied to u-boot-ti/master, thanks!
participants (3)
-
Robert Nelson -
robertcnelson
-
Tom Rini