Merge remote-tracking branch 'u-boot-imx/master'

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

diff --git a/include/configs/IP860.h b/include/configs/IP860.h
index 1247181b5443c82449d2e9ea564a345cc04d52bc..97eda584423f844db286025a36e853b439db5ea3 100644 (file)
--- a/include/configs/IP860.h
+++ b/include/configs/IP860.h
@@ -46,8 +46,10 @@
 
 
 /* enable I2C and select the hardware/software driver */
-#undef  CONFIG_HARD_I2C                        /* I2C with hardware support    */
-#define CONFIG_SOFT_I2C                1       /* I2C bit-banged               */
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_SOFT            /* I2C bit-banged */
+#define CONFIG_SYS_I2C_SOFT_SPEED      50000
+#define CONFIG_SYS_I2C_SOFT_SLAVE      0xFE
 /*
  * Software (bit-bang) I2C driver configuration
  */
@@ -64,9 +66,6 @@
                        else    immr->im_cpm.cp_pbdat &= ~PB_SCL
 #define I2C_DELAY      udelay(5)       /* 1/4 I2C clock duration */
 
-
-# define CONFIG_SYS_I2C_SPEED          50000
-# define CONFIG_SYS_I2C_SLAVE          0xFE
 # define CONFIG_SYS_I2C_EEPROM_ADDR    0x50    /* EEPROM X24C16                */
 # define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1      /* bytes of address             */
 /* mask of address bits that overflow into the "EEPROM chip address"    */
@@ -100,7 +99,6 @@
  * Miscellaneous configurable options
  */
 #define        CONFIG_SYS_LONGHELP                     /* undef to save memory         */
-#define        CONFIG_SYS_PROMPT       "=> "           /* Monitor Command Prompt       */
 #if defined(CONFIG_CMD_KGDB)
 #define        CONFIG_SYS_CBSIZE       1024            /* Console I/O Buffer Size      */
 #else
@@ -117,8 +115,6 @@
 
 #define        CONFIG_SYS_PIO_MODE             0       /* IDE interface in PIO Mode 0  */
 
-#define        CONFIG_SYS_HZ                   1000    /* decrementer freq: 1 ms ticks */
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)