diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index a25a95a0131..d7d1b219704 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 744e20e58e7..663837f33dc 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