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

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

diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index 3fca28d..fc0b1f4 100644 (file)
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -118,7 +118,6 @@
  * USB
  */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI_MX5
 #define CONFIG_MXC_USB_PORT            1
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS           0
@@ -138,7 +137,6 @@
  * LCD
  */
 #ifdef CONFIG_VIDEO
-#define CONFIG_VIDEO_IPUV3
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_VIDEO_BMP_GZIP
 #define CONFIG_SPLASH_SCREEN
@@ -157,6 +155,9 @@
 /* IIM Fuses */
 #define CONFIG_FSL_IIM
 
+/* Watchdog */
+#define CONFIG_WATCHDOG_TIMEOUT_MSECS 8000
+
 /*
  * Boot Linux
  */
@@ -173,7 +174,6 @@
  * NAND SPL
  */
 #define CONFIG_SPL_TARGET              "u-boot-with-nand-spl.imx"
-#define CONFIG_SPL_TEXT_BASE           0x70008000
 #define CONFIG_SPL_PAD_TO              0x8000
 #define CONFIG_SPL_STACK               0x70004000
 
@@ -202,7 +202,7 @@
        "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"                        \
        "netdev=eth0\0"                                                 \
        "splashsource=mmc_fs\0"                                         \
-       "splashfile=usplash.bmp.gz\0"                                   \
+       "splashfile=boot/usplash.bmp.gz\0"                              \
        "splashimage=0x88000000\0"                                      \
        "splashpos=m,m\0"                                               \
        "addcons="                                                      \
@@ -212,7 +212,7 @@
                "setenv bootargs ${bootargs} "                          \
                "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
                ":${hostname}:${netdev}:off\0"                          \
-       "addmtd=setenv bootargs ${bootargs} mtdparts=${mtdparts}\0"     \
+       "addmtd=setenv bootargs ${bootargs} ${mtdparts}\0"              \
        "addmisc="                                                      \
                "setenv bootargs ${bootargs} ${miscargs}\0"             \
        "addargs=run addcons addmisc addmtd\0"                          \