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

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

diff --git a/include/configs/sc3.h b/include/configs/sc3.h
index 8508c22e034b9335038f5e70fd356683bcd91f96..14e033dd8025914f62e392a2ec7011c8650b01e8 100644 (file)
--- a/include/configs/sc3.h
+++ b/include/configs/sc3.h
@@ -6,7 +6,7 @@
  * (C) Copyright 2003
  * Juergen Beisert, EuroDesign embedded technologies, jbeisert@eurodsn.de
  *
- * SPDX-License-Identifier:    GPL-2.0+ 
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_H
@@ -43,7 +43,6 @@
  */
 
 #define CONFIG_SC3     1
-#define CONFIG_4xx     1
 #define CONFIG_405GP   1
 
 #define        CONFIG_SYS_TEXT_BASE    0xFFFA0000
@@ -224,22 +223,20 @@
 #define CONFIG_SYS_LOAD_ADDR           0x1000000       /* default load address */
 #define CONFIG_SYS_EXTBDINFO           1       /* To use extended board_into (bd_t) */
 
-#define        CONFIG_SYS_HZ                   1000    /* decrementer freq: 1 ms ticks */
-
 /*-----------------------------------------------------------------------
  * IIC stuff
  *-----------------------------------------------------------------------
  */
-#define  CONFIG_HARD_I2C               /* I2C with hardware support    */
-#undef CONFIG_SOFT_I2C                 /* I2C bit-banged               */
-#define CONFIG_PPC4XX_I2C              /* use PPC4xx driver            */
+#define  CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_PPC4XX
+#define CONFIG_SYS_I2C_PPC4XX_CH0
 
 #define I2C_INIT
 #define I2C_ACTIVE 0
 #define I2C_TRISTATE 0
 
-#define CONFIG_SYS_I2C_SPEED           100000  /* use the standard 100kHz speed */
-#define CONFIG_SYS_I2C_SLAVE           0x7F            /* mask valid bits */
+#define CONFIG_SYS_I2C_PPC4XX_SPEED_0          100000
+#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0          0x7F    /* mask valid bits */
 
 #define CONFIG_RTC_DS1337
 #define CONFIG_SYS_I2C_RTC_ADDR 0x68