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

[platform/kernel/u-boot.git] / include / configs / stxssa.h

diff --git a/include/configs/stxssa.h b/include/configs/stxssa.h
index fc02523..63dd767 100644 (file)
--- a/include/configs/stxssa.h
+++ b/include/configs/stxssa.h
@@ -7,7 +7,7 @@
  * (C) Copyright 2002,2003 Motorola,Inc.
  * Xianghua Xiao <X.Xiao@motorola.com>
  *
- * SPDX-License-Identifier:    GPL-2.0+ 
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /* mpc8560ads board configuration file */
@@ -112,7 +112,7 @@
 #define CONFIG_SYS_CCSRBAR_PHYS_LOW    CONFIG_SYS_CCSRBAR
 
 /* DDR Setup */
-#define CONFIG_FSL_DDR1
+#define CONFIG_SYS_FSL_DDR1
 #define CONFIG_SPD_EEPROM              /* Use SPD EEPROM for DDR setup*/
 #define CONFIG_DDR_SPD
 #undef CONFIG_FSL_DDR_INTERACTIVE
@@ -182,13 +182,12 @@
 /*
  * I2C
  */
-#define CONFIG_FSL_I2C                 /* Use FSL common I2C driver */
-#define  CONFIG_HARD_I2C               /* I2C with hardware support*/
-#undef CONFIG_SOFT_I2C                 /* I2C bit-banged */
-#define CONFIG_SYS_I2C_SPEED           400000  /* I2C speed and slave address  */
-#define CONFIG_SYS_I2C_SLAVE           0x7F
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_FSL
+#define CONFIG_SYS_FSL_I2C_SPEED       400000
+#define CONFIG_SYS_FSL_I2C_SLAVE       0x7F
+#define CONFIG_SYS_FSL_I2C_OFFSET      0x3000
 #undef CONFIG_SYS_I2C_NOPROBES
-#define CONFIG_SYS_I2C_OFFSET          0x3000
 
 /* I2C RTC */
 #define CONFIG_RTC_DS1337              /* This is really a DS1339 RTC  */
@@ -367,7 +366,6 @@
 #define CONFIG_SYS_MAXARGS     16              /* max number of command args   */
 #define CONFIG_SYS_BARGSIZE    CONFIG_SYS_CBSIZE       /* Boot Argument Buffer Size    */
 #define CONFIG_SYS_LOAD_ADDR   0x1000000       /* default load address */
-#define CONFIG_SYS_HZ          1000            /* decrementer freq: 1 ms ticks */
 
 /*
  * For booting Linux, the board info and command line data