| Message ID | 1409042893-6647-1-git-send-email-guillaume.gardet@free.fr |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Tom Rini |
| Headers | show |
Ping. Guillaume Le 26/08/2014 10:48, Guillaume GARDET a écrit : > This patch adds boot script support to omap3 beagle board. > > Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr> > Cc: Tom Rini <trini@ti.com> > > --- > include/configs/omap3_beagle.h | 13 ++++++++++--- > 1 file changed, 10 insertions(+), 3 deletions(-) > > diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h > index 644e97f..f25a940 100644 > --- a/include/configs/omap3_beagle.h > +++ b/include/configs/omap3_beagle.h > @@ -207,6 +207,9 @@ > "rootfstype=${ramrootfstype}\0" \ > "loadramdisk=load mmc ${bootpart} ${rdaddr} ${bootdir}/${ramdisk}\0" \ > "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ > + "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \ > + "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \ > + "source ${loadaddr}\0" \ > "loadfdt=run validatefdt; load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ > "mmcboot=echo Booting from mmc ...; " \ > "run mmcargs; " \ > @@ -243,9 +246,13 @@ > "echo Running uenvcmd ...;" \ > "run uenvcmd;" \ > "fi;" \ > - "if run loadimage; then " \ > - "run mmcboot;" \ > - "fi;" \ > + "if run loadbootscript; then " \ > + "run bootscript; " \ > + "else " \ > + "if run loadimage; then " \ > + "run mmcboot;" \ > + "fi;" \ > + "fi; " \ > "fi;" \ > "run nandboot;" \ > "setenv bootfile zImage;" \
On Tue, Aug 26, 2014 at 10:48:13AM +0200, Guillaume GARDET wrote: > This patch adds boot script support to omap3 beagle board. > > Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr> > Cc: Tom Rini <trini@ti.com> Applied to u-boot/master, thanks!
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 644e97f..f25a940 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -207,6 +207,9 @@ "rootfstype=${ramrootfstype}\0" \ "loadramdisk=load mmc ${bootpart} ${rdaddr} ${bootdir}/${ramdisk}\0" \ "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ + "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \ + "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \ + "source ${loadaddr}\0" \ "loadfdt=run validatefdt; load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ "mmcboot=echo Booting from mmc ...; " \ "run mmcargs; " \ @@ -243,9 +246,13 @@ "echo Running uenvcmd ...;" \ "run uenvcmd;" \ "fi;" \ - "if run loadimage; then " \ - "run mmcboot;" \ - "fi;" \ + "if run loadbootscript; then " \ + "run bootscript; " \ + "else " \ + "if run loadimage; then " \ + "run mmcboot;" \ + "fi;" \ + "fi; " \ "fi;" \ "run nandboot;" \ "setenv bootfile zImage;" \
This patch adds boot script support to omap3 beagle board. Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr> Cc: Tom Rini <trini@ti.com> --- include/configs/omap3_beagle.h | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)