Merge git://git.denx.de/u-boot-net

[oweals/u-boot.git] / include / configs / mxs.h

diff --git a/include/configs/mxs.h b/include/configs/mxs.h
index b26bc01977fdff460a50b913b38bdc6389bc749d..041dcde38e76766bd5a02cd3106e91c2fdf8a676 100644 (file)
--- a/include/configs/mxs.h
+++ b/include/configs/mxs.h
@@ -42,8 +42,6 @@
  */
 
 /* Startup hooks */
-#define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_ARCH_MISC_INIT
 
 /* SPL */
 #define CONFIG_SPL_NO_CPU_SUPPORT_CODE
@@ -116,9 +114,6 @@
 #define CONFIG_PL01x_PORTS             { (void *)MXS_UARTDBG_BASE }
 #define CONFIG_CONS_INDEX              0
 /* Default baudrate can be overridden by board! */
-#ifndef CONFIG_BAUDRATE
-#define CONFIG_BAUDRATE                        115200
-#endif
 
 /* FEC Ethernet on SoC */
 #ifdef CONFIG_FEC_MXC
@@ -131,16 +126,6 @@
 #endif
 #endif
 
-/* I2C */
-#ifdef CONFIG_CMD_I2C
-#define CONFIG_SYS_I2C
-#define CONFIG_SYS_I2C_MXS
-#define CONFIG_HARD_I2C
-#ifndef CONFIG_SYS_I2C_SPEED
-#define CONFIG_SYS_I2C_SPEED           400000
-#endif
-#endif
-
 /* LCD */
 #ifdef CONFIG_VIDEO
 #define CONFIG_VIDEO_MXS
@@ -148,7 +133,6 @@
 
 /* MMC */
 #ifdef CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
 #define CONFIG_BOUNCE_BUFFER
 #endif
 
@@ -174,7 +158,6 @@
 
 /* USB */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_MXS
 #define CONFIG_EHCI_IS_TDI
 #endif