X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=arch%2Farm%2Fmach-stm32%2Fsoc.c;h=738305caed18cccab564348a00425481da2cc4fc;hb=535d76a1215064866b1eb7f0aa61796fc32d31c1;hp=f6fd0b2e23c6fcd5d16f7b514de5ec1d740bb2d7;hpb=3fa9bc7969c130b373f41731db526a3511f40ea5;p=oweals%2Fu-boot.git

diff --git a/arch/arm/mach-stm32/soc.c b/arch/arm/mach-stm32/soc.c
index f6fd0b2e23..738305caed 100644
--- a/arch/arm/mach-stm32/soc.c
+++ b/arch/arm/mach-stm32/soc.c
@@ -1,13 +1,12 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2017, STMicroelectronics - All Rights Reserved
  * Author(s): Patrice Chotard, <patrice.chotard@st.com> for STMicroelectronics.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
 #include <asm/io.h>
-#include <asm/armv7m_mpu.h>
+#include <asm/armv7_mpu.h>
 
 int arch_cpu_init(void)
 {
@@ -22,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
 	};