karo: tx6ul: make board string dependent on cpurev

[karo-tx-uboot.git] / board / karo / tx6 / tx6ul.c

diff --git a/board/karo/tx6/tx6ul.c b/board/karo/tx6/tx6ul.c
index b8ff2c8f4f748bc787d438678507f91a8800703d..52ac588db9d4813b91ecc1bd92dd635adabf8f2e 100644 (file)
--- a/board/karo/tx6/tx6ul.c
+++ b/board/karo/tx6/tx6ul.c
@@ -357,23 +357,16 @@ int checkboard(void)
        u32 cpurev = get_cpu_rev();
        char *cpu_str = "?";
 
-       switch ((cpurev >> 12) & 0xff) {
-       case MXC_CPU_MX6SL:
+       if (is_cpu_type(MXC_CPU_MX6SL))
                cpu_str = "SL";
-               break;
-       case MXC_CPU_MX6DL:
+       else if (is_cpu_type(MXC_CPU_MX6DL))
                cpu_str = "DL";
-               break;
-       case MXC_CPU_MX6SOLO:
+       else if (is_cpu_type(MXC_CPU_MX6SOLO))
                cpu_str = "SOLO";
-               break;
-       case MXC_CPU_MX6Q:
+       else if (is_cpu_type(MXC_CPU_MX6Q))
                cpu_str = "Q";
-               break;
-       case MXC_CPU_MX6UL:
+       else if (is_cpu_type(MXC_CPU_MX6UL))
                cpu_str = "UL";
-               break;
-       }
 
        printf("CPU:   Freescale i.MX6%s rev%d.%d at %d MHz\n",
                cpu_str,
@@ -444,10 +437,12 @@ static int pmic_addr __maybe_unused = 0x33;
 int board_init(void)
 {
        int ret;
+       u32 cpurev = get_cpu_rev();
 
        debug("%s@%d: \n", __func__, __LINE__);
 
-       printf("Board: Ka-Ro TXUL-001%c\n",
+       printf("Board: Ka-Ro TXUL-%c01%c\n",
+               ((cpurev &0xff) > 0x10) ? '5' : '0',
                tx6ul_mem_suffix());
 
        get_hab_status();
@@ -627,7 +622,7 @@ int board_mmc_init(bd_t *bis)
        }
        return 0;
 }
-#endif /* CONFIG_CMD_MMC */
+#endif /* CONFIG_FSL_ESDHC */
 
 enum {
        LED_STATE_INIT = -1,