karo: tx6: add support for TX6-V2 (eMMC)

diff --cc board/karo/common/fdt.c
Simple merge

diff --cc board/karo/common/karo.h
Simple merge

diff --cc board/karo/common/splashimage.c
Simple merge

diff --cc boards.cfg
index 5860452651694e956df3e83c4a79f69035c81d5b,f3845dfc2d6019497cc5aa889c588659941201e9..8de4ca82b1b27a3de86e7be3b560310fb49be1b5
--- 1/boards.cfg
--- 2/boards.cfg
+++ b/boards.cfg
@@@ -275,12 -275,6 +275,15 @@@ tx51-8xx1_2                  ar
  tx53-x030                    arm         armv7       tx53                karo         mx5             tx53:NR_DRAM_BANKS=1
  tx53-x130                    arm         armv7       tx53                karo         mx5             tx53:NR_DRAM_BANKS=1,SYS_LVDS_IF
  tx53-x131                    arm         armv7       tx53                karo         mx5             tx53:NR_DRAM_BANKS=2,SYS_LVDS_IF
 +tx6q-1010                    arm         armv7       tx6                 karo         mx6             tx6:MX6Q
 +tx6q-1010_mfg                arm         armv7       tx6                 karo         mx6             tx6:MX6Q,MFG
 +tx6q-1010_noenv              arm         armv7       tx6                 karo         mx6             tx6:MX6Q,ENV_IS_NOWHERE
++tx6q-1020                    arm         armv7       tx6                 karo         mx6             tx6:MX6Q,TX6_V2,ENV_IS_IN_MMC
++tx6q-1020_noenv              arm         armv7       tx6                 karo         mx6             tx6:MX6Q,TX6_V2,ENV_IS_NOWHERE
++tx6q-1020_mfg                arm         armv7       tx6                 karo         mx6             tx6:MX6Q,TX6_V2,ENV_IS_IN_MMC,MFG
 +tx6q-1110                    arm         armv7       tx6                 karo         mx6             tx6:MX6Q,SYS_LVDS_IF
 +tx6q-1110_mfg                arm         armv7       tx6                 karo         mx6             tx6:MX6Q,MFG,SYS_LVDS_IF
 +tx6q-1110_noenv              arm         armv7       tx6                 karo         mx6             tx6:MX6Q,ENV_IS_NOWHERE,SYS_LVDS_IF
  tx6u-8010                    arm         armv7       tx6                 karo         mx6             tx6:MX6DL
  tx6u-8010_mfg                arm         armv7       tx6                 karo         mx6             tx6:MX6DL,MFG
  tx6u-8010_noenv              arm         armv7       tx6                 karo         mx6             tx6:MX6DL,ENV_IS_NOWHERE

diff --cc common/cmd_bootce.c
Simple merge

diff --cc include/configs/tx6.h
index 935d54d656873b2eaf0f6bafd96897635e360a61,691cb90c26da42dc9144831acb6157990ee8f6e5..02eb89d849b299c049e2fd381045efce90fbcd83
--- 1/include/configs/tx6.h
--- 2/include/configs/tx6.h
+++ b/include/configs/tx6.h
@@@ -96,8 -97,17 +98,10 @@@
  #ifndef CONFIG_MFG
  #define CONFIG_OF_LIBFDT
  #ifdef CONFIG_OF_LIBFDT
+ #ifndef CONFIG_TX6_V2
  #define CONFIG_FDT_FIXUP_PARTITIONS
+ #endif
  #define CONFIG_OF_BOARD_SETUP
 -#ifdef CONFIG_MX6Q
 -#define CONFIG_DEFAULT_DEVICE_TREE    tx6q
 -#define CONFIG_ARCH_DEVICE_TREE               mx6q
 -#else
 -#define CONFIG_DEFAULT_DEVICE_TREE    tx6dl
 -#define CONFIG_ARCH_DEVICE_TREE               mx6dl
 -#endif
  #define CONFIG_SYS_FDT_ADDR           (PHYS_SDRAM_1 + SZ_16M)
  #endif /* CONFIG_OF_LIBFDT */
  #endif /* CONFIG_MFG */