mx28evk: extend default environment

PATCH New Fabio Estevam 4 participants 8 messages May 10, 2012 – May 11, 2012 Arm (32-bit)

lore

Share & tools

lore

Fabio Estevam

author

2012-05-10 13:27 UTC #0 lore raw

PATCH 1/2 mx28evk: extend default environment

From: Otavio Salvador <[email protected]>

The environment has been based on mx53loco but keeping the possibility to easy change the default console device as Freescale and mainline kernels differ on the device name.

Signed-off-by Otavio Salvador <[email protected]>

Cc Fabio Estevam <[email protected]>

Cc Stefano Babic <[email protected]>

---
 include/configs/mx28evk.h |   44 ++++++++++++++++++++++++++++++++++++++------
 1 file changed, 38 insertions(+), 6 deletions(-)

include/configs/mx28evk.h +38 -6

index 02f3366..b165285 100644
@@ -222,7 +222,7 @@
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_BOOTDELAY	3
 #define CONFIG_BOOTFILE	"uImage"
-#define CONFIG_BOOTCOMMAND	"run bootcmd_net"
+
 #define CONFIG_LOADADDR	0x42000000
 #define CONFIG_SYS_LOAD_ADDR	CONFIG_LOADADDR

@@ -230,13 +230,45 @@
  * Extra Environments
  */
 #define CONFIG_EXTRA_ENV_SETTINGS \
-	"console_fsl=console=ttyAM0" \
-	"console_mainline=console=ttyAMA0" \
-	"netargs=setenv bootargs console=${console_mainline}" \
+	"script=boot.scr\0" \
+	"uimage=uImage\0" \
+	"console_fsl=ttyAM0\0" \
+	"console_mainline=ttyAMA0\0" \
+	"console=${console_mainline}\0" \
+	"mmcdev=0\0" \
+	"mmcpart=2\0" \
+	"mmcroot=/dev/mmcblk0p3 rw\0" \
+	"mmcrootfstype=ext3 rootwait\0" \
+	"mmcargs=setenv bootargs console=${console},${baudrate} " \
+		"root=${mmcroot} " \
+		"rootfstype=${mmcrootfstype}\0" \
+	"loadbootscript=" \
+		"fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
+	"bootscript=echo Running bootscript from mmc ...; " \
+		"source\0" \
+	"loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
+	"mmcboot=echo Booting from mmc ...; " \
+		"run mmcargs; " \
+		"bootm\0" \
+	"netargs=setenv bootargs console=${console},${baudrate} " \
 		"root=/dev/nfs " \
-		"ip=dhcp nfsroot=${serverip}:${nfsroot}\0" \
-	"bootcmd_net=echo Booting from net ...; " \
+		"ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
+	"netboot=echo Booting from net ...; " \
 		"run netargs; " \
 		"dhcp ${uimage}; bootm\0" \
+/*
+ * Default Boot command
+ */
+#define CONFIG_BOOTCOMMAND \
+	"if mmc rescan ${mmcdev}; then " \
+		"if run loadbootscript; then " \
+			"run bootscript; " \
+		"else " \
+			"if run loaduimage; then " \
+				"run mmcboot; " \
+			"else run netboot; " \
+			"fi; " \
+		"fi; " \
+	"else run netboot; fi"
 
 #endif /* __CONFIG_H */

Signature · 1 line

1.7.10

Fabio Estevam

author

2012-05-10 13:27 UTC #1 lore raw

PATCH 2/2 MX28: Fix a typo in mx28_reg_8 macro

From: Otavio Salvador <[email protected]>

The macro mistakenly referred to 32bit struct instead of 8bit one.

Signed-off-by Otavio Salvador <[email protected]>

Cc Fabio Estevam <[email protected]>

Cc Marek Vasut <[email protected]>

---
 arch/arm/include/asm/arch-mx28/regs-common.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

arch/arm/include/asm/arch-mx28/regs-common.h +1 -1

index 94b512d..d2e1953 100644
@@ -70,7 +70,7 @@ struct mx28_register_32 {
 #define	mx28_reg_8(name)				\
 	union {						\
 		struct { __mx28_reg_8(name) };		\
-		struct mx28_register_32 name##_reg;	\
+		struct mx28_register_8 name##_reg;	\
 	};
 
 #define	mx28_reg_32(name)				\

Signature · 1 line

1.7.10

Otavio Salvador

2012-05-11 13:54 UTC #3 lore raw

PATCH 1/2 mx28evk: extend default environment

Quoted 8 lines · Marek Vasut

Dear Fabio Estevam,
Quoted 6 lines
From: Otavio Salvador <[email protected]>
The environment has been based on mx53loco but keeping the possibility to easy change the default console device as Freescale and mainline kernels differ on the device name.

Quoted 6 lines

Quoted 3 lines
Signed-off-by Otavio Salvador <[email protected]>
Cc Fabio Estevam <[email protected]>
Cc Stefano Babic <[email protected]>
Can we possibly unify it with what's already in m28evk? Also, it'd be cool if we had some default -- very generic -- env. Can we go in that direction?

I have prepared a set of commits in this direction. Please take a look at:

https://github.com/otavio/u-boot/commit/5745dfbfa1bd69b23c73dc3d2b2c2932c338e750
https://github.com/otavio/u-boot/commit/d8b1ea575177038f6e37f28563f00c9260016ac9

Is that what you expect? I want to put sdcard based update commands before sending it for merging.

Signature · 3 lines

Otavio Salvador? ? ? ? ? ? ? ? ? ? ? ? ? ? ?O.S. Systems
E-mail: otavio at ossystems.com.br? http://www.ossystems.com.br
Mobile: +55 53 9981-7854? ? ? ?? ? ? ?http://projetos.ossystems.com.br

Otavio Salvador

2012-05-11 14:10 UTC #4 lore raw

PATCH 1/2 mx28evk: extend default environment

Quoted 10 lines · Otavio Salvador

Quoted 2 lines
Can we possibly unify it with what's already in m28evk? Also, it'd be cool if we had some default -- very generic -- env. Can we go in that direction?
I have prepared a set of commits in this direction. Please take a look at:
https://github.com/otavio/u-boot/commit/5745dfbfa1bd69b23c73dc3d2b2c2932c338e750
https://github.com/otavio/u-boot/commit/d8b1ea575177038f6e37f28563f00c9260016ac9
Is that what you expect? I want to put sdcard based update commands before sending it for merging.

Fabio has pointed a example for me of 'magnesium' board config. Is it what you expect? it does make sense for me to make a common header file for both boards and others that might come later.

Signature · 3 lines

Otavio Salvador? ? ? ? ? ? ? ? ? ? ? ? ? ? ?O.S. Systems
E-mail: otavio at ossystems.com.br? http://www.ossystems.com.br
Mobile: +55 53 9981-7854? ? ? ?? ? ? ?http://projetos.ossystems.com.br

Marek Vasut

2012-05-11 14:15 UTC #5 lore raw

PATCH 1/2 mx28evk: extend default environment

Dear Otavio Salvador,

Quoted 15 lines

On Fri, May 11, 2012 at 10:54 AM, Otavio Salvador
Quoted 12 lines · <[email protected]> wrote:
Quoted 3 lines
Can we possibly unify it with what's already in m28evk? Also, it'd be cool if we had some default -- very generic -- env. Can we go in that direction?
I have prepared a set of commits in this direction. Please take a look at:
https://github.com/otavio/u-boot/commit/5745dfbfa1bd69b23c73dc3d2b2c2932c
338e750
https://github.com/otavio/u-boot/commit/d8b1ea575177038f6e37f28563f00c92
60016ac9

Quoted 6 lines

Quoted 2 lines
Is that what you expect? I want to put sdcard based update commands before sending it for merging.
Fabio has pointed a example for me of 'magnesium' board config. Is it what you expect? it does make sense for me to make a common header file for both boards and others that might come later.

Something like that, but you're missing update_sd_firmware ;-)

Best regards,
Marek Vasut

Stefano Babic

2012-05-11 14:25 UTC #6 lore raw

PATCH 1/2 mx28evk: extend default environment

In reply to Otavio Salvador

Quoted 5 lines · Otavio Salvador

Quoted 3 lines · Otavio Salvador
Quoted 2 lines
Can we possibly unify it with what's already in m28evk? Also, it'd be cool if we had some default -- very generic -- env. Can we go in that direction?

Quoted 8 lines

Quoted 7 lines
I have prepared a set of commits in this direction. Please take a look at:
https://github.com/otavio/u-boot/commit/5745dfbfa1bd69b23c73dc3d2b2c2932c338e750
https://github.com/otavio/u-boot/commit/d8b1ea575177038f6e37f28563f00c9260016ac9
Is that what you expect? I want to put sdcard based update commands before sending it for merging.

Hi Otavio,

Quoted 3 lines

Fabio has pointed a example for me of 'magnesium' board config. Is it what you expect? it does make sense for me to make a common header file for both boards and others that might come later.

This is an example, but the imx27lite and the magnesium are very close. Of course, you could prepare some kind of mx28-common, that all boards can include.

Another example is amcc-common.h for PowerPC 4xx. Up now we have not a real "common" environment, that spreads among boards. Each board defines its own set - it is not bad to define some common scripts, that a board maintainer can use.

Best regards,
Stefano Babic

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

Otavio Salvador

2012-05-11 14:31 UTC #7 lore raw

PATCH 1/2 mx28evk: extend default environment

Quoted 4 lines · Stefano Babic

Another example is amcc-common.h ?for PowerPC 4xx. Up now we have not a real "common" environment, that spreads among boards. Each board defines its own set - it is not bad to define some common scripts, that a board maintainer can use.

Right; I will work on that.

Signature · 3 lines

Otavio Salvador? ? ? ? ? ? ? ? ? ? ? ? ? ? ?O.S. Systems
E-mail: otavio at ossystems.com.br? http://www.ossystems.com.br
Mobile: +55 53 9981-7854? ? ? ?? ? ? ?http://projetos.ossystems.com.br