[U-Boot] [PATCH v2 1/2] vf610twr: Add default environment in line with other Freescale boards

[U-Boot] [PATCH v2 1/2] vf610twr: Add default environment in line with other Freescale boards

[Otavio Salvador]

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
Changes in v2:
- fix console for ttymxc1 (Fabio)

 include/configs/vf610twr.h | 58 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h
index 77fe893..a944984 100644
--- a/include/configs/vf610twr.h
+++ b/include/configs/vf610twr.h
@@ -85,6 +85,64 @@
 
 #define CONFIG_SYS_TEXT_BASE		0x3f008000
 
+#define CONFIG_EXTRA_ENV_SETTINGS \
+	"script=boot.scr\0" \
+	"uimage=uImage\0" \
+	"console=ttymxc1\0" \
+	"initrd_high=0xffffffff\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" \
+	"mmcboot=echo Booting from mmc ...; " \
+		"run mmcargs; " \
+		"bootm\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}; " \
+		"bootm\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 */
-- 
1.8.3.1

[U-Boot] [PATCH v2 2/2] vf610twr: Remove SoC name from U-Boot prompt

[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 <otavio@ossystems.com.br>
---
Changes in v2: None

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

diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h
index a944984..bb1ccd6 100644
--- a/include/configs/vf610twr.h
+++ b/include/configs/vf610twr.h
@@ -147,7 +147,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		\
-- 
1.8.3.1

[U-Boot] [PATCH v2 1/2] vf610twr: Add default environment in line with other Freescale boards

[Fabio Estevam]

On Wed, Jun 26, 2013 at 2:12 PM, Otavio Salvador
<otavio@ossystems.com.br> wrote:

> +       "console=ttymxc1\0" \

Vybrid does not use the same serial driver as i.MX.

In the kernel the serial driver is this one:
https://git.kernel.org/cgit/linux/kernel/git/gregkh/tty.git/tree/drivers/tty/serial/fsl_lpuart.c?h=tty-next

,and the driver name is "ttyLP".

Vybrid starts numbering the UART ports from 0, so the device number in
Linux matches the hardware port number.

This means that the correct is "console=ttyLP1" for this board to boot
a mainline kernel.

[U-Boot] [PATCH v2 1/2] vf610twr: Add default environment in line with other Freescale boards

[Otavio Salvador]

On Wed, Jun 26, 2013 at 2:16 PM, Fabio Estevam <festevam@gmail.com> wrote:
> On Wed, Jun 26, 2013 at 2:12 PM, Otavio Salvador
> <otavio@ossystems.com.br> wrote:
>
>> +       "console=ttymxc1\0" \
>
> Vybrid does not use the same serial driver as i.MX.
>
> In the kernel the serial driver is this one:
> https://git.kernel.org/cgit/linux/kernel/git/gregkh/tty.git/tree/drivers/tty/serial/fsl_lpuart.c?h=tty-next
>
> ,and the driver name is "ttyLP".
>
> Vybrid starts numbering the UART ports from 0, so the device number in
> Linux matches the hardware port number.
>
> This means that the correct is "console=ttyLP1" for this board to boot
> a mainline kernel.

This is being done using Timesys kernel as reference; so I did used
his kernel as reference.

This is the kernel which has been send for inclusion in Yocto BSP so I
think I will stay with it for now.

--
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://projetos.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

[U-Boot] [PATCH v2 1/2] vf610twr: Add default environment in line with other Freescale boards

[Fabio Estevam]

On Wed, Jun 26, 2013 at 2:19 PM, Otavio Salvador
<otavio@ossystems.com.br> wrote:

> This is being done using Timesys kernel as reference; so I did used
> his kernel as reference.

So it is better to fix the tty driver name in the Timesys kernel to
ttyLP then, instead of adding a console option that is incorrect.

[U-Boot] [PATCH v2 1/2] vf610twr: Add default environment in line with other Freescale boards

[Otavio Salvador]

On Wed, Jun 26, 2013 at 2:27 PM, Fabio Estevam <festevam@gmail.com> wrote:
> On Wed, Jun 26, 2013 at 2:19 PM, Otavio Salvador
> <otavio@ossystems.com.br> wrote:
>
>> This is being done using Timesys kernel as reference; so I did used
>> his kernel as reference.
>
> So it is better to fix the tty driver name in the Timesys kernel to
> ttyLP then, instead of adding a console option that is incorrect.

Yes; I think I agree. Mostly like we did for mxs in Freescale kernel.
Andy, can you check it?

--
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://projetos.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

[U-Boot] [PATCH v2 1/2] vf610twr: Add default environment in line with other Freescale boards

[Stefano Babic]

Hi Otavio, hi Alison,

On 26/06/2013 19:12, Otavio Salvador wrote:
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---

both patches are slight changes - if I get an ACK by Alison as board
maintainer, I could still push them before my PR for the release.

Thanks,
Stefano

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

[U-Boot] [PATCH v2 1/2] vf610twr: Add default environment in line with other Freescale boards

[Wang Huan-B18965]

Hi, stefano,

    I am ok with the default environment changes. But the sys text base should not be changed, otherwise the u-boot could not work. The reason I have explained in the other email.


Best Regards,
Alison Wang


> -----Original Message-----
> From: Stefano Babic [mailto:sbabic at denx.de]
> Sent: Thursday, June 27, 2013 3:11 PM
> To: Otavio Salvador
> Cc: U-Boot Mailing List; Stefano Babic; Estevam Fabio-R49496; Wang
> Huan-B18965
> Subject: Re: [PATCH v2 1/2] vf610twr: Add default environment in line
> with other Freescale boards
> 
> Hi Otavio, hi Alison,
> 
> On 26/06/2013 19:12, Otavio Salvador wrote:
> > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> > ---
> 
> both patches are slight changes - if I get an ACK by Alison as board
> maintainer, I could still push them before my PR for the release.
> 
> Thanks,
> Stefano
> 
> --
> =====================================================================
> 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
> =====================================================================

[U-Boot] [PATCH v2 1/2] vf610twr: Add default environment in line with other Freescale boards

[Stefano Babic]

Hi Alison,

On 27/06/2013 10:00, Wang Huan-B18965 wrote:
> Hi, stefano,
> 
>     I am ok with the default environment changes. But the sys text base should not be changed, otherwise the u-boot could not work. The reason I have explained in the other email.

Of course, and I will not apply the patches until there are open comments.

Regards,
Stefano


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

[U-Boot] [PATCH v2 1/2] vf610twr: Add default environment in line with other Freescale boards

[Otavio Salvador]

On Thu, Jun 27, 2013 at 5:58 AM, Stefano Babic <sbabic@denx.de> wrote:
> On 27/06/2013 10:00, Wang Huan-B18965 wrote:
>> Hi, stefano,
>>
>>     I am ok with the default environment changes. But the sys text base should not be changed, otherwise the u-boot could not work. The reason I have explained in the other email.
>
> Of course, and I will not apply the patches until there are open comments.

I will fix this. As I don't have the board can you, Alison, provide me
the right loadaddr and fdt_addr? So we avoid many revisions.

--
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://projetos.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750