i2c, soft-i2c: switch to new multibus/multiadapter support

[people/ms/u-boot.git] / include / configs / TOP860.h

diff --git a/include/configs/TOP860.h b/include/configs/TOP860.h
index 090101306e8a4309b565db1d6b869dcfb6b8dc01..1f728e3d4a9c6515cf40f97a4f02cb625fa20c22 100644 (file)
--- a/include/configs/TOP860.h
+++ b/include/configs/TOP860.h
@@ -138,9 +138,6 @@
 
 #undef CONFIG_SYS_HUSH_PARSER                  /* Hush parse for U-Boot        */
 
-#ifdef CONFIG_SYS_HUSH_PARSER
- #define CONFIG_SYS_PROMPT_HUSH_PS2    "> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
  #define CONFIG_SYS_CBSIZE     1024            /* Console I/O Buffer Size      */
@@ -162,7 +159,6 @@
  * Environment handler
  * only the first 6k in EEPROM are available for user. Of that we use 256b
  */
-#define        CONFIG_SOFT_I2C
 #define CONFIG_ENV_IS_IN_EEPROM        1       /* turn on EEPROM env feature */
 #define CONFIG_ENV_OFFSET              0x1000
 #define CONFIG_ENV_SIZE                0x0700
@@ -173,13 +169,15 @@
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2
 #define CONFIG_SYS_EEPROM_SIZE 0x2000
-#define        CONFIG_SYS_I2C_SPEED    100000
-#define        CONFIG_SYS_I2C_SLAVE    0xFE
 #define        CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 12
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_MISC_INIT_R
 
-#if defined (CONFIG_SOFT_I2C)
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_SOFT            /* I2C bit-banged */
+#define CONFIG_SYS_I2C_SOFT_SPEED      100000
+#define CONFIG_SYS_I2C_SOFT_SLAVE      0xFE
+/**/
 #define        SDA     0x00010
 #define        SCL     0x00020
 #define __I2C_DIR      immr->im_cpm.cp_pbdir
@@ -196,14 +194,12 @@
 #define        I2C_DELAY       { udelay(5); }
 #define        I2C_ACTIVE      { __I2C_DIR |= SDA; }
 #define        I2C_TRISTATE    { __I2C_DIR &= ~SDA; }
-#endif
 
 #define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /*-----------------------------------------------------------------------
  * defines we need to get FEC running
  */
-#define        CONFIG_NET_MULTI        1       /* the only way to get the FEC in */
 #define CONFIG_FEC_ENET                1       /* Ethernet only via FEC        */
 #define        FEC_ENET                1       /* eth.c needs it that way... */
 #define CONFIG_SYS_DISCOVER_PHY        1
@@ -231,8 +227,7 @@
  */
 #define CONFIG_SYS_INIT_RAM_ADDR       CONFIG_SYS_IMMR
 #define CONFIG_SYS_INIT_RAM_SIZE       0x2f00  /* Size of used area in DPRAM   */
-#define CONFIG_SYS_GBL_DATA_SIZE       64  /* size in bytes reserved for initial data */
-#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_SIZE - CONFIG_SYS_GBL_DATA_SIZE)
+#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_VPD_SIZE       256 /* size in bytes reserved for vpd buffer */
 #define CONFIG_SYS_INIT_VPD_OFFSET     (CONFIG_SYS_GBL_DATA_OFFSET - CONFIG_SYS_INIT_VPD_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      (CONFIG_SYS_INIT_VPD_OFFSET-8)
@@ -421,7 +416,6 @@
 #define CONFIG_IPADDR                                  10.0.4.111
 
 #define CONFIG_SYS_LOAD_ADDR           0x00100000      /* default load address */
-#define        CONFIG_SYS_TFTP_LOADADDR        0x00100000
 
 /*
  * For booting Linux, the board info and command line data