Update from 2013.01 to 2013.07

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

diff --git a/include/configs/taihu.h b/include/configs/taihu.h
index a3738b7b1d2dcafb9db2c96b566eb51ad9abed15..e8d191e7f9b757f15f08b0a873bec6f0f3dee53b 100644 (file)
--- a/include/configs/taihu.h
+++ b/include/configs/taihu.h
@@ -5,23 +5,7 @@
  * (C) Copyright 2005-2007
  * Beijing UD Technology Co., Ltd., taihusupport@amcc.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 __CONFIG_H
@@ -138,9 +122,9 @@
  * I2C stuff
  *-----------------------------------------------------------------------
  */
-#define CONFIG_SYS_I2C_SPEED           400000  /* I2C speed and slave address  */
+#define CONFIG_SYS_I2C_PPC4XX_SPEED_0          400000
 
-#define CONFIG_SYS_I2C_NOPROBES        { 0x69 } /* avoid i2c probe hangup (why?) */
+#define CONFIG_SYS_I2C_NOPROBES        { {0, 0x69} } /* avoid i2c probe hangup (?) */
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS  6 /* 24C02 requires 5ms delay */
 
 #define CONFIG_SYS_I2C_EEPROM_ADDR     0x50    /* I2C boot EEPROM (24C02W)     */
@@ -171,6 +155,7 @@ unsigned char spi_read(void);
 #define PCI_HOST_AUTO    2             /* detected via arbiter enable */
 
 #define CONFIG_PCI                     /* include pci support         */
+#define CONFIG_PCI_INDIRECT_BRIDGE     /* indirect PCI bridge support */
 #define CONFIG_PCI_HOST        PCI_HOST_FORCE  /* select pci host function    */
 #define CONFIG_PCI_PNP                 /* do pci plug-and-play        */
                                        /* resource configuration      */