Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck...

[firefly-linux-kernel-4.4.55.git] / arch / blackfin / kernel / cplb-nompu / cplbinit.c

diff --git a/arch/blackfin/kernel/cplb-nompu/cplbinit.c b/arch/blackfin/kernel/cplb-nompu/cplbinit.c
index 3e366dc2d6e11593fc9a0b986ae3550cf162ec91..34e96ce02aa9671701197e7bc3b8f65902fbb5d5 100644 (file)
--- a/arch/blackfin/kernel/cplb-nompu/cplbinit.c
+++ b/arch/blackfin/kernel/cplb-nompu/cplbinit.c
@@ -58,11 +58,19 @@ void __init generate_cplb_tables_cpu(unsigned int cpu)
 
 #ifdef CONFIG_ROMKERNEL
        /* Cover kernel XIP flash area */
+#ifdef CONFIG_BF60x
+       addr = CONFIG_ROM_BASE & ~(16 * 1024 * 1024 - 1);
+       d_tbl[i_d].addr = addr;
+       d_tbl[i_d++].data = SDRAM_DGENERIC | PAGE_SIZE_16MB;
+       i_tbl[i_i].addr = addr;
+       i_tbl[i_i++].data = SDRAM_IGENERIC | PAGE_SIZE_16MB;
+#else
        addr = CONFIG_ROM_BASE & ~(4 * 1024 * 1024 - 1);
        d_tbl[i_d].addr = addr;
        d_tbl[i_d++].data = SDRAM_DGENERIC | PAGE_SIZE_4MB;
        i_tbl[i_i].addr = addr;
        i_tbl[i_i++].data = SDRAM_IGENERIC | PAGE_SIZE_4MB;
+#endif
 #endif
 
        /* Cover L1 memory.  One 4M area for code and data each is enough.  */