vf610twr: Add default environment in line with other Freescale boards

PATCH New Otavio Salvador 3 participants 6 messages Jun 28, 2013

lore

Share & tools

lore

Otavio Salvador

author

2013-06-28 12:52 UTC #0 lore raw

PATCH v5 1/2 vf610twr: Add default environment in line with other Freescale boards

This adds a default environment which should be able to support both 3.0.15 from Timesys and upcoming 3.11.

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

---
Changes in v5:
- remove mem=128M param (Alison/Andy/Fabio)

Changes in v4:
- revert sys text address change (Alison)
- add mem=128M to bootargs/netargs (Andy)

Changes in v3:
- add dt boot support
- use ttyLP1 as console
- change loadaddr and sys text as iMX6SL
- NOTE: It needs to be boot tested as I don't have the board

Changes in v2:
- fix console for ttymxc1 (Fabio)

 include/configs/vf610twr.h | 91 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 89 insertions(+), 2 deletions(-)

include/configs/vf610twr.h +89 -2

index 77fe893..af772ca 100644
@@ -83,8 +83,96 @@
 
 #define CONFIG_BOOTDELAY		3
 
+#define CONFIG_LOADADDR			0x82000000
 #define CONFIG_SYS_TEXT_BASE		0x3f008000
 
+#define CONFIG_EXTRA_ENV_SETTINGS \
+	"script=boot.scr\0" \
+	"uimage=uImage\0" \
+	"console=ttyLP1\0" \
+	"fdt_high=0xffffffff\0" \
+	"initrd_high=0xffffffff\0" \
+	"fdt_file=vf610-twr.dtb\0" \
+	"fdt_addr=0x81000000\0" \
+	"boot_fdt=try\0" \
+	"ip_dyn=yes\0" \
+	"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
+	"mmcpart=1\0" \
+	"mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
+	"update_sd_firmware_filename=u-boot.imx\0" \
+	"update_sd_firmware=" \
+		"if test ${ip_dyn} = yes; then " \
+			"setenv get_cmd dhcp; " \
+		"else " \
+			"setenv get_cmd tftp; " \
+		"fi; " \
+		"if mmc dev ${mmcdev}; then "	\
+			"if ${get_cmd} ${update_sd_firmware_filename}; then " \
+				"setexpr fw_sz ${filesize} / 0x200; " \
+				"setexpr fw_sz ${fw_sz} + 1; "	\
+				"mmc write ${loadaddr} 0x2 ${fw_sz}; " \
+			"fi; "	\
+		"fi\0" \
+	"mmcargs=setenv bootargs console=${console},${baudrate} " \
+		"root=${mmcroot}\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" \
+	"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
+	"mmcboot=echo Booting from mmc ...; " \
+		"run mmcargs; " \
+		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
+			"if run loadfdt; then " \
+				"bootm ${loadaddr} - ${fdt_addr}; " \
+			"else " \
+				"if test ${boot_fdt} = try; then " \
+					"bootm; " \
+				"else " \
+					"echo WARN: Cannot load the DT; " \
+				"fi; " \
+			"fi; " \
+		"else " \
+			"bootm; " \
+		"fi;\0" \
+	"netargs=setenv bootargs console=${console},${baudrate} " \
+		"root=/dev/nfs " \
+	"ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
+		"netboot=echo Booting from net ...; " \
+		"run netargs; " \
+		"if test ${ip_dyn} = yes; then " \
+			"setenv get_cmd dhcp; " \
+		"else " \
+			"setenv get_cmd tftp; " \
+		"fi; " \
+		"${get_cmd} ${uimage}; " \
+		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
+			"if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
+				"bootm ${loadaddr} - ${fdt_addr}; " \
+			"else " \
+				"if test ${boot_fdt} = try; then " \
+					"bootm; " \
+				"else " \
+					"echo WARN: Cannot load the DT; " \
+				"fi; " \
+			"fi; " \
+		"else " \
+			"bootm; " \
+		"fi;\0"
+
+#define CONFIG_BOOTCOMMAND \
+	   "mmc dev ${mmcdev}; if mmc rescan; then " \
+		   "if run loadbootscript; then " \
+			   "run bootscript; " \
+		   "else " \
+			   "if run loaduimage; then " \
+				   "run mmcboot; " \
+			   "else run netboot; " \
+			   "fi; " \
+		   "fi; " \
+	   "else run netboot; fi"
+
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 #define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser */

@@ -101,8 +189,7 @@
 #define CONFIG_SYS_MEMTEST_START	0x80010000
 #define CONFIG_SYS_MEMTEST_END		0x87C00000
 
-#define CONFIG_SYS_LOAD_ADDR		0x80010000
-
+#define CONFIG_SYS_LOAD_ADDR		CONFIG_LOADADDR
 #define CONFIG_SYS_HZ			1000
 
 /*

Signature · 1 line

1.8.3.1

Otavio Salvador

author

2013-06-28 12:53 UTC #1 lore raw

PATCH v5 2/2 vf610twr: Remove SoC name from U-Boot prompt

We've been dropping SoC name from U-Boot prompt as it increase complexity for automatic testing and makes line longer for no good reason.

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

---
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None

 include/configs/vf610twr.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

include/configs/vf610twr.h +1 -1

index af772ca..5012fc8 100644
@@ -177,7 +177,7 @@
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
 #define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser */
 #define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#define CONFIG_SYS_PROMPT		"Vybrid U-Boot > "
+#define CONFIG_SYS_PROMPT		"=> "
 #undef CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE		\

Signature · 1 line

1.8.3.1

Andy Voltz

2013-06-28 13:07 UTC #2 lore raw

PATCH v5 2/2 vf610twr: Remove SoC name from U-Boot prompt

Quoted 5 lines · Otavio Salvador

We've been dropping SoC name from U-Boot prompt as it increase complexity for automatic testing and makes line longer for no good reason.
Signed-off-by Otavio Salvador <[email protected]>

Tested-by Andy Voltz <[email protected]>

Signature · 2 lines

Andy Voltz
Timesys Corporation

Stefano Babic

2013-06-28 15:00 UTC #3 lore raw

PATCH v5 2/2 vf610twr: Remove SoC name from U-Boot prompt

In reply to Otavio Salvador

Quoted 6 lines · Otavio Salvador

We've been dropping SoC name from U-Boot prompt as it increase complexity for automatic testing and makes line longer for no good reason.
Signed-off-by Otavio Salvador <[email protected]>
---

Applied to u-boot-imx, thanks !

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
=====================================================================

Andy Voltz

2013-06-28 13:06 UTC #4 lore raw

PATCH v5 1/2 vf610twr: Add default environment in line with other Freescale boards

In reply to Otavio Salvador

Quoted 5 lines · Otavio Salvador

This adds a default environment which should be able to support both 3.0.15 from Timesys and upcoming 3.11.
Signed-off-by Otavio Salvador <[email protected]>
---

I boot tested these patches using a yocto build. With our kernel I interrupted the autoboot and override mmcargs to include mem=128M argument.

Then I replaced kernel on the SD card with a linux-next uImage & dtb. That worked without any change to the environment.

For both tests I used twr-vf65gs10 tower kit.

Tested-by Andy Voltz <[email protected]>

Regards

Signature · 2 lines

Andy Voltz
Timesys Corporation

Stefano Babic

2013-06-28 15:00 UTC #5 lore raw

PATCH v5 1/2 vf610twr: Add default environment in line with other Freescale boards

In reply to Otavio Salvador

Quoted 5 lines · Otavio Salvador

This adds a default environment which should be able to support both 3.0.15 from Timesys and upcoming 3.11.
Signed-off-by Otavio Salvador <[email protected]>
---

Applied to u-boot-imx, thanks !

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
=====================================================================