karo: tx6: include default environment in MFG U-Boot variant

diff --git a/include/configs/tx6.h b/include/configs/tx6.h
index 3df320612c952fcbaee6482f65f6fda6ece75353..fd52fb88615dab3cf2d15fcb9755cd1ea0511250 100644 (file)
--- a/include/configs/tx6.h
+++ b/include/configs/tx6.h
@@ -116,12 +116,14 @@
 #endif
 #define CONFIG_ZERO_BOOTDELAY_CHECK
 #define CONFIG_SYS_AUTOLOAD            "no"
-#ifndef CONFIG_MFG
 #define CONFIG_BOOTFILE                        "uImage"
 #define CONFIG_BOOTARGS                        "init=/linuxrc console=ttymxc0,115200 ro debug panic=1"
-#define CONFIG_BOOTCOMMAND             "run bootcmd_${boot_mode} bootm_cmd"
+#define DEFAULT_BOOTCMD                        "run bootcmd_${boot_mode} bootm_cmd"
+#ifndef CONFIG_MFG
+#define CONFIG_BOOTCOMMAND             DEFAULT_BOOTCMD
 #else
-#define CONFIG_BOOTCOMMAND             "env import " xstr(CONFIG_BOOTCMD_MFG_LOADADDR) ";run bootcmd_mfg"
+#define CONFIG_BOOTCOMMAND             "set bootcmd '" DEFAULT_BOOTCMD "';" \
+       "env import " xstr(CONFIG_BOOTCMD_MFG_LOADADDR) ";run bootcmd_mfg"
 #define CONFIG_BOOTCMD_MFG_LOADADDR    10500000
 #define CONFIG_DELAY_ENVIRONMENT
 #endif /* CONFIG_MFG */
@@ -139,7 +141,6 @@
 /*
  * Extra Environments
  */
-#ifndef CONFIG_MFG
 #ifdef CONFIG_ENV_IS_NOWHERE
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
        "autostart=no\0"                                                \
@@ -183,7 +184,6 @@
        "touchpanel=tsc2007\0"                                          \
        "video_mode=" DEFAULT_VIDEO_MODE "\0"
 #endif /*  CONFIG_ENV_IS_NOWHERE */
-#endif /*  CONFIG_MFG */
 
 #ifndef CONFIG_NO_NAND
 #define CONFIG_SYS_DEFAULT_BOOT_MODE "nand"