Merge branch 'master' of git://git.denx.de/u-boot-microblaze

[karo-tx-uboot.git] / include / configs / spear-common.h

diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h
index cf09090ab17a5df090c6a435d9754a4483408479..a6d1cfbcb0e74961551c8704ca9190210c88f60e 100644 (file)
--- a/include/configs/spear-common.h
+++ b/include/configs/spear-common.h
@@ -37,15 +37,21 @@
 #define CONFIG_DW0_PHY                         1
 #define CONFIG_NET_MULTI
 #define CONFIG_PHY_RESET_DELAY                 10000           /* in usec */
+#define CONFIG_DW_AUTONEG
+#define CONFIG_PHY_GIGE                        /* Include GbE speed/duplex detection */
 
 /* USBD driver configuration */
+#if defined(CONFIG_SPEAR_USBTTY)
 #define CONFIG_DW_UDC
 #define CONFIG_USB_DEVICE
+#define CONFIG_USBD_HS
 #define CONFIG_USB_TTY
 
 #define CONFIG_USBD_PRODUCT_NAME               "SPEAr SoC"
 #define CONFIG_USBD_MANUFACTURER               "ST Microelectronics"
 
+#endif
+
 #define CONFIG_EXTRA_ENV_USBTTY                        "usbtty=cdc_acm\0"
 
 /* I2C driver configuration */
@@ -57,11 +63,11 @@
 #define CONFIG_I2C_CHIPADDRESS                 0x50
 
 /* Timer, HZ specific defines */
-#define CONFIG_SYS_HZ                          (1000)
+#define CONFIG_SYS_HZ                          1000
 
 /* Flash configuration */
 #if defined(CONFIG_FLASH_PNOR)
-#define CONFIG_SPEAR_EMI                       1
+#define CONFIG_SPEAR_EMI
 #else
 #define CONFIG_ST_SMI
 #endif
@@ -69,14 +75,13 @@
 #if defined(CONFIG_ST_SMI)
 
 #define CONFIG_SYS_MAX_FLASH_BANKS             2
-#define CONFIG_SYS_FLASH_BASE                  (0xF8000000)
-#define CONFIG_SYS_CS1_FLASH_BASE              (0xF9000000)
-#define CONFIG_SYS_FLASH_BANK_SIZE             (0x01000000)
+#define CONFIG_SYS_FLASH_BASE                  0xF8000000
+#define CONFIG_SYS_CS1_FLASH_BASE              0xF9000000
+#define CONFIG_SYS_FLASH_BANK_SIZE             0x01000000
 #define CONFIG_SYS_FLASH_ADDR_BASE             {CONFIG_SYS_FLASH_BASE, \
                                                CONFIG_SYS_CS1_FLASH_BASE}
 #define CONFIG_SYS_MAX_FLASH_SECT              128
 
-#define CONFIG_SYS_FLASH_EMPTY_INFO            1
 #define CONFIG_SYS_FLASH_ERASE_TOUT            (3 * CONFIG_SYS_HZ)
 #define CONFIG_SYS_FLASH_WRITE_TOUT            (3 * CONFIG_SYS_HZ)
 
@@ -101,7 +106,8 @@
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_NAND_FSMC
 #define CONFIG_SYS_MAX_NAND_DEVICE             1
-#define CONFIG_MTD_NAND_VERIFY_WRITE           1
+#define CONFIG_SYS_NAND_ONFI_DETECTION
+#define CONFIG_SYS_NAND_QUIET_TEST
 
 /*
  * Command support defines
@@ -157,8 +163,7 @@
                                                "0x4C0000; bootm 0x1600000"
 #endif
 
-#define CONFIG_SYS_MONITOR_BASE                        CONFIG_SYS_FLASH_BASE
-#define CONFIG_ENV_ADDR                                (CONFIG_SYS_MONITOR_BASE + \
+#define CONFIG_ENV_ADDR                                (CONFIG_SYS_FLASH_BASE + \
                                                CONFIG_SYS_MONITOR_LEN)
 #elif defined(CONFIG_ENV_IS_IN_NAND)
 /*
@@ -195,16 +200,18 @@
 
 
 #define CONFIG_ENV_SIZE                                0x02000
+#define CONFIG_SYS_MONITOR_BASE                        CONFIG_SYS_TEXT_BASE
 
 /* Miscellaneous configurable options */
 #define CONFIG_ARCH_CPU_INIT
+#define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_BOOT_PARAMS_ADDR                        0x00000100
-#define CONFIG_CMDLINE_TAG                     1
-#define CONFIG_SETUP_MEMORY_TAGS               1
-#define CONFIG_MISC_INIT_R                     1
-#define CONFIG_ZERO_BOOTDELAY_CHECK            1
-#define CONFIG_AUTOBOOT_KEYED                  1
+#define CONFIG_CMDLINE_TAG
+#define CONFIG_SETUP_MEMORY_TAGS
+#define CONFIG_MISC_INIT_R
+#define CONFIG_ZERO_BOOTDELAY_CHECK
+#define CONFIG_AUTOBOOT_KEYED
 #define CONFIG_AUTOBOOT_STOP_STR               " "
 #define CONFIG_AUTOBOOT_PROMPT                 \
                "Hit SPACE in %d seconds to stop autoboot.\n", bootdelay
@@ -222,7 +229,9 @@
 #define CONFIG_SYS_MAXARGS                     16
 #define CONFIG_SYS_BARGSIZE                    CONFIG_SYS_CBSIZE
 #define CONFIG_SYS_LOAD_ADDR                   0x00800000
-#define CONFIG_SYS_CONSOLE_INFO_QUIET          1
+#define CONFIG_SYS_CONSOLE_INFO_QUIET
+
+#define CONFIG_SYS_FLASH_EMPTY_INFO
 
 /* Stack sizes */
 #define CONFIG_STACKSIZE                       (128*1024)