Merge branch 'master' of git://git.denx.de/u-boot

[platform/kernel/u-boot.git] / arch / arm / mach-keystone / init.c

diff --git a/arch/arm/mach-keystone/init.c b/arch/arm/mach-keystone/init.c
index c96845c..aadd10b 100644 (file)
--- a/arch/arm/mach-keystone/init.c
+++ b/arch/arm/mach-keystone/init.c
@@ -103,7 +103,9 @@ int arch_cpu_init(void)
 
        msmc_share_all_segments(KS2_MSMC_SEGMENT_TETRIS);
        msmc_share_all_segments(KS2_MSMC_SEGMENT_NETCP);
+#ifdef KS2_MSMC_SEGMENT_QM_PDSP
        msmc_share_all_segments(KS2_MSMC_SEGMENT_QM_PDSP);
+#endif
        msmc_share_all_segments(KS2_MSMC_SEGMENT_PCIE0);
 
        /* Initialize the PCIe-0 to work as Root Complex */
@@ -122,8 +124,10 @@ int arch_cpu_init(void)
         * UART register PWREMU_MGMT is initialized. Linux UART
         * driver doesn't handle this.
         */
+#ifndef CONFIG_DM_SERIAL
        NS16550_init((NS16550_t)(CONFIG_SYS_NS16550_COM2),
                     CONFIG_SYS_NS16550_CLK / 16 / CONFIG_BAUDRATE);
+#endif
 
        return 0;
 }
@@ -149,3 +153,38 @@ void enable_caches(void)
        dcache_enable();
 #endif
 }
+
+#if defined(CONFIG_DISPLAY_CPUINFO)
+int print_cpuinfo(void)
+{
+       u16 cpu = get_part_number();
+       u8 rev = cpu_revision();
+
+       puts("CPU: ");
+       switch (cpu) {
+       case CPU_66AK2Hx:
+               puts("66AK2Hx SR");
+               break;
+       case CPU_66AK2Lx:
+               puts("66AK2Lx SR");
+               break;
+       case CPU_66AK2Ex:
+               puts("66AK2Ex SR");
+               break;
+       case CPU_66AK2Gx:
+               puts("66AK2Gx SR");
+               break;
+       default:
+               puts("Unknown\n");
+       }
+
+       if (rev == 2)
+               puts("2.0\n");
+       else if (rev == 1)
+               puts("1.1\n");
+       else if (rev == 0)
+               puts("1.0\n");
+
+       return 0;
+}
+#endif