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

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

diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h
index 720e1bf..4195fa3 100644 (file)
--- a/include/configs/imx31_phycore.h
+++ b/include/configs/imx31_phycore.h
@@ -6,7 +6,7 @@
  *
  * Configuration settings for the phyCORE-i.MX31 board.
  *
- * SPDX-License-Identifier:    GPL-2.0+ 
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_H
@@ -15,8 +15,7 @@
 #include <asm/arch/imx-regs.h>
 
 /* High Level Configuration Options */
-#define CONFIG_ARM1136                 /* This is an arm1136 CPU core */
-#define CONFIG_MX31                    /* in a mx31 */
+#define CONFIG_MX31                    /* This is a mx31 */
 #define CONFIG_MX31_CLK32      32000
 
 #define CONFIG_DISPLAY_CPUINFO
@@ -35,11 +34,9 @@
  * Hardware drivers
  */
 
-#define CONFIG_HARD_I2C
-#define CONFIG_I2C_MXC
-#define CONFIG_SYS_I2C_BASE            I2C2_BASE_ADDR
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_MXC
 #define CONFIG_SYS_I2C_CLK_OFFSET      I2C2_CLK_OFFSET
-#define CONFIG_SYS_I2C_SPEED           100000
 
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE           UART1_BASE
@@ -121,8 +118,6 @@
 
 #define CONFIG_SYS_LOAD_ADDR           0 /* default load address */
 
-#define CONFIG_SYS_HZ                  1000
-
 #define CONFIG_CMDLINE_EDITING
 
 /*