Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'

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

diff --git a/include/configs/R360MPI.h b/include/configs/R360MPI.h
index 9ab524f4bfb189dfefd88c39af6d8082122db278..009d1cf976d1df805032f7e2b78842d18851fd82 100644 (file)
--- a/include/configs/R360MPI.h
+++ b/include/configs/R360MPI.h
@@ -81,10 +81,13 @@
 #define        CONFIG_RTC_MPC8xx               /* use internal RTC of MPC8xx   */
 
 #define CONFIG_HARD_I2C                1       /* To I2C with hardware support */
-#undef CONFIG_SORT_I2C                 /* To I2C with software support */
+#undef CONFIG_SYS_I2C_SOFT             /* To I2C with software support */
 #define CONFIG_SYS_I2C_SPEED           4700    /* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE           0x7F
 
+#if defined(CONFIG_SYS_I2C_SOFT)
+#define CONFIG_SYS_SYS_I2C_SOFT_SPEED  4700 /* I2C speed and slave address */
+#define CONFIG_SYS_SYS_I2C_SOFT_SLAVE  0x7F
 /*
  * Software (bit-bang) I2C driver configuration
  */
@@ -100,6 +103,7 @@
 #define I2C_SCL(bit)           if(bit) immr->im_cpm.cp_pbdat |=  PB_SCL; \
                                else    immr->im_cpm.cp_pbdat &= ~PB_SCL
 #define I2C_DELAY              udelay(50)
+#endif /* #define(CONFIG_SYS_I2C_SOFT) */
 
 #define CONFIG_SYS_I2C_LCD_ADDR        0x8     /* LCD Control */
 #define CONFIG_SYS_I2C_KEY_ADDR        0x9     /* Keyboard coprocessor */
@@ -130,7 +134,6 @@
 #define CONFIG_SYS_CONSOLE_IS_IN_ENV   1       /* must set console from env    */
 
 #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
@@ -145,8 +148,6 @@
 
 #define        CONFIG_SYS_LOAD_ADDR            0x100000        /* default load address */
 
-#define        CONFIG_SYS_HZ           1000            /* decrementer freq: 1 ms ticks */
-
 /*
  * JFFS2 partitions
  */