From f83f0cb4c723e7b8cc1c2ef39ebfa1fc848cff3d Mon Sep 17 00:00:00 2001
From: Tom Rini <trini@konsulko.com>
Date: Wed, 30 Mar 2022 18:07:26 -0400
Subject: [PATCH] microblaze: Migrate DCACHE/ICACHE to Kconfig

Move these two options to the arch Kconfig file.

Cc: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
Acked-by: Michal Simek <michal.simek@xilinx.com>
---
 arch/microblaze/Kconfig              | 8 ++++++++
 include/configs/microblaze-generic.h | 3 ---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index a25a95a013..d7d1b21970 100644
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -25,6 +25,14 @@ config TARGET_MICROBLAZE_GENERIC
 
 endchoice
 
+config DCACHE
+	bool "Enable dcache support"
+	default y
+
+config ICACHE
+	bool "Enable icache support"
+	default y
+
 source "board/xilinx/Kconfig"
 source "board/xilinx/microblaze-generic/Kconfig"
 
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index 744e20e58e..663837f33d 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -30,9 +30,6 @@
 # define CONFIG_SYS_MAX_FLASH_SECT	2048
 #endif
 
-#define CONFIG_ICACHE
-#define CONFIG_DCACHE
-
 #ifndef XILINX_DCACHE_BYTE_SIZE
 #define XILINX_DCACHE_BYTE_SIZE	32768
 #endif
-- 
2.39.5