Merge branch 'u-boot/master'

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

diff --git a/include/configs/titanium.h b/include/configs/titanium.h
index 077e25e16e424e8e710b5ac299ee440d83449721..f9e00c5b8b7019ed7803288b8306db74a90ba457 100644 (file)
--- a/include/configs/titanium.h
+++ b/include/configs/titanium.h
@@ -13,6 +13,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+#include "mx6_common.h"
 #include <asm/arch/imx-regs.h>
 #include <asm/imx-common/gpio.h>
 
@@ -41,8 +42,8 @@
 
 /* I2C Configs */
 #define CONFIG_CMD_I2C
-#define CONFIG_I2C_MULTI_BUS
-#define CONFIG_I2C_MXC
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_MXC
 #define CONFIG_SYS_I2C_SPEED           100000
 
 /* MMC Configs */
@@ -194,7 +195,6 @@
 #define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
 
 #define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
-#define CONFIG_SYS_HZ                  1000
 
 /* Physical Memory Map */
 #define CONFIG_NR_DRAM_BANKS           1