On Thu, Jun 27, 2013 at 10:59 PM, Otavio Salvador otavio@ossystems.com.br 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

Changes in v4:

• revert sys text address change (Alison)
• add mem=128M to bootargs/netargs (Andy)

Just curious: why do we need to pass mem=128M?

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..9474aeb 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} mem=128M\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 mem=128M " \
  

•   "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

---

U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot