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

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

diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h
index 0443bc6ebd2332a786436806c6914c37497552ae..c0eba3721d70d30306f2ea9826d63a19547ac3e2 100644 (file)
--- a/include/configs/spear-common.h
+++ b/include/configs/spear-common.h
@@ -2,23 +2,7 @@
  * (C) Copyright 2009
  * Vipin Kumar, STMicroelectronics, <vipin.kumar@st.com>
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef _SPEAR_COMMON_H
@@ -33,11 +17,10 @@
 /* Ethernet driver configuration */
 #define CONFIG_MII
 #define CONFIG_DESIGNWARE_ETH
-#define CONFIG_DW_SEARCH_PHY
-#define CONFIG_DW0_PHY                         1
 #define CONFIG_NET_MULTI
+#define CONFIG_PHYLIB
 #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)
@@ -56,17 +39,25 @@
 /* I2C driver configuration */
 #define CONFIG_HARD_I2C
 #define CONFIG_DW_I2C
+#if defined(CONFIG_SPEAR600)
+#define CONFIG_SYS_I2C_BASE                    0xD0200000
+#elif defined(CONFIG_SPEAR300)
+#define CONFIG_SYS_I2C_BASE                    0xD0180000
+#elif defined(CONFIG_SPEAR310)
+#define CONFIG_SYS_I2C_BASE                    0xD0180000
+#elif defined(CONFIG_SPEAR320)
+#define CONFIG_SYS_I2C_BASE                    0xD0180000
+#endif
 #define CONFIG_SYS_I2C_SPEED                   400000
 #define CONFIG_SYS_I2C_SLAVE                   0x02
 
 #define CONFIG_I2C_CHIPADDRESS                 0x50
 
 /* Timer, HZ specific defines */
-#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
@@ -74,14 +65,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)
 
@@ -106,7 +96,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
@@ -206,11 +197,11 @@
 #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
@@ -228,15 +219,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
-
-/* Stack sizes */
-#define CONFIG_STACKSIZE                       (128*1024)
+#define CONFIG_SYS_CONSOLE_INFO_QUIET
 
-#ifdef CONFIG_USE_IRQ
-#define CONFIG_STACKSIZE_IRQ                   (4*1024)
-#define CONFIG_STACKSIZE_FIQ                   (4*1024)
-#endif
+#define CONFIG_SYS_FLASH_EMPTY_INFO
 
 /* Physical Memory Map */
 #define CONFIG_NR_DRAM_BANKS                   1