mx6_common: Do not select esdhc DDR mode for all boards

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

diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index a9f33a9e34c15728621be9540e67858f31c24561..4207504464d0679a0425f1a7cddfc675e86c3189 100644 (file)
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -21,14 +21,7 @@
 #define CONFIG_MACH_TYPE               4273
 
 #ifndef CONFIG_SPL_BUILD
-#define CONFIG_DM
-#define CONFIG_CMD_DM
-
-#define CONFIG_DM_GPIO
 #define CONFIG_CMD_GPIO
-
-#define CONFIG_DM_SERIAL
-#define CONFIG_SYS_MALLOC_F_LEN                (1 << 10)
 #endif
 
 /* Display information on boot */
@@ -103,6 +96,7 @@
 #define CONFIG_ENV_OFFSET              (768 * 1024)
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
+       "stdin=serial,usbkbd\0" \
        "stdout=serial,vga\0" \
        "stderr=serial,vga\0" \
        "panel=HDMI\0" \
@@ -193,6 +187,8 @@
        "run setupnandboot;" \
        "run nandboot;"
 
+#define CONFIG_PREBOOT         "usb start"
+
 /* SPI */
 #define CONFIG_SPI
 #define CONFIG_MXC_SPI
@@ -241,6 +237,9 @@
 #define CONFIG_MXC_USB_FLAGS           0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET       /* For OTG port */
+#define CONFIG_USB_KEYBOARD
+#define CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP
+#define CONFIG_SYS_STDIO_DEREGISTER
 
 /* I2C */
 #define CONFIG_CMD_I2C
@@ -306,4 +305,12 @@
 #define CONFIG_CONSOLE_MUX
 #define CONFIG_VIDEO_SW_CURSOR
 
+#define CONFIG_SPLASH_SCREEN
+#define CONFIG_SPLASH_SOURCE
+#define CONFIG_CMD_BMP
+#define CONFIG_VIDEO_BMP_RLE8
+
+#define CONFIG_VIDEO_LOGO
+#define CONFIG_VIDEO_BMP_LOGO
+
 #endif /* __CONFIG_CM_FX6_H */