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

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

diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h
index ee4eb10..35058e2 100644 (file)
--- a/include/configs/m53evk.h
+++ b/include/configs/m53evk.h
@@ -26,7 +26,6 @@
 /*
  * U-Boot Commands
  */
-#include <config_cmd_default.h>
 #define CONFIG_DISPLAY_BOARDINFO
 #define CONFIG_DOS_PARTITION
 #define CONFIG_FAT_WRITE
@@ -44,14 +43,11 @@
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_MMC
 #define CONFIG_CMD_NAND
-#define CONFIG_CMD_NET
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_SATA
-#define CONFIG_CMD_SETEXPR
 #define CONFIG_CMD_USB
 #define CONFIG_VIDEO
 
-#define CONFIG_REGEX                   /* Enable regular expression support */
 
 /*
  * Memory configurations
@@ -176,6 +172,7 @@
 #ifdef CONFIG_CMD_I2C
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_I2C_MXC
+#define CONFIG_SYS_I2C_MXC_I2C3                /* enable I2C bus 3 */
 #define CONFIG_SYS_RTC_BUS_NUM         1 /* I2C2 */
 #endif
 
@@ -351,9 +348,9 @@
                "mmc rescan;"                                           \
                "if test -e mmc 0:1 ${bootscript} ; then "              \
                "if load mmc 0:1 ${kernel_addr_r} ${bootscript};"       \
-               "then;"                                                 \
-                       "\techo Running bootscript...;"                 \
-                       "\tsource ${kernel_addr_r};"                    \
+               "then ; "                                               \
+                       "echo Running bootscript... ; "                 \
+                       "source ${kernel_addr_r} ; "                    \
                "fi ; "                                                 \
                "fi\0"