karo: tx6: rename board variants

diff --git a/board/karo/tx6/tx6qdl.c b/board/karo/tx6/tx6qdl.c
index 7f9ab2fd02bfef8ca13413c43e39a6859eaa6fad..932d5d7be7f90b2092800c8c435d1629f4f48190 100644 (file)
--- a/board/karo/tx6/tx6qdl.c
+++ b/board/karo/tx6/tx6qdl.c
@@ -1066,14 +1066,15 @@ exit:
 
 int checkboard(void)
 {
+       u32 cpurev = get_cpu_rev();
+       int cpu_variant = (cpurev >> 12) & 0xff;
+
        print_cpuinfo();
-#if defined(CONFIG_MX6Q)
-       printf("Board: Ka-Ro TX6Q\n");
-#elif defined(CONFIG_MX6DL)
-       printf("Board: Ka-Ro TX6DL\n");
-#else
-#error Unsupported i.MX6 variant selected
-#endif
+
+       printf("Board: Ka-Ro TX6%c-%dxx%d\n",
+               cpu_variant == MXC_CPU_MX6Q ? 'Q' : 'U',
+               cpu_variant == MXC_CPU_MX6Q ? 1 : 8,
+               1 - PHYS_SDRAM_1_WIDTH / 64);
 
 #ifdef TIMER_TEST
        {

diff --git a/boards.cfg b/boards.cfg
index 64d2620cc84db57f1c05c5191a963237bd273f8e..f8c39a3abed12520e78caf51409ee9e2a830ec30 100644 (file)
--- a/boards.cfg
+++ b/boards.cfg
@@ -261,12 +261,15 @@ tx53-xx20              arm         armv7       tx53                karo           mx5
 tx53-xx21                   arm         armv7       tx53                karo           mx5             tx53:NR_DRAM_BANKS=2,SYS_TX53_HWREV_2
 tx53-xx30                   arm         armv7       tx53                karo           mx5             tx53:NR_DRAM_BANKS=1
 tx53-xx31                   arm         armv7       tx53                karo           mx5             tx53:NR_DRAM_BANKS=2
-tx6dl                        arm         armv7       tx6                 karo           mx6            tx6:MX6DL
-tx6dl_mfg                    arm         armv7       tx6                 karo           mx6            tx6:MX6DL,MFG
-tx6dl_noenv                  arm         armv7       tx6                 karo           mx6            tx6:MX6DL,ENV_IS_NOWHERE
-tx6q                         arm         armv7       tx6                 karo           mx6            tx6:MX6Q
-tx6q_mfg                     arm         armv7       tx6                 karo           mx6            tx6:MX6Q,MFG
-tx6q_noenv                   arm         armv7       tx6                 karo           mx6            tx6:MX6Q,ENV_IS_NOWHERE
+tx6u-8xx0                    arm         armv7       tx6                 karo           mx6            tx6:MX6DL
+tx6u-8xx0_mfg                arm         armv7       tx6                 karo           mx6            tx6:MX6DL,MFG
+tx6u-8xx0_noenv              arm         armv7       tx6                 karo           mx6            tx6:MX6DL,ENV_IS_NOWHERE
+tx6u-8xx1                    arm         armv7       tx6                 karo           mx6            tx6:MX6DL,SYS_SDRAM_BUS_WIDTH=32
+tx6u-8xx1_mfg                arm         armv7       tx6                 karo           mx6            tx6:MX6DL,SYS_SDRAM_BUS_WIDTH=32,MFG
+tx6u-8xx1_noenv              arm         armv7       tx6                 karo           mx6            tx6:MX6DL,SYS_SDRAM_BUS_WIDTH=32,ENV_IS_NOWHERE
+tx6q-1xx0                    arm         armv7       tx6                 karo           mx6            tx6:MX6Q
+tx6q-1xx0_mfg                arm         armv7       tx6                 karo           mx6            tx6:MX6Q,MFG
+tx6q-1xx0_noenv              arm         armv7       tx6                 karo           mx6            tx6:MX6Q,ENV_IS_NOWHERE
 mx6qarm2                     arm         armv7       mx6qarm2            freescale      mx6            mx6qarm2:IMX_CONFIG=board/freescale/mx6qarm2/imximage.cfg
 mx6qsabreauto                arm         armv7       mx6qsabreauto       freescale      mx6            mx6qsabreauto:IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg
 mx6qsabrelite                arm         armv7       mx6qsabrelite       freescale      mx6            mx6qsabrelite:IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg