All of lore.kernel.org
 help / color / mirror / Atom feed
* [U-Boot] [u-boot][PATCH 0/2] igep00x0: updates for IGEP boards
@ 2011-05-25 14:19 Enric Balletbo i Serra
  2011-05-25 14:19 ` [U-Boot] [u-boot][PATCH 1/2] igep00x0: enable the use of a plain text file Enric Balletbo i Serra
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Enric Balletbo i Serra @ 2011-05-25 14:19 UTC (permalink / raw)
  To: u-boot

Hello,

This is a couple of patches to update the support for IGEP boards, please
consider to adding.

Thanks in advance,

Enric Balletbo i Serra (2):
  igep00x0: enable the use of a plain text file
  igep00x0: change mpurate from 500 to auto

 include/configs/igep0020.h |   30 +++++++++++++++++-------------
 include/configs/igep0030.h |   30 +++++++++++++++++-------------
 2 files changed, 34 insertions(+), 26 deletions(-)

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

* [U-Boot] [u-boot][PATCH 1/2] igep00x0: enable the use of a plain text file
  2011-05-25 14:19 [U-Boot] [u-boot][PATCH 0/2] igep00x0: updates for IGEP boards Enric Balletbo i Serra
@ 2011-05-25 14:19 ` Enric Balletbo i Serra
  2012-04-25 12:33   ` [U-Boot] [PATCH v2 " Anatolij Gustschin
  2011-05-25 14:19 ` [U-Boot] [u-boot][PATCH 2/2] igep00x0: change mpurate from 500 to auto Enric Balletbo i Serra
  2012-04-25 12:39 ` [U-Boot] [u-boot][PATCH 0/2] igep00x0: updates for IGEP boards Anatolij Gustschin
  2 siblings, 1 reply; 6+ messages in thread
From: Enric Balletbo i Serra @ 2011-05-25 14:19 UTC (permalink / raw)
  To: u-boot

Based on commit cf073e49bc3502be1b48a0e3faf0cde9edbb89db for beagleboard

Using the new env import command it is possible to use plain text files instead
of script-images. Plain text files are much easier to handle.

E.g. If your boot.scr contains the following:
 -----------------------------------
setenv dvimode 1024x768-16 at 60
run loaduimage
run mmcboot
-----------------------------------
you could create a file named uEnv.txt and use that instead of boot.scr:
 -----------------------------------
dvimode=1024x768-16 at 60
uenvcmd=run loaduimage; run mmcboot
-----------------------------------
The variable uenvcmd (if existent) will be executed (using run) after uEnv.txt
was loaded. If uenvcmd doesn't exist the default boot sequence will be started,
therefore you could just use
-----------------------------------
dvimode=1024x768-16 at 60
-----------------------------------
as uEnv.txt because loaduimage and mmcboot is part of the default boot sequence

Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com>
---
 include/configs/igep0020.h |   28 ++++++++++++++++------------
 include/configs/igep0030.h |   28 ++++++++++++++++------------
 2 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/include/configs/igep0020.h b/include/configs/igep0020.h
index 5af9bec..afd9077 100644
--- a/include/configs/igep0020.h
+++ b/include/configs/igep0020.h
@@ -163,9 +163,9 @@
 		"omapdss.def_disp=${defaultdisplay} " \
 		"root=${nandroot} " \
 		"rootfstype=${nandrootfstype}\0" \
-	"loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \
-	"bootscript=echo Running bootscript from mmc ...; " \
-		"source ${loadaddr}\0" \
+	"loadbootenv=fatload mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \
+	"importbootenv=echo Importing environment from mmc ...; " \
+		"env import -t $loadaddr $filesize\0" \
 	"loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
 	"mmcboot=echo Booting from mmc ...; " \
 		"run mmcargs; " \
@@ -177,15 +177,19 @@
 
 #define CONFIG_BOOTCOMMAND \
 	"if mmc rescan ${mmcdev}; then " \
-		"if run loadbootscript; then " \
-			"run bootscript; " \
-		"else " \
-			"if run loaduimage; then " \
-				"run mmcboot; " \
-			"else run nandboot; " \
-			"fi; " \
-		"fi; " \
-	"else run nandboot; fi"
+		"echo SD/MMC found on device ${mmcdev};" \
+		"if run loadbootenv; then " \
+			"run importbootenv;" \
+		"fi;" \
+		"if test -n $uenvcmd; then " \
+			"echo Running uenvcmd ...;" \
+			"run uenvcmd;" \
+		"fi;" \
+		"if run loaduimage; then " \
+			"run mmcboot;" \
+		"fi;" \
+	"fi;" \
+	"run nandboot;" \
 
 #define CONFIG_AUTO_COMPLETE		1
 
diff --git a/include/configs/igep0030.h b/include/configs/igep0030.h
index 92144af..cb7194e 100644
--- a/include/configs/igep0030.h
+++ b/include/configs/igep0030.h
@@ -161,9 +161,9 @@
 		"omapdss.def_disp=${defaultdisplay} " \
 		"root=${nandroot} " \
 		"rootfstype=${nandrootfstype}\0" \
-	"loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \
-	"bootscript=echo Running bootscript from mmc ...; " \
-		"source ${loadaddr}\0" \
+	"loadbootenv=fatload mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \
+	"importbootenv=echo Importing environment from mmc ...; " \
+		"env import -t $loadaddr $filesize\0" \
 	"loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
 	"mmcboot=echo Booting from mmc ...; " \
 		"run mmcargs; " \
@@ -175,15 +175,19 @@
 
 #define CONFIG_BOOTCOMMAND \
 	"if mmc rescan ${mmcdev}; then " \
-		"if run loadbootscript; then " \
-			"run bootscript; " \
-		"else " \
-			"if run loaduimage; then " \
-				"run mmcboot; " \
-			"else run nandboot; " \
-			"fi; " \
-		"fi; " \
-	"else run nandboot; fi"
+		"echo SD/MMC found on device ${mmcdev};" \
+		"if run loadbootenv; then " \
+			"run importbootenv;" \
+		"fi;" \
+		"if test -n $uenvcmd; then " \
+			"echo Running uenvcmd ...;" \
+			"run uenvcmd;" \
+		"fi;" \
+		"if run loaduimage; then " \
+			"run mmcboot;" \
+		"fi;" \
+	"fi;" \
+	"run nandboot;" \
 
 #define CONFIG_AUTO_COMPLETE		1
 
-- 
1.7.0.4

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

* [U-Boot] [u-boot][PATCH 2/2] igep00x0: change mpurate from 500 to auto
  2011-05-25 14:19 [U-Boot] [u-boot][PATCH 0/2] igep00x0: updates for IGEP boards Enric Balletbo i Serra
  2011-05-25 14:19 ` [U-Boot] [u-boot][PATCH 1/2] igep00x0: enable the use of a plain text file Enric Balletbo i Serra
@ 2011-05-25 14:19 ` Enric Balletbo i Serra
  2012-04-25 12:34   ` [U-Boot] [PATCH v2 " Anatolij Gustschin
  2012-04-25 12:39 ` [U-Boot] [u-boot][PATCH 0/2] igep00x0: updates for IGEP boards Anatolij Gustschin
  2 siblings, 1 reply; 6+ messages in thread
From: Enric Balletbo i Serra @ 2011-05-25 14:19 UTC (permalink / raw)
  To: u-boot

This patch changes the default mpurate variable from 500 to auto on
all IGEP boards, with this the default rate is autoselected.

Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com>
---
 include/configs/igep0020.h |    2 +-
 include/configs/igep0030.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/configs/igep0020.h b/include/configs/igep0020.h
index afd9077..5d3060c 100644
--- a/include/configs/igep0020.h
+++ b/include/configs/igep0020.h
@@ -138,7 +138,7 @@
 	"loadaddr=0x82000000\0" \
 	"usbtty=cdc_acm\0" \
 	"console=ttyS2,115200n8\0" \
-	"mpurate=500\0" \
+	"mpurate=auto\0" \
 	"vram=12M\0" \
 	"dvimode=1024x768MR-16 at 60\0" \
 	"defaultdisplay=dvi\0" \
diff --git a/include/configs/igep0030.h b/include/configs/igep0030.h
index cb7194e..85d5d00 100644
--- a/include/configs/igep0030.h
+++ b/include/configs/igep0030.h
@@ -136,7 +136,7 @@
 	"loadaddr=0x82000000\0" \
 	"usbtty=cdc_acm\0" \
 	"console=ttyS2,115200n8\0" \
-	"mpurate=500\0" \
+	"mpurate=auto\0" \
 	"vram=12M\0" \
 	"dvimode=1024x768MR-16 at 60\0" \
 	"defaultdisplay=dvi\0" \
-- 
1.7.0.4

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

* [U-Boot] [PATCH v2 1/2] igep00x0: enable the use of a plain text file
  2011-05-25 14:19 ` [U-Boot] [u-boot][PATCH 1/2] igep00x0: enable the use of a plain text file Enric Balletbo i Serra
@ 2012-04-25 12:33   ` Anatolij Gustschin
  0 siblings, 0 replies; 6+ messages in thread
From: Anatolij Gustschin @ 2012-04-25 12:33 UTC (permalink / raw)
  To: u-boot

From: Enric Balletbo i Serra <eballetbo@iseebcn.com>

Based on commit cf073e49bc3502be1b48a0e3faf0cde9edbb89db for beagleboard

Using the new env import command it is possible to use plain text files instead
of script-images. Plain text files are much easier to handle.

E.g. If your boot.scr contains the following:
 -----------------------------------
setenv dvimode 1024x768-16 at 60
run loaduimage
run mmcboot
-----------------------------------
you could create a file named uEnv.txt and use that instead of boot.scr:
 -----------------------------------
dvimode=1024x768-16 at 60
uenvcmd=run loaduimage; run mmcboot
-----------------------------------
The variable uenvcmd (if existent) will be executed (using run) after uEnv.txt
was loaded. If uenvcmd doesn't exist the default boot sequence will be started,
therefore you could just use
-----------------------------------
dvimode=1024x768-16 at 60
-----------------------------------
as uEnv.txt because loaduimage and mmcboot is part of the default boot sequence

Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com>
Signed-off-by: Anatolij Gustschin <agust@denx.de>
---
v2:
 - rebased on u-boot-ti/master

 include/configs/igep00x0.h |   28 ++++++++++++++++------------
 1 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/include/configs/igep00x0.h b/include/configs/igep00x0.h
index d2b4b84..31ddabc 100644
--- a/include/configs/igep00x0.h
+++ b/include/configs/igep00x0.h
@@ -161,9 +161,9 @@
 		"omapdss.def_disp=${defaultdisplay} " \
 		"root=${nandroot} " \
 		"rootfstype=${nandrootfstype}\0" \
-	"loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \
-	"bootscript=echo Running bootscript from mmc ...; " \
-		"source ${loadaddr}\0" \
+	"loadbootenv=fatload mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \
+	"importbootenv=echo Importing environment from mmc ...; " \
+		"env import -t $loadaddr $filesize\0" \
 	"loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
 	"mmcboot=echo Booting from mmc ...; " \
 		"run mmcargs; " \
@@ -175,15 +175,19 @@
 
 #define CONFIG_BOOTCOMMAND \
 	"if mmc rescan ${mmcdev}; then " \
-		"if run loadbootscript; then " \
-			"run bootscript; " \
-		"else " \
-			"if run loaduimage; then " \
-				"run mmcboot; " \
-			"else run nandboot; " \
-			"fi; " \
-		"fi; " \
-	"else run nandboot; fi"
+		"echo SD/MMC found on device ${mmcdev};" \
+		"if run loadbootenv; then " \
+			"run importbootenv;" \
+		"fi;" \
+		"if test -n $uenvcmd; then " \
+			"echo Running uenvcmd ...;" \
+			"run uenvcmd;" \
+		"fi;" \
+		"if run loaduimage; then " \
+			"run mmcboot;" \
+		"fi;" \
+	"fi;" \
+	"run nandboot;" \
 
 #define CONFIG_AUTO_COMPLETE		1
 
-- 
1.7.1

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

* [U-Boot] [PATCH v2 2/2] igep00x0: change mpurate from 500 to auto
  2011-05-25 14:19 ` [U-Boot] [u-boot][PATCH 2/2] igep00x0: change mpurate from 500 to auto Enric Balletbo i Serra
@ 2012-04-25 12:34   ` Anatolij Gustschin
  0 siblings, 0 replies; 6+ messages in thread
From: Anatolij Gustschin @ 2012-04-25 12:34 UTC (permalink / raw)
  To: u-boot

From: Enric Balletbo i Serra <eballetbo@iseebcn.com>

This patch changes the default mpurate variable from 500 to auto on
all IGEP boards, with this the default rate is autoselected.

Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com>
Signed-off-by: Anatolij Gustschin <agust@denx.de>
---
v2:
 - rebased on u-boot-ti/master.

 include/configs/igep00x0.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/configs/igep00x0.h b/include/configs/igep00x0.h
index 31ddabc..a99f332 100644
--- a/include/configs/igep00x0.h
+++ b/include/configs/igep00x0.h
@@ -136,7 +136,7 @@
 	"loadaddr=0x82000000\0" \
 	"usbtty=cdc_acm\0" \
 	"console=ttyS2,115200n8\0" \
-	"mpurate=500\0" \
+	"mpurate=auto\0" \
 	"vram=12M\0" \
 	"dvimode=1024x768MR-16 at 60\0" \
 	"defaultdisplay=dvi\0" \
-- 
1.7.1

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

* [U-Boot] [u-boot][PATCH 0/2] igep00x0: updates for IGEP boards
  2011-05-25 14:19 [U-Boot] [u-boot][PATCH 0/2] igep00x0: updates for IGEP boards Enric Balletbo i Serra
  2011-05-25 14:19 ` [U-Boot] [u-boot][PATCH 1/2] igep00x0: enable the use of a plain text file Enric Balletbo i Serra
  2011-05-25 14:19 ` [U-Boot] [u-boot][PATCH 2/2] igep00x0: change mpurate from 500 to auto Enric Balletbo i Serra
@ 2012-04-25 12:39 ` Anatolij Gustschin
  2 siblings, 0 replies; 6+ messages in thread
From: Anatolij Gustschin @ 2012-04-25 12:39 UTC (permalink / raw)
  To: u-boot

Hello,

On Wed, 25 May 2011 16:19:17 +0200
Enric Balletbo i Serra <eballetbo@iseebcn.com> wrote:

> Hello,
> 
> This is a couple of patches to update the support for IGEP boards, please
> consider to adding.

Sorry for very long delay. These patches needed rebasing, I've included
Tom in Cc for v2, so these patches hopefully will be merged while
current merge window. Thanks!

Anatolij

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

end of thread, other threads:[~2012-04-25 12:39 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-05-25 14:19 [U-Boot] [u-boot][PATCH 0/2] igep00x0: updates for IGEP boards Enric Balletbo i Serra
2011-05-25 14:19 ` [U-Boot] [u-boot][PATCH 1/2] igep00x0: enable the use of a plain text file Enric Balletbo i Serra
2012-04-25 12:33   ` [U-Boot] [PATCH v2 " Anatolij Gustschin
2011-05-25 14:19 ` [U-Boot] [u-boot][PATCH 2/2] igep00x0: change mpurate from 500 to auto Enric Balletbo i Serra
2012-04-25 12:34   ` [U-Boot] [PATCH v2 " Anatolij Gustschin
2012-04-25 12:39 ` [U-Boot] [u-boot][PATCH 0/2] igep00x0: updates for IGEP boards Anatolij Gustschin

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.