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

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

diff --git a/include/configs/apf27.h b/include/configs/apf27.h
index cf13563c62c236b774d920ac6cf8519ad789f316..49fbcac7760513972d07ae9046f977df1b82658f 100644 (file)
--- a/include/configs/apf27.h
+++ b/include/configs/apf27.h
@@ -140,7 +140,6 @@
  * U-Boot general configurations
  */
 #define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_PROMPT              "BIOS> "        /* prompt string */
 #define CONFIG_SYS_CBSIZE              2048            /* console I/O buffer */
 #define CONFIG_SYS_PBSIZE              \
                                (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
@@ -318,6 +317,8 @@
 #ifdef CONFIG_CMD_I2C
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_I2C_MXC
+#define CONFIG_SYS_I2C_MXC_I2C1                /* enable I2C bus 1 */
+#define CONFIG_SYS_I2C_MXC_I2C2                /* enable I2C bus 2 */
 #define CONFIG_SYS_MXC_I2C1_SPEED      100000  /* 100 kHz */
 #define CONFIG_SYS_MXC_I2C1_SLAVE      0x7F
 #define CONFIG_SYS_MXC_I2C2_SPEED      100000  /* 100 kHz */