vf610twr: Update board config headers.

The following updates were made to the vf610twr (MMC) config:

*Add NAND config options
   -Necessary for NAND interface to come up when booting Linux

The following updates were made to the vf610twr and vf610twr_nand configs:

*Set CONFIG_SYS_CACHELINE_SIZE to 64
   -MMC reads do not work when set to 32
*Unset USB Gadget config options
*Move sys malloc length from board file to these config headers
*Enable ethernet interface
*Update u-boot environment variables to be more suitable for Vybrid Tower
*Fix DDR config settings

Signed-off-by: Anthony Felice <tony.felice@timesys.com>

include/configs/vf610twr.h

@@ -26,7 +26,10 @@
 #include <config_cmd_default.h>
 
 #define CONFIG_VF610
+#define CONFIG_SYS_ICACHE_OFF
+#define CONFIG_SYS_CACHELINE_SIZE 64
 
+#if 0
 #define CONFIG_USB_GADGET
 #define CONFIG_USB_GADGET_DUALSPEED
 #define CONFIG_USB_GADGET_ARCOTG_UDC
@@ -34,13 +37,11 @@
 #define CONFIG_USBDOWNLOAD_GADGET
 #define CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USB_GADGET_VBUS_DRAW 2
-#define CONFIG_SYS_CACHELINE_SIZE 32
 #define CONFIG_G_DNL_VENDOR_NUM 0x066f
 #define CONFIG_G_DNL_PRODUCT_NUM 0x37ff
 #define CONFIG_G_DNL_MANUFACTURER "Freescale"
 #define CONFIG_DFU_FUNCTION
 #define CONFIG_FSL_UTP
-#if 0
 #define CONFIG_USB_DEVICE
 #define CONFIG_IMX_UDC                 1
 #define CONFIG_FASTBOOT                1
@@ -67,6 +68,20 @@
 #define CONFIG_ANDROID_CACHE_PARTITION_MMC 6
 #endif
 
+/*
+ * NAND FLASH
+ */
+#define CONFIG_CMD_NAND
+#ifdef CONFIG_CMD_NAND
+#define CONFIG_JFFS2_NAND
+#define CONFIG_NAND_FSL_NFC
+#define CONFIG_SYS_NAND_BASE            0x400E0000
+#define CONFIG_SYS_MAX_NAND_DEVICE      1
+#define NAND_MAX_CHIPS                  CONFIG_SYS_MAX_NAND_DEVICE
+#define CONFIG_SYS_NAND_SELECT_DEVICE
+#define CONFIG_SYS_64BIT_VSPRINTF       /* needed for nand_util.c */
+#endif
+
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
 
@@ -83,7 +98,7 @@
 #endif
 
 /* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN		(16<<10)
+#define CONFIG_SYS_MALLOC_LEN		(256<<10)
 
 #define CONFIG_BOARD_EARLY_INIT_F
 
@@ -109,7 +124,6 @@
 #define CONFIG_CMD_FAT
 #define CONFIG_DOS_PARTITION
 
-#if 0
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_MII
@@ -121,18 +135,16 @@
 #define CONFIG_FEC_MXC_PHYADDR          0
 #define CONFIG_PHYLIB
 #define CONFIG_PHY_MICREL
-#endif
+#define CONFIG_ETHADDR			00:e0:0c:bc:e5:60
+#define CONFIG_BOOTDELAY		3
 
-#define CONFIG_BOOTDELAY		0
-
-#define CONFIG_LOADADDR			0x3f400000
+#define CONFIG_LOADADDR			0x80010000
 #define CONFIG_SYS_TEXT_BASE		0x3f000800
 
-/*
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"uimage=uImage\0" \
-	"console=ttyLP1\0" \
+	"console=ttymxc1\0" \
 	"fdt_high=0xffffffff\0" \
 	"initrd_high=0xffffffff\0" \
 	"fdt_file=vf610-twr.dtb\0" \
@@ -215,8 +227,6 @@
 			   "fi; " \
 		   "fi; " \
 	   "else run netboot; fi"
-*/
-#define CONFIG_BOOTCOMMAND "ums 0"
 
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
@@ -231,8 +241,8 @@
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
 
 #define CONFIG_CMD_MEMTEST
-#define CONFIG_SYS_MEMTEST_START	0x3f400000
-#define CONFIG_SYS_MEMTEST_END		0x3f480000
+#define CONFIG_SYS_MEMTEST_START	0x80010000
+#define CONFIG_SYS_MEMTEST_END		0x87C00000
 
 #define CONFIG_SYS_LOAD_ADDR		CONFIG_LOADADDR
 #define CONFIG_SYS_HZ			1000
@@ -245,8 +255,8 @@
 
 /* Physical memory map */
 #define CONFIG_NR_DRAM_BANKS		1
-#define PHYS_SDRAM			(0x3f440000)
-#define PHYS_SDRAM_SIZE			(256 * 1024)
+#define PHYS_SDRAM			(0x80000000)
+#define PHYS_SDRAM_SIZE			(128 * 1024 * 1024)
 
 #define CONFIG_SYS_SDRAM_BASE		PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR	IRAM_BASE_ADDR
@@ -261,8 +271,8 @@
 #define CONFIG_SYS_NO_FLASH
 
 #define CONFIG_ENV_SIZE			(8 * 1024)
-#undef CONFIG_ENV_IS_IN_MMC
-#define CONFIG_ENV_IS_NOWHERE
+#define CONFIG_ENV_IS_IN_MMC
+#undef CONFIG_ENV_IS_NOWHERE
 
 #define CONFIG_ENV_OFFSET		(12 * 64 * 1024)
 #define CONFIG_SYS_MMC_ENV_DEV		0

include/configs/vf610twr_nand.h

@@ -26,7 +26,10 @@
 #include <config_cmd_default.h>
 
 #define CONFIG_VF610
+#define CONFIG_SYS_ICACHE_OFF
+#define CONFIG_SYS_CACHELINE_SIZE 64
 
+#if 0
 #define CONFIG_USB_GADGET
 #define CONFIG_USB_GADGET_DUALSPEED
 #define CONFIG_USB_GADGET_ARCOTG_UDC
@@ -34,13 +37,11 @@
 #define CONFIG_USBDOWNLOAD_GADGET
 #define CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USB_GADGET_VBUS_DRAW 2
-#define CONFIG_SYS_CACHELINE_SIZE 32
 #define CONFIG_G_DNL_VENDOR_NUM 0x066f
 #define CONFIG_G_DNL_PRODUCT_NUM 0x37ff
 #define CONFIG_G_DNL_MANUFACTURER "Freescale"
 #define CONFIG_DFU_FUNCTION
 #define CONFIG_FSL_UTP
-#if 0
 #define CONFIG_USB_DEVICE
 #define CONFIG_IMX_UDC                 1
 #define CONFIG_FASTBOOT                1
@@ -83,7 +84,7 @@
 #endif
 
 /* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN		(16<<10)
+#define CONFIG_SYS_MALLOC_LEN		(256<<10)
 
 #define CONFIG_BOARD_EARLY_INIT_F
 
@@ -109,7 +110,6 @@
 #define CONFIG_CMD_FAT
 #define CONFIG_DOS_PARTITION
 
-#if 0
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_MII
@@ -121,25 +121,23 @@
 #define CONFIG_FEC_MXC_PHYADDR          0
 #define CONFIG_PHYLIB
 #define CONFIG_PHY_MICREL
-#endif
-
-#define CONFIG_BOOTDELAY		0
+#define CONFIG_ETHADDR			00:e0:0c:bc:e5:60
+#define CONFIG_BOOTDELAY		3
 
-#define CONFIG_LOADADDR			0x3f400000
+#define CONFIG_LOADADDR			0x80010000
 #define CONFIG_SYS_TEXT_BASE		0x3f001400
 
-/*
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"uimage=uImage\0" \
-	"console=ttyLP1\0" \
+	"console=ttymxc1\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" \
+	"mmcdev=0\0" \
 	"mmcpart=1\0" \
 	"mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
 	"update_sd_firmware_filename=u-boot.imx\0" \
@@ -215,8 +213,6 @@
 			   "fi; " \
 		   "fi; " \
 	   "else run netboot; fi"
-*/
-#define CONFIG_BOOTCOMMAND "nand erase.chip; ums 0"
 
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_LONGHELP		/* undef to save memory */
@@ -231,8 +227,8 @@
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
 
 #define CONFIG_CMD_MEMTEST
-#define CONFIG_SYS_MEMTEST_START	0x3f400000
-#define CONFIG_SYS_MEMTEST_END		0x3f480000
+#define CONFIG_SYS_MEMTEST_START	0x80010000
+#define CONFIG_SYS_MEMTEST_END		0x87C00000
 
 #define CONFIG_SYS_LOAD_ADDR		CONFIG_LOADADDR
 #define CONFIG_SYS_HZ			1000
@@ -245,8 +241,8 @@
 
 /* Physical memory map */
 #define CONFIG_NR_DRAM_BANKS		1
-#define PHYS_SDRAM			(0x3f440000)
-#define PHYS_SDRAM_SIZE			(256 * 1024)
+#define PHYS_SDRAM			(0x80000000)
+#define PHYS_SDRAM_SIZE			(128 * 1024 * 1024)
 
 #define CONFIG_SYS_SDRAM_BASE		PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR	IRAM_BASE_ADDR
@@ -261,11 +257,10 @@
 #define CONFIG_SYS_NO_FLASH
 
 #define CONFIG_ENV_SIZE			(8 * 1024)
-#undef CONFIG_ENV_IS_IN_MMC
-#define CONFIG_ENV_IS_NOWHERE
+#define CONFIG_ENV_IS_IN_NAND
+#undef CONFIG_ENV_IS_NOWHERE
 
-#define CONFIG_ENV_OFFSET		(12 * 64 * 1024)
-#define CONFIG_SYS_MMC_ENV_DEV		0
+#define CONFIG_ENV_OFFSET		(14 * 64 * 1024)
 
 #define CONFIG_OF_LIBFDT
 #define CONFIG_CMD_BOOTZ