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

[u-boot] / include / configs / top9000.h

diff --git a/include/configs/top9000.h b/include/configs/top9000.h
index ba5b6071d20c8a71bd2410e71a1abf4615f47d33..a6d692872cecbd6551b10d2ab30b13fc6bb69844 100644 (file)
--- a/include/configs/top9000.h
+++ b/include/configs/top9000.h
@@ -120,7 +120,6 @@
 #define CONFIG_ATMEL_SPI0              /* SPI used for FRAM is SPI0 */
 #define FRAM_SPI_BUS           0
 #define FRAM_CS_NUM            0
-#define CONFIG_SPI_FLASH               /* RAMTRON FRAM on SPI bus */
 #define CONFIG_SPI_FRAM_RAMTRON
 #define CONFIG_SF_DEFAULT_SPEED        1000000 /* be conservative here... */
 #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
@@ -185,11 +184,12 @@
 #define CONFIG_CMD_USB
 
 /* I2C support must always be enabled */
-#define CONFIG_SOFT_I2C
 #define CONFIG_CMD_I2C
-#define CONFIG_SYS_I2C_SPEED           400000
-#define CONFIG_SYS_I2C_SLAVE           0x7F
-#define CONFIG_I2C_MULTI_BUS
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_SOFT            /* I2C bit-banged */
+#define CONFIG_SYS_I2C_SOFT_SPEED      400000
+#define CONFIG_SYS_I2C_SOFT_SLAVE      0x7F
+
 #define I2C0_PORT                      AT91_PIO_PORTA
 #define SDA0_PIN                       23
 #define SCL0_PIN                       24