* [U-Boot] [PATCH v5 1/2] vf610twr: Add default environment in line with other Freescale boards
@ 2013-06-28 12:52 Otavio Salvador
2013-06-28 12:53 ` [U-Boot] [PATCH v5 2/2] vf610twr: Remove SoC name from U-Boot prompt Otavio Salvador
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Otavio Salvador @ 2013-06-28 12:52 UTC (permalink / raw)
To: u-boot
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 <otavio@ossystems.com.br>
---
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(-)
diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h
index 77fe893..af772ca 100644
--- a/include/configs/vf610twr.h
+++ b/include/configs/vf610twr.h
@@ -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
/*
--
1.8.3.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH v5 2/2] vf610twr: Remove SoC name from U-Boot prompt
2013-06-28 12:52 [U-Boot] [PATCH v5 1/2] vf610twr: Add default environment in line with other Freescale boards Otavio Salvador
@ 2013-06-28 12:53 ` Otavio Salvador
2013-06-28 13:07 ` Andy Voltz
2013-06-28 15:00 ` Stefano Babic
2013-06-28 13:06 ` [U-Boot] [PATCH v5 1/2] vf610twr: Add default environment in line with other Freescale boards Andy Voltz
2013-06-28 15:00 ` Stefano Babic
2 siblings, 2 replies; 6+ messages in thread
From: Otavio Salvador @ 2013-06-28 12:53 UTC (permalink / raw)
To: u-boot
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 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(-)
diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h
index af772ca..5012fc8 100644
--- a/include/configs/vf610twr.h
+++ b/include/configs/vf610twr.h
@@ -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 \
--
1.8.3.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH v5 1/2] vf610twr: Add default environment in line with other Freescale boards
2013-06-28 12:52 [U-Boot] [PATCH v5 1/2] vf610twr: Add default environment in line with other Freescale boards Otavio Salvador
2013-06-28 12:53 ` [U-Boot] [PATCH v5 2/2] vf610twr: Remove SoC name from U-Boot prompt Otavio Salvador
@ 2013-06-28 13:06 ` Andy Voltz
2013-06-28 15:00 ` Stefano Babic
2 siblings, 0 replies; 6+ messages in thread
From: Andy Voltz @ 2013-06-28 13:06 UTC (permalink / raw)
To: u-boot
On Fri, Jun 28, 2013 at 08:52:59AM -0400, Otavio Salvador wrote:
> 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 <otavio@ossystems.com.br>
> ---
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 <andy.voltz@timesys.com>
Regards
--
Andy Voltz
Timesys Corporation
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH v5 2/2] vf610twr: Remove SoC name from U-Boot prompt
2013-06-28 12:53 ` [U-Boot] [PATCH v5 2/2] vf610twr: Remove SoC name from U-Boot prompt Otavio Salvador
@ 2013-06-28 13:07 ` Andy Voltz
2013-06-28 15:00 ` Stefano Babic
1 sibling, 0 replies; 6+ messages in thread
From: Andy Voltz @ 2013-06-28 13:07 UTC (permalink / raw)
To: u-boot
On Fri, Jun 28, 2013 at 08:53:00AM -0400, Otavio Salvador wrote:
> 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>
Tested-by: Andy Voltz <andy.voltz@timesys.com>
--
Andy Voltz
Timesys Corporation
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH v5 2/2] vf610twr: Remove SoC name from U-Boot prompt
2013-06-28 12:53 ` [U-Boot] [PATCH v5 2/2] vf610twr: Remove SoC name from U-Boot prompt Otavio Salvador
2013-06-28 13:07 ` Andy Voltz
@ 2013-06-28 15:00 ` Stefano Babic
1 sibling, 0 replies; 6+ messages in thread
From: Stefano Babic @ 2013-06-28 15:00 UTC (permalink / raw)
To: u-boot
On 28/06/2013 14:53, Otavio Salvador wrote:
> 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>
> ---
Applied to u-boot-imx, thanks !
Best regards,
Stefano Babic
--
=====================================================================
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
=====================================================================
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH v5 1/2] vf610twr: Add default environment in line with other Freescale boards
2013-06-28 12:52 [U-Boot] [PATCH v5 1/2] vf610twr: Add default environment in line with other Freescale boards Otavio Salvador
2013-06-28 12:53 ` [U-Boot] [PATCH v5 2/2] vf610twr: Remove SoC name from U-Boot prompt Otavio Salvador
2013-06-28 13:06 ` [U-Boot] [PATCH v5 1/2] vf610twr: Add default environment in line with other Freescale boards Andy Voltz
@ 2013-06-28 15:00 ` Stefano Babic
2 siblings, 0 replies; 6+ messages in thread
From: Stefano Babic @ 2013-06-28 15:00 UTC (permalink / raw)
To: u-boot
On 28/06/2013 14:52, Otavio Salvador wrote:
> 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 <otavio@ossystems.com.br>
> ---
Applied to u-boot-imx, thanks !
Best regards,
Stefano Babic
--
=====================================================================
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
=====================================================================
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-06-28 15:00 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-06-28 12:52 [U-Boot] [PATCH v5 1/2] vf610twr: Add default environment in line with other Freescale boards Otavio Salvador
2013-06-28 12:53 ` [U-Boot] [PATCH v5 2/2] vf610twr: Remove SoC name from U-Boot prompt Otavio Salvador
2013-06-28 13:07 ` Andy Voltz
2013-06-28 15:00 ` Stefano Babic
2013-06-28 13:06 ` [U-Boot] [PATCH v5 1/2] vf610twr: Add default environment in line with other Freescale boards Andy Voltz
2013-06-28 15:00 ` Stefano Babic
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.