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

Conflicts:
	board/karo/common/mmc.c
	board/karo/tx6/Makefile
	board/karo/tx6/pmic.c
	board/karo/tx6/pmic.h
	board/karo/tx6/tx6qdl.c
	boards.cfg
	include/configs/tx6.h

diff --cc board/karo/tx51/tx51.c
Simple merge

diff --cc include/configs/tx6.h
index fd52fb88615dab3cf2d15fcb9755cd1ea0511250,1ae299c2cc78ac2e9b00a0a7f194620d57fa7c65..4e009fed3de9baf0ec4dab4a37575b1c0e0b2523
--- 1/include/configs/tx6.h
--- 2/include/configs/tx6.h
+++ b/include/configs/tx6.h
@@@ -116,17 -117,15 +117,17 @@@
  #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 DEFAULT_BOOTCMD                       "run bootcmd_${boot_mode} bootm_cmd"
- #ifndef CONFIG_MFG
 -#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_MFG */
+ #endif /* CONFIG_TX6_UBOOT_MFG */
  #define CONFIG_LOADADDR                       18000000
  #define CONFIG_FDTADDR                        11000000
  #define CONFIG_SYS_LOAD_ADDR          _pfx(0x, CONFIG_LOADADDR)