diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 3355b3b..d6b06e6 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -874,6 +874,8 @@ source "arch/arm/mach-zynq/Kconfig"
 
 source "arch/arm/cpu/armv7/Kconfig"
 
+source "arch/arm/cpu/armv8/zynqmp/Kconfig"
+
 source "arch/arm/cpu/armv8/Kconfig"
 
 source "arch/arm/imx-common/Kconfig"
@@ -991,7 +993,6 @@ source "board/warp/Kconfig"
 source "board/woodburn/Kconfig"
 source "board/work-microwave/work_92105/Kconfig"
 source "board/xaeniax/Kconfig"
-source "board/xilinx/zynqmp/Kconfig"
 source "board/zipitz2/Kconfig"
 
 source "arch/arm/Kconfig.debug"
diff --git a/board/xilinx/zynqmp/Kconfig b/arch/arm/cpu/armv8/zynqmp/Kconfig
similarity index 100%
rename from board/xilinx/zynqmp/Kconfig
rename to arch/arm/cpu/armv8/zynqmp/Kconfig