env: Remove useless CONFIG_ENV_SIZE_REDUND and fix ENV_IS_REDUND check

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

diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index 3fca28d..701bf2a 100644 (file)
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -70,10 +70,8 @@
 #define CONFIG_MXC_NAND_IP_REGS_BASE   NFC_BASE_ADDR
 #define CONFIG_SYS_NAND_LARGEPAGE
 #define CONFIG_MXC_NAND_HWECC
-#define CONFIG_SYS_NAND_USE_FLASH_BBT
 
 /* Environment is in NAND */
-#define CONFIG_ENV_SIZE_REDUND         CONFIG_ENV_SIZE
 #define CONFIG_ENV_SECT_SIZE           (128 * 1024)
 #define CONFIG_ENV_RANGE               (4 * CONFIG_ENV_SECT_SIZE)
 #define CONFIG_ENV_OFFSET              (8 * CONFIG_ENV_SECT_SIZE) /* 1 MiB */
@@ -118,7 +116,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
@@ -137,8 +134,6 @@
 /*
  * LCD
  */
-#ifdef CONFIG_VIDEO
-#define CONFIG_VIDEO_IPUV3
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_VIDEO_BMP_GZIP
 #define CONFIG_SPLASH_SCREEN
@@ -147,7 +142,6 @@
 #define CONFIG_BMP_16BPP
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (2 << 20)
-#endif
 
 /* LVDS display */
 #define CONFIG_SYS_LDB_CLOCK                   33260000
@@ -157,6 +151,8 @@
 /* IIM Fuses */
 #define CONFIG_FSL_IIM
 
+/* Watchdog */
+
 /*
  * Boot Linux
  */
@@ -173,7 +169,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
 
@@ -187,7 +182,6 @@
 /*
  * Extra Environments
  */
-#define CONFIG_PREBOOT         "run try_bootscript"
 #define CONFIG_HOSTNAME                "m53menlo"
 
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
@@ -202,9 +196,11 @@
        "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"                                               \
+       "stdout=serial,vidconsole\0"                                    \
+       "stderr=serial,vidconsole\0"                                    \
        "addcons="                                                      \
                "setenv bootargs ${bootargs} "                          \
                "console=${consdev},${baudrate}\0"                      \
@@ -212,7 +208,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"                          \
@@ -242,4 +238,9 @@
                "fi ; "                                                 \
                "fi\0"
 
+#if defined(CONFIG_SPL_BUILD)
+#undef CONFIG_WATCHDOG
+#define CONFIG_HW_WATCHDOG
+#endif
+
 #endif /* __M53MENLO_CONFIG_H__ */