karo: tx6: add support for TX6-V2 (eMMC)
authorLothar Waßmann <LW@KARO-electronics.de>
Mon, 27 Jan 2014 12:53:19 +0000 (13:53 +0100)
committerLothar Waßmann <LW@KARO-electronics.de>
Wed, 5 Mar 2014 14:35:44 +0000 (15:35 +0100)
1  2 
board/karo/common/fdt.c
board/karo/common/karo.h
board/karo/common/splashimage.c
boards.cfg
common/cmd_bootce.c
include/configs/tx6.h

Simple merge
Simple merge
Simple merge
diff --cc 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
Simple merge
  #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 */