sunxi: video: Fix VIDEO_LCD_PANEL_I2C being enabled by default

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

diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index 9fb501a3412abd71a1e880fd72e42e90f6f47810..024a05918956f6093b1e37431d34b9f8dc62f925 100644 (file)
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -14,7 +14,6 @@
 #include <asm/imx-common/gpio.h>
 #include <linux/sizes.h>
 
-#define CONFIG_MX6
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
 
@@ -78,6 +77,15 @@
 #define CONFIG_CMD_FAT
 #define CONFIG_DOS_PARTITION
 
+/* USB Configs */
+#define CONFIG_CMD_USB
+#define CONFIG_USB_EHCI
+#define CONFIG_USB_EHCI_MX6
+#define CONFIG_USB_STORAGE
+#define CONFIG_USB_MAX_CONTROLLER_COUNT        2
+#define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CONFIG_MXC_USB_FLAGS           0
+
 /* Ethernet Configuration */
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
@@ -115,9 +123,7 @@
 #define CONFIG_MXC_OCOTP
 #endif
 
-#if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S)
 #define CONFIG_DEFAULT_FDT_FILE                "imx6dl-wandboard.dtb"
-#elif defined(CONFIG_MX6Q)
 #define CONFIG_DEFAULT_FDT_FILE                "imx6q-wandboard.dtb"
 #endif
 
@@ -166,7 +172,7 @@
                "if i2c probe 0x10; then " \
                        "setenv bootargs ${bootargs} " \
                                "video=mxcfb${nextcon}:dev=lcd,800x480@60," \
-                                       "if=RGB666; " \
+                                       "if=RGB666,bpp=32; " \
                        "if test 0 -eq ${nextcon}; then " \
                                "setenv fbmem fbmem=10M; " \
                        "else " \