public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH] omap3_beagle: Add boot script support to omap3 beagle board
@ 2014-08-26  8:48 Guillaume GARDET
  2014-09-02 12:41 ` Guillaume Gardet
  2014-09-04 20:47 ` [U-Boot] " Tom Rini
  0 siblings, 2 replies; 3+ messages in thread
From: Guillaume GARDET @ 2014-08-26  8:48 UTC (permalink / raw)
  To: u-boot

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;" \
-- 
1.8.4.5

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [U-Boot] [PATCH] omap3_beagle: Add boot script support to omap3 beagle board
  2014-08-26  8:48 [U-Boot] [PATCH] omap3_beagle: Add boot script support to omap3 beagle board Guillaume GARDET
@ 2014-09-02 12:41 ` Guillaume Gardet
  2014-09-04 20:47 ` [U-Boot] " Tom Rini
  1 sibling, 0 replies; 3+ messages in thread
From: Guillaume Gardet @ 2014-09-02 12:41 UTC (permalink / raw)
  To: u-boot

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;" \

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [U-Boot] omap3_beagle: Add boot script support to omap3 beagle board
  2014-08-26  8:48 [U-Boot] [PATCH] omap3_beagle: Add boot script support to omap3 beagle board Guillaume GARDET
  2014-09-02 12:41 ` Guillaume Gardet
@ 2014-09-04 20:47 ` Tom Rini
  1 sibling, 0 replies; 3+ messages in thread
From: Tom Rini @ 2014-09-04 20:47 UTC (permalink / raw)
  To: u-boot

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!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140904/9e709e38/attachment.pgp>

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2014-09-04 20:47 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-08-26  8:48 [U-Boot] [PATCH] omap3_beagle: Add boot script support to omap3 beagle board Guillaume GARDET
2014-09-02 12:41 ` Guillaume Gardet
2014-09-04 20:47 ` [U-Boot] " Tom Rini

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox