From ca38dc2ff5bcca89f8d75738378e2e4d603a7c99 Mon Sep 17 00:00:00 2001
From: Patrice Chotard <patrice.chotard@st.com>
Date: Fri, 3 Aug 2018 11:46:14 +0200
Subject: [PATCH] configs: stm32f4xx: Enable ICACHE and DCACHE

Enable instruction and data caches.
Fix boot_sd command as since commit d409c962169b ("armv7m: disable
 icache before linux booting"), instruction cache is automatically
disable before linux booting. "icache off" from boot_sd command
becomes useless, remove it.

Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
---
 include/configs/stm32f429-discovery.h  | 3 ---
 include/configs/stm32f429-evaluation.h | 5 +----
 include/configs/stm32f469-discovery.h  | 5 +----
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/include/configs/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h
index 38af704c3b..90d7429e70 100644
--- a/include/configs/stm32f429-discovery.h
+++ b/include/configs/stm32f429-discovery.h
@@ -13,9 +13,6 @@
 
 #define CONFIG_SYS_INIT_SP_ADDR		0x10010000
 
-#define CONFIG_SYS_ICACHE_OFF
-#define CONFIG_SYS_DCACHE_OFF
-
 /*
  * Configuration of the external SDRAM memory
  */
diff --git a/include/configs/stm32f429-evaluation.h b/include/configs/stm32f429-evaluation.h
index 258ae767d2..d48940d0c8 100644
--- a/include/configs/stm32f429-evaluation.h
+++ b/include/configs/stm32f429-evaluation.h
@@ -13,9 +13,6 @@
 
 #define CONFIG_SYS_INIT_SP_ADDR		0x10010000
 
-#define CONFIG_SYS_ICACHE_OFF
-#define CONFIG_SYS_DCACHE_OFF
-
 /*
  * Configuration of the external SDRAM memory
  */
@@ -48,7 +45,7 @@
 	"run boot_sd"
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
-	"boot_sd=mmc dev 0;fatload mmc 0 0x00700000 stm32429i-eval.dtb; fatload mmc 0 0x00008000 zImage; icache off; bootz 0x00008000 - 0x00700000"
+	"boot_sd=mmc dev 0;fatload mmc 0 0x00700000 stm32429i-eval.dtb; fatload mmc 0 0x00008000 zImage; bootz 0x00008000 - 0x00700000"
 
 /*
  * Command line configuration.
diff --git a/include/configs/stm32f469-discovery.h b/include/configs/stm32f469-discovery.h
index a9182450e6..be8c233156 100644
--- a/include/configs/stm32f469-discovery.h
+++ b/include/configs/stm32f469-discovery.h
@@ -13,9 +13,6 @@
 
 #define CONFIG_SYS_INIT_SP_ADDR		0x10010000
 
-#define CONFIG_SYS_ICACHE_OFF
-#define CONFIG_SYS_DCACHE_OFF
-
 /*
  * Configuration of the external SDRAM memory
  */
@@ -48,7 +45,7 @@
 	"run boot_sd"
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
-	"boot_sd=mmc dev 0;fatload mmc 0 0x00700000 stm32f469-disco.dtb; fatload mmc 0 0x00008000 zImage; icache off; bootz 0x00008000 - 0x00700000"
+	"boot_sd=mmc dev 0;fatload mmc 0 0x00700000 stm32f469-disco.dtb; fatload mmc 0 0x00008000 zImage; bootz 0x00008000 - 0x00700000"
 
 /*
  * Command line configuration.
-- 
2.39.5