public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH] am335x_evm: Add boot script support to am335x_evm
@ 2014-09-11  7:23 Guillaume GARDET
  2014-09-17  8:11 ` Guillaume Gardet
  2014-09-18 12:34 ` [U-Boot] " Tom Rini
  0 siblings, 2 replies; 3+ messages in thread
From: Guillaume GARDET @ 2014-09-11  7:23 UTC (permalink / raw)
  To: u-boot

This patch adds boot script support to am335x_evm

Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
Cc: Tom Rini <trini@ti.com>

---
 include/configs/am335x_evm.h | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index df1a6fc..aef0ad3 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -115,6 +115,9 @@
 		"nfsroot=${serverip}:${rootpath},${nfsopts} rw " \
 		"ip=dhcp\0" \
 	"bootenv=uEnv.txt\0" \
+	"loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \
+	"bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
+		"source ${loadaddr}\0" \
 	"loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
 	"importbootenv=echo Importing environment from mmc ...; " \
 		"env import -t -r $loadaddr $filesize\0" \
@@ -142,17 +145,21 @@
 	"mmcboot=mmc dev ${mmcdev}; " \
 		"if mmc rescan; then " \
 			"echo SD/MMC found on device ${mmcdev};" \
-			"if run loadbootenv; then " \
-				"echo Loaded environment from ${bootenv};" \
-				"run importbootenv;" \
-			"fi;" \
-			"if test -n $uenvcmd; then " \
-				"echo Running uenvcmd ...;" \
-				"run uenvcmd;" \
-			"fi;" \
-			"if run loadimage; then " \
-				"run mmcloados;" \
-			"fi;" \
+			"if run loadbootscript; then " \
+				"run bootscript;" \
+			"else " \
+				"if run loadbootenv; then " \
+					"echo Loaded environment from ${bootenv};" \
+					"run importbootenv;" \
+				"fi;" \
+				"if test -n $uenvcmd; then " \
+					"echo Running uenvcmd ...;" \
+					"run uenvcmd;" \
+				"fi;" \
+				"if run loadimage; then " \
+					"run mmcloados;" \
+				"fi;" \
+			"fi ;" \
 		"fi;\0" \
 	"spiboot=echo Booting from spi ...; " \
 		"run spiargs; " \
-- 
1.8.4.5

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

* [U-Boot] [PATCH] am335x_evm: Add boot script support to am335x_evm
  2014-09-11  7:23 [U-Boot] [PATCH] am335x_evm: Add boot script support to am335x_evm Guillaume GARDET
@ 2014-09-17  8:11 ` Guillaume Gardet
  2014-09-18 12:34 ` [U-Boot] " Tom Rini
  1 sibling, 0 replies; 3+ messages in thread
From: Guillaume Gardet @ 2014-09-17  8:11 UTC (permalink / raw)
  To: u-boot

Ping.

Guillaume

Le 11/09/2014 09:23, Guillaume GARDET a ?crit :
> This patch adds boot script support to am335x_evm
>
> Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
> Cc: Tom Rini <trini@ti.com>
>
> ---
>   include/configs/am335x_evm.h | 29 ++++++++++++++++++-----------
>   1 file changed, 18 insertions(+), 11 deletions(-)
>
> diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
> index df1a6fc..aef0ad3 100644
> --- a/include/configs/am335x_evm.h
> +++ b/include/configs/am335x_evm.h
> @@ -115,6 +115,9 @@
>   		"nfsroot=${serverip}:${rootpath},${nfsopts} rw " \
>   		"ip=dhcp\0" \
>   	"bootenv=uEnv.txt\0" \
> +	"loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \
> +	"bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
> +		"source ${loadaddr}\0" \
>   	"loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
>   	"importbootenv=echo Importing environment from mmc ...; " \
>   		"env import -t -r $loadaddr $filesize\0" \
> @@ -142,17 +145,21 @@
>   	"mmcboot=mmc dev ${mmcdev}; " \
>   		"if mmc rescan; then " \
>   			"echo SD/MMC found on device ${mmcdev};" \
> -			"if run loadbootenv; then " \
> -				"echo Loaded environment from ${bootenv};" \
> -				"run importbootenv;" \
> -			"fi;" \
> -			"if test -n $uenvcmd; then " \
> -				"echo Running uenvcmd ...;" \
> -				"run uenvcmd;" \
> -			"fi;" \
> -			"if run loadimage; then " \
> -				"run mmcloados;" \
> -			"fi;" \
> +			"if run loadbootscript; then " \
> +				"run bootscript;" \
> +			"else " \
> +				"if run loadbootenv; then " \
> +					"echo Loaded environment from ${bootenv};" \
> +					"run importbootenv;" \
> +				"fi;" \
> +				"if test -n $uenvcmd; then " \
> +					"echo Running uenvcmd ...;" \
> +					"run uenvcmd;" \
> +				"fi;" \
> +				"if run loadimage; then " \
> +					"run mmcloados;" \
> +				"fi;" \
> +			"fi ;" \
>   		"fi;\0" \
>   	"spiboot=echo Booting from spi ...; " \
>   		"run spiargs; " \

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

* [U-Boot] am335x_evm: Add boot script support to am335x_evm
  2014-09-11  7:23 [U-Boot] [PATCH] am335x_evm: Add boot script support to am335x_evm Guillaume GARDET
  2014-09-17  8:11 ` Guillaume Gardet
@ 2014-09-18 12:34 ` Tom Rini
  1 sibling, 0 replies; 3+ messages in thread
From: Tom Rini @ 2014-09-18 12:34 UTC (permalink / raw)
  To: u-boot

On Thu, Sep 11, 2014 at 09:23:08AM +0200, Guillaume GARDET wrote:

> This patch adds boot script support to am335x_evm
> 
> Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
> Cc: Tom Rini <trini@ti.com>

Applied to u-boot-ti/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/20140918/ea66083c/attachment.pgp>

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

end of thread, other threads:[~2014-09-18 12:34 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-11  7:23 [U-Boot] [PATCH] am335x_evm: Add boot script support to am335x_evm Guillaume GARDET
2014-09-17  8:11 ` Guillaume Gardet
2014-09-18 12:34 ` [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