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

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

diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h
index a98230a761ed02dd3d291e22d11edc46ff4f3a34..f930ed0a671b07211b34872cc2055b3e5b5f3809 100644 (file)
--- a/include/configs/mx35pdk.h
+++ b/include/configs/mx35pdk.h
@@ -57,9 +57,8 @@
  */
 #define CONFIG_HARD_I2C
 #define CONFIG_I2C_MXC
-#define CONFIG_SYS_I2C_MX35_PORT1
+#define CONFIG_SYS_I2C_BASE            I2C1_BASE_ADDR
 #define CONFIG_SYS_I2C_SPEED           100000
-#define CONFIG_SYS_I2C_SLAVE           0xfe
 #define CONFIG_MXC_SPI
 #define CONFIG_MXC_GPIO
 
@@ -145,7 +144,6 @@
 #define CONFIG_SYS_PROMPT      "MX35 U-Boot > "
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_HUSH_PARSER /* Use the HUSH parser */
-#define        CONFIG_SYS_PROMPT_HUSH_PS2      "> "
 
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_CBSIZE      256     /* Console I/O Buffer Size */