Merge branch 'karo-tx-uboot' into kc-merge

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

diff --git a/include/configs/tx6.h b/include/configs/tx6.h
index 1ae299c2cc78ac2e9b00a0a7f194620d57fa7c65..4e009fed3de9baf0ec4dab4a37575b1c0e0b2523 100644 (file)
--- a/include/configs/tx6.h
+++ b/include/configs/tx6.h
@@ -117,12 +117,14 @@
 #endif
 #define CONFIG_ZERO_BOOTDELAY_CHECK
 #define CONFIG_SYS_AUTOLOAD            "no"
+#define DEFAULT_BOOTCMD                        "run bootcmd_${boot_mode} bootm_cmd"
 #ifndef CONFIG_TX6_UBOOT_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 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_TX6_UBOOT_MFG */