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

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

diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h
index bd157d9b0f0f3a48245ca7a151bb056e1b46e1da..4898fb60f4b66e37f5c317b37d66df210cbdba8e 100644 (file)
--- a/include/configs/kzm9g.h
+++ b/include/configs/kzm9g.h
@@ -23,7 +23,6 @@
 
 #undef DEBUG
 
-#define CONFIG_ARM_CORTEXA9
 #define CONFIG_RMOBILE
 #define CONFIG_SH73A0
 #define CONFIG_KZM_A9_GT
@@ -36,7 +35,8 @@
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
 #define CONFIG_BOARD_EARLY_INIT_F
-#define        CONFIG_L2_OFF
+#define CONFIG_L2_OFF
+#define CONFIG_OF_LIBFDT
 
 #include <config_cmd_default.h>
 #define CONFIG_CMDLINE_TAG
@@ -46,10 +46,8 @@
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_BOOTZ
 
-#define CONFIG_BAUDRATE                (115200)
+#define CONFIG_BAUDRATE                115200
 #define CONFIG_BOOTARGS                "root=/dev/null console=ttySC4,115200"
-#define CONFIG_INTEGRATOR
-#define CONFIG_ARCH_CINTEGRATOR
 #define CONFIG_BOOTDELAY 3
 
 #define CONFIG_VERSION_VARIABLE
@@ -137,6 +135,7 @@
 #define CONFIG_SH_GPIO_PFC
 
 /* Clock */
+#define CONFIG_GLOBAL_TIMER
 #define CONFIG_SYS_CLK_FREQ    (48000000)
 #define CONFIG_SYS_CPU_CLK     (1196000000)
 #define TMU_CLK_DIVIDER                (4)     /* 4 (default), 16, 64, 256 or 1024 */
@@ -150,20 +149,25 @@
 #define CONFIG_SMC911X
 #define CONFIG_SMC911X_BASE    (0x10000000)
 #define CONFIG_SMC911X_32_BIT
+#define CONFIG_NFS_TIMEOUT 10000UL
 
 /* I2C */
 #define CONFIG_CMD_I2C
 #define CONFIG_SH_I2C 1
+#define CONFIG_SH_I2C_8BIT
 #define CONFIG_HARD_I2C
 #define CONFIG_I2C_MULTI_BUS
-#define CONFIG_SYS_MAX_I2C_BUS  (2)
+#define CONFIG_SYS_MAX_I2C_BUS  (5)
 #define CONFIG_SYS_I2C_MODULE
 #define CONFIG_SYS_I2C_SPEED    (100000) /* 100 kHz */
 #define CONFIG_SYS_I2C_SLAVE    (0x7F)
 #define CONFIG_SH_I2C_DATA_HIGH (4)
 #define CONFIG_SH_I2C_DATA_LOW  (5)
-#define CONFIG_SH_I2C_CLOCK     (41666666)
+#define CONFIG_SH_I2C_CLOCK     (104000000) /* 104 MHz */
 #define CONFIG_SH_I2C_BASE0     (0xE6820000)
 #define CONFIG_SH_I2C_BASE1     (0xE6822000)
+#define CONFIG_SH_I2C_BASE2     (0xE6824000)
+#define CONFIG_SH_I2C_BASE3     (0xE6826000)
+#define CONFIG_SH_I2C_BASE4     (0xE6828000)
 
 #endif /* __KZM9G_H */