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

[oweals/u-boot.git] / arch / arm / mach-imx / imx8 / cpu.c

diff --git a/arch/arm/mach-imx/imx8/cpu.c b/arch/arm/mach-imx/imx8/cpu.c
index 4bbc956f9db70bf638ec25647ef6acb68fb06faa..53f9a8735ad6dcd41bc38fc851019879c655a73a 100644 (file)
--- a/arch/arm/mach-imx/imx8/cpu.c
+++ b/arch/arm/mach-imx/imx8/cpu.c
@@ -446,7 +446,7 @@ void enable_caches(void)
        dcache_enable();
 }
 
-#ifndef CONFIG_SYS_DCACHE_OFF
+#if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF)
 u64 get_page_table_size(void)
 {
        u64 one_pt = MAX_PTE_ENTRIES * sizeof(u64);
@@ -542,6 +542,8 @@ const char *get_imx8_type(u32 imxtype)
        case MXC_CPU_IMX8QXP:
        case MXC_CPU_IMX8QXP_A0:
                return "QXP";
+       case MXC_CPU_IMX8QM:
+               return "QM";
        default:
                return "??";
        }
@@ -613,6 +615,7 @@ static const struct cpu_ops cpu_imx8_ops = {
 
 static const struct udevice_id cpu_imx8_ids[] = {
        { .compatible = "arm,cortex-a35" },
+       { .compatible = "arm,cortex-a53" },
        { }
 };