armv8: layerscape: Add TFABOOT support

[oweals/u-boot.git] / arch / arm / mach-stm32 / soc.c

diff --git a/arch/arm/mach-stm32/soc.c b/arch/arm/mach-stm32/soc.c
index 02592684b946f8f722fabec428429baae7e5c06a..738305caed18cccab564348a00425481da2cc4fc 100644 (file)
--- a/arch/arm/mach-stm32/soc.c
+++ b/arch/arm/mach-stm32/soc.c
@@ -6,7 +6,7 @@
 
 #include <common.h>
 #include <asm/io.h>
-#include <asm/armv7m_mpu.h>
+#include <asm/armv7_mpu.h>
 
 int arch_cpu_init(void)
 {
@@ -21,14 +21,9 @@ int arch_cpu_init(void)
                O_I_WB_RD_WR_ALLOC, REGION_16MB },
 #endif
 
-#if defined(CONFIG_STM32F7)
+#if defined(CONFIG_STM32F7) || defined(CONFIG_STM32H7)
                { 0xC0000000, REGION_0, XN_DIS, PRIV_RW_USR_RW,
-               O_I_WB_RD_WR_ALLOC, REGION_16MB },
-#endif
-
-#if defined(CONFIG_STM32H7)
-               { 0xD0000000, REGION_0, XN_DIS, PRIV_RW_USR_RW,
-               O_I_WB_RD_WR_ALLOC, REGION_32MB },
+               O_I_WB_RD_WR_ALLOC, REGION_512MB },
 #endif
        };