ARM: zynqmp: Extend cache handling

- Add cache on/off functions to Kconfig. ARC has already done it and this
  should be the same for all platforms.
- Disable caches for noatf dc1/dc2 configurations
- Enable CMD_CACHE

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/arm/cpu/armv8/zynqmp/Kconfig b/arch/arm/cpu/armv8/zynqmp/Kconfig
index 3dba8b2ec1f805746745f8bf94f1147389009ae8..e87d217f47de7b4662de1431fe1592d4065baad7 100644 (file)
--- a/arch/arm/cpu/armv8/zynqmp/Kconfig
+++ b/arch/arm/cpu/armv8/zynqmp/Kconfig
@@ -45,4 +45,12 @@ config NAND_ARASAN
 config ZYNQMP_USB
        bool "Configure ZynqMP USB"
 
+config SYS_DCACHE_OFF
+       bool "Do not use Data Cache"
+       default n
+
+config SYS_ICACHE_OFF
+       bool "Do not use Instruction Cache"
+       default n
+
 endif

diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_noatf_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_noatf_defconfig
index a57b16085f7f9bbbbd815478929bd6febbcb6b6e..7732f4247f4504807b0946cb9ec02ad8cdd5c66d 100644 (file)
--- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_noatf_defconfig
+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_noatf_defconfig
@@ -1,4 +1,6 @@
 CONFIG_ARM=y
+CONFIG_SYS_ICACHE_OFF=y
+CONFIG_SYS_DCACHE_OFF=y
 CONFIG_ARCH_ZYNQMP=y
 CONFIG_TARGET_ZYNQMP_ZC1751_XM015_DC1=y
 CONFIG_SECURE_IOU=y

diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_noatf_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_noatf_defconfig
index 29e6977468d87f50940869c07d29266d474f1653..15db35f655b8932dbd5d5f456a3d3f41154fc714 100644 (file)
--- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_noatf_defconfig
+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_noatf_defconfig
@@ -1,4 +1,6 @@
 CONFIG_ARM=y
+CONFIG_SYS_ICACHE_OFF=y
+CONFIG_SYS_DCACHE_OFF=y
 CONFIG_ARCH_ZYNQMP=y
 CONFIG_TARGET_ZYNQMP_ZC1751_XM016_DC2=y
 CONFIG_SECURE_IOU=y

diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index 6bdae288dd022bbfbd3c5c7d14e878a778732ce1..ba531a5f3dbad36d49b1a0b71c881529b346cdd0 100644 (file)
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -289,4 +289,6 @@
 #define CONFIG_BOARD_EARLY_INIT_R
 #define CONFIG_CLOCKS
 
+#define CONFIG_CMD_CACHE
+
 #endif /* __XILINX_ZYNQMP_H */