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

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

diff --git a/include/configs/KAREF.h b/include/configs/KAREF.h
index d7377a8e910a25e34606beba189cb8938e6ee357..39eb2ef1336bd8600f4c3628ad0aa3d88097f132 100644 (file)
--- a/include/configs/KAREF.h
+++ b/include/configs/KAREF.h
@@ -1,7 +1,7 @@
 /*
  * (C) Copyright 2004 Sandburst Corporation
  *
- * SPDX-License-Identifier:    GPL-2.0+ 
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /************************************************************************
@@ -117,14 +117,15 @@
 /*-----------------------------------------------------------------------
  * I2C
  *----------------------------------------------------------------------*/
-#define CONFIG_HARD_I2C              1              /* I2C hardware support    */
-#undef CONFIG_SOFT_I2C                      /* I2C !bit-banged         */
-#define CONFIG_PPC4XX_I2C              /* use PPC4xx driver            */
-#define CONFIG_SYS_I2C_SPEED         400000         /* I2C speed 400kHz        */
-#define CONFIG_SYS_I2C_SLAVE         0x7F           /* I2C slave address       */
-#define CONFIG_SYS_I2C_NOPROBES      {0x69}         /* Don't probe these addrs */
-#define CONFIG_I2C_BUS1              1              /* Include i2c bus 1 supp  */
-
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_PPC4XX
+#define CONFIG_SYS_I2C_PPC4XX_CH0
+#define CONFIG_SYS_I2C_PPC4XX_SPEED_0 400000
+#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F
+#define CONFIG_SYS_I2C_PPC4XX_CH1
+#define CONFIG_SYS_I2C_PPC4XX_SPEED_1 400000 /* I2C speed 400kHz */
+#define CONFIG_SYS_I2C_PPC4XX_SLAVE_1 0x7F
+#define CONFIG_SYS_I2C_NOPROBES { { 0, 0x69} } /* Don't probe these addrs */
 
 /*-----------------------------------------------------------------------
  * Environment
@@ -272,7 +273,6 @@
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE  230400        /* kgdb serial port baud   */
-#define CONFIG_KGDB_SER_INDEX 2                     /* kgdb serial port        */
 #endif
 
 /*-----------------------------------------------------------------------
@@ -282,7 +282,4 @@
 #define CONFIG_SYS_LOAD_ADDR         0x8000000      /* default load address    */
 #define CONFIG_SYS_EXTBDINFO         1              /* use extended board_info */
 
-#define CONFIG_SYS_HZ                100            /* decr freq: 1 ms ticks   */
-
-
 #endif /* __CONFIG_H */