Merge commit 'wd/master'

[platform/kernel/u-boot.git] / include / configs / imx31_phycore.h

diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h
index 647b05b..7d6aaa1 100644 (file)
--- a/include/configs/imx31_phycore.h
+++ b/include/configs/imx31_phycore.h
@@ -4,7 +4,7 @@
  * Richard Woodruff <r-woodruff2@ti.com>
  * Kshitij Gupta <kshitij@ti.com>
  *
- * Configuration settings for the 242x TI H4 board.
+ * Configuration settings for the phyCORE-i.MX31 board.
  *
  * See file CREDITS for list of people who contributed to this
  * project.
@@ -52,7 +52,7 @@
  * Size of malloc() pool
  */
 #define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128 * 1024)
-#define CFG_GBL_DATA_SIZE      128  /* num bytes reserved for initial data */
+#define CFG_GBL_DATA_SIZE      128  /* size in bytes reserved for initial data */
 
 /*
  * Hardware drivers
@@ -85,40 +85,30 @@
 
 #define CONFIG_BOOTDELAY       3
 
-#define MTDPARTS_DEFAULT       \
-       "mtdparts=physmap-flash.0:128k(uboot)ro,1536k(kernel),-(root)"
+#define MTDPARTS_DEFAULT       "mtdparts=physmap-flash.0:128k(uboot)ro,1536k(kernel),-(root)"
 
 #define CONFIG_NETMASK         255.255.255.0
 #define CONFIG_IPADDR          192.168.23.168
 #define CONFIG_SERVERIP                192.168.23.2
 
-#define        CONFIG_EXTRA_ENV_SETTINGS                               \
-       "bootargs_base=setenv bootargs console=ttySMX0,115200\0"        \
-       "bootargs_nfs=setenv bootargs $(bootargs) root=/dev/nfs "       \
-               "ip=dhcp nfsroot=$(serverip):$(nfsrootfs),v3,tcp\0"     \
-       "bootargs_flash=setenv bootargs $(bootargs) "                   \
-               "root=/dev/mtdblock2 rootfstype=jffs2\0"                \
-       "bootargs_mtd=setenv bootargs $(bootargs) $(mtdparts)\0"        \
-       "bootcmd=run bootcmd_net\0"                                     \
-       "bootcmd_net=run bootargs_base bootargs_mtd bootargs_nfs; "     \
-               "tftpboot 0x80000000 $(uimage); bootm\0"                \
-       "bootcmd_flash=run bootargs_base bootargs_mtd bootargs_flash; " \
-               "bootm 0x80000000\0"                                    \
-       "unlock=yes\0"                                                  \
-       "mtdparts=" MTDPARTS_DEFAULT "\0"                               \
-       "prg_uboot=tftpboot 0x80000000 $(uboot); "                      \
-               "protect off 0xa0000000 +0x20000; "                     \
-               "erase 0xa0000000 +0x20000; "                           \
-               "cp.b 0x80000000 0xa0000000 $(filesize)\0"              \
-       "prg_kernel=tftpboot 0x80000000 $(uimage); "                    \
-               "erase 0xa0040000 +0x180000; "                          \
-               "cp.b 0x80000000 0xa0040000 $(filesize)\0"              \
-       "prg_jffs2=tftpboot 0x80000000 $(jffs2); "                      \
-               "erase 0xa01c0000 0xa1ffffff; "                         \
-               "cp.b 0x80000000 0xa01c0000 $(filesize)\0"
+#define        CONFIG_EXTRA_ENV_SETTINGS                                                                                       \
+       "bootargs_base=setenv bootargs console=ttySMX0,115200\0"                                                        \
+       "bootargs_nfs=setenv bootargs $(bootargs) root=/dev/nfs ip=dhcp nfsroot=$(serverip):$(nfsrootfs),v3,tcp\0"      \
+       "bootargs_flash=setenv bootargs $(bootargs) root=/dev/mtdblock2 rootfstype=jffs2"                               \
+       "bootargs_mtd=setenv bootargs $(bootargs) $(mtdparts)"                                                          \
+       "bootcmd=run bootcmd_net\0"                                                                                     \
+       "bootcmd_net=run bootargs_base bootargs_mtd bootargs_nfs; tftpboot 0x80000000 $(uimage); bootm\0"               \
+       "bootcmd_flash=run bootargs_base bootargs_mtd bootargs_flash; bootm 0x80000000\0"                               \
+       "unlock=yes\0"                                                                                                  \
+       "mtdparts=" MTDPARTS_DEFAULT "\0"                                                                               \
+       "prg_uboot=tftpboot 0x80000000 $(uboot); protect off 0xa0000000 +0x20000; erase 0xa0000000 +0x20000; cp.b 0x80000000 0xa0000000 $(filesize)\0" \
+       "prg_kernel=tftpboot 0x80000000 $(uimage); erase 0xa0040000 +0x180000; cp.b 0x80000000 0xa0040000 $(filesize)\0"        \
+       "prg_jffs2=tftpboot 0x80000000 $(jffs2); erase 0xa01c0000 0xa1ffffff; cp.b 0x80000000 0xa01c0000 $(filesize)\0"
+
 
 #define CONFIG_DRIVER_SMC911X          1
 #define CONFIG_DRIVER_SMC911X_BASE     0xa8000000
+#define CONFIG_DRIVER_SMC911X_32_BIT   1
 
 /*
  * Miscellaneous configurable options
@@ -143,7 +133,8 @@
 /*-----------------------------------------------------------------------
  * Stack sizes
  *
- * The stack sizes are set up in start.S using the settings below  */
+ * The stack sizes are set up in start.S using the settings below
+ */
 #define CONFIG_STACKSIZE       (128 * 1024) /* regular stack */
 
 /*-----------------------------------------------------------------------
@@ -157,17 +148,17 @@
  * FLASH and environment organization
  */
 #define CFG_FLASH_BASE         0xa0000000
-#define CFG_MAX_FLASH_BANKS    1 /* max number of memory banks */
-#define CFG_MAX_FLASH_SECT     259 /* max number of sectors on one chip */
-#define CFG_MONITOR_BASE CFG_FLASH_BASE /* Monitor at beginning of flash */
+#define CFG_MAX_FLASH_BANKS    1           /* max number of memory banks */
+#define CFG_MAX_FLASH_SECT     259          /* max number of sectors on one chip */
+#define CFG_MONITOR_BASE       CFG_FLASH_BASE /* Monitor at beginning of flash */
 
 #define        CFG_ENV_IS_IN_EEPROM            1
-#define CFG_ENV_OFFSET                 0x00    /* environment starts here */
+#define CFG_ENV_OFFSET                 0x00    /* environment starts here     */
 #define CFG_ENV_SIZE                   4096
 #define CFG_I2C_EEPROM_ADDR            0x52
-#define CFG_EEPROM_PAGE_WRITE_BITS     5       /* 5 bits = 32 octets */
-#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10      /* between stop and start */
-#define CFG_I2C_EEPROM_ADDR_LEN                2 /* length of byte address */
+#define CFG_EEPROM_PAGE_WRITE_BITS     5       /* 5 bits = 32 octets          */
+#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10      /* between stop and start      */
+#define CFG_I2C_EEPROM_ADDR_LEN                2       /* length of byte address      */
 
 /*-----------------------------------------------------------------------
  * CFI FLASH driver setup