From 5db2390e9dc885abd96302553492406865c655d4 Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Fri, 2 Feb 2024 10:28:05 +0000
Subject: [PATCH] soc: xilinx_zyncmp: Port to HWMv2

Ports the xilinx_zynqmp SoC configuration to hardware model
version 2

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
---
 soc/soc_legacy/arm/xilinx_zynqmp/Kconfig       |  5 -----
 .../zynqmp}/CMakeLists.txt                     |  2 ++
 .../Kconfig.soc => xilinx/zynqmp/Kconfig}      |  2 --
 .../zynqmp}/Kconfig.defconfig                  |  3 ---
 soc/xilinx/zynqmp/Kconfig.soc                  | 18 ++++++++++++++++++
 .../zynqmp}/arm_mpu_regions.c                  |  0
 .../zynqmp}/pinctrl_soc.h                      |  0
 .../arm/xilinx_zynqmp => xilinx/zynqmp}/soc.c  |  0
 .../arm/xilinx_zynqmp => xilinx/zynqmp}/soc.h  |  0
 soc/xilinx/zynqmp/soc.yml                      |  4 ++++
 10 files changed, 24 insertions(+), 10 deletions(-)
 delete mode 100644 soc/soc_legacy/arm/xilinx_zynqmp/Kconfig
 rename soc/{soc_legacy/arm/xilinx_zynqmp => xilinx/zynqmp}/CMakeLists.txt (91%)
 rename soc/{soc_legacy/arm/xilinx_zynqmp/Kconfig.soc => xilinx/zynqmp/Kconfig} (84%)
 rename soc/{soc_legacy/arm/xilinx_zynqmp => xilinx/zynqmp}/Kconfig.defconfig (94%)
 create mode 100644 soc/xilinx/zynqmp/Kconfig.soc
 rename soc/{soc_legacy/arm/xilinx_zynqmp => xilinx/zynqmp}/arm_mpu_regions.c (100%)
 rename soc/{soc_legacy/arm/xilinx_zynqmp => xilinx/zynqmp}/pinctrl_soc.h (100%)
 rename soc/{soc_legacy/arm/xilinx_zynqmp => xilinx/zynqmp}/soc.c (100%)
 rename soc/{soc_legacy/arm/xilinx_zynqmp => xilinx/zynqmp}/soc.h (100%)
 create mode 100644 soc/xilinx/zynqmp/soc.yml

diff --git a/soc/soc_legacy/arm/xilinx_zynqmp/Kconfig b/soc/soc_legacy/arm/xilinx_zynqmp/Kconfig
deleted file mode 100644
index 7c72b2d5046..00000000000
--- a/soc/soc_legacy/arm/xilinx_zynqmp/Kconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright (c) 2019 Stephanos Ioannidis <root@stephanos.io>
-# SPDX-License-Identifier: Apache-2.0
-
-config SOC_XILINX_ZYNQMP
-	bool
diff --git a/soc/soc_legacy/arm/xilinx_zynqmp/CMakeLists.txt b/soc/xilinx/zynqmp/CMakeLists.txt
similarity index 91%
rename from soc/soc_legacy/arm/xilinx_zynqmp/CMakeLists.txt
rename to soc/xilinx/zynqmp/CMakeLists.txt
index 65bf778779b..70885608559 100644
--- a/soc/soc_legacy/arm/xilinx_zynqmp/CMakeLists.txt
+++ b/soc/xilinx/zynqmp/CMakeLists.txt
@@ -10,6 +10,8 @@ zephyr_sources_ifdef(
   arm_mpu_regions.c
 )
 
+zephyr_include_directories(.)
+
 if(CONFIG_SOC_XILINX_ZYNQMP_RPU)
   set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_a_r/scripts/linker.ld CACHE INTERNAL "")
 endif()
diff --git a/soc/soc_legacy/arm/xilinx_zynqmp/Kconfig.soc b/soc/xilinx/zynqmp/Kconfig
similarity index 84%
rename from soc/soc_legacy/arm/xilinx_zynqmp/Kconfig.soc
rename to soc/xilinx/zynqmp/Kconfig
index 6d80f61c68e..f28454573c6 100644
--- a/soc/soc_legacy/arm/xilinx_zynqmp/Kconfig.soc
+++ b/soc/xilinx/zynqmp/Kconfig
@@ -3,10 +3,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config SOC_XILINX_ZYNQMP_RPU
-	bool "Xilinx ZynqMP RPU"
 	select ARM
 	select CPU_CORTEX_R5
-	select SOC_XILINX_ZYNQMP
 	select PLATFORM_SPECIFIC_INIT
 	select CPU_HAS_ARM_MPU
 	select VFP_DP_D16
diff --git a/soc/soc_legacy/arm/xilinx_zynqmp/Kconfig.defconfig b/soc/xilinx/zynqmp/Kconfig.defconfig
similarity index 94%
rename from soc/soc_legacy/arm/xilinx_zynqmp/Kconfig.defconfig
rename to soc/xilinx/zynqmp/Kconfig.defconfig
index ad294bbeda7..869f4403d32 100644
--- a/soc/soc_legacy/arm/xilinx_zynqmp/Kconfig.defconfig
+++ b/soc/xilinx/zynqmp/Kconfig.defconfig
@@ -4,9 +4,6 @@
 
 if SOC_XILINX_ZYNQMP
 
-config SOC
-	default "xilinx_zynqmp"
-
 if SOC_XILINX_ZYNQMP_RPU
 
 config NUM_IRQS
diff --git a/soc/xilinx/zynqmp/Kconfig.soc b/soc/xilinx/zynqmp/Kconfig.soc
new file mode 100644
index 00000000000..136e1d1f1a0
--- /dev/null
+++ b/soc/xilinx/zynqmp/Kconfig.soc
@@ -0,0 +1,18 @@
+# Copyright (c) 2019 Lexmark International, Inc.
+# Copyright (c) 2019 Stephanos Ioannidis <root@stephanos.io>
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_XILINX_ZYNQMP
+	bool
+
+config SOC_XILINX_ZYNQMP_RPU
+	bool
+	select SOC_XILINX_ZYNQMP
+	help
+	  Xilinx ZynqMP RPU
+
+config SOC_FAMILY
+	default "xilinx_zynqmp" if SOC_XILINX_ZYNQMP
+
+config SOC
+	default "zynqmp_rpu" if SOC_XILINX_ZYNQMP_RPU
diff --git a/soc/soc_legacy/arm/xilinx_zynqmp/arm_mpu_regions.c b/soc/xilinx/zynqmp/arm_mpu_regions.c
similarity index 100%
rename from soc/soc_legacy/arm/xilinx_zynqmp/arm_mpu_regions.c
rename to soc/xilinx/zynqmp/arm_mpu_regions.c
diff --git a/soc/soc_legacy/arm/xilinx_zynqmp/pinctrl_soc.h b/soc/xilinx/zynqmp/pinctrl_soc.h
similarity index 100%
rename from soc/soc_legacy/arm/xilinx_zynqmp/pinctrl_soc.h
rename to soc/xilinx/zynqmp/pinctrl_soc.h
diff --git a/soc/soc_legacy/arm/xilinx_zynqmp/soc.c b/soc/xilinx/zynqmp/soc.c
similarity index 100%
rename from soc/soc_legacy/arm/xilinx_zynqmp/soc.c
rename to soc/xilinx/zynqmp/soc.c
diff --git a/soc/soc_legacy/arm/xilinx_zynqmp/soc.h b/soc/xilinx/zynqmp/soc.h
similarity index 100%
rename from soc/soc_legacy/arm/xilinx_zynqmp/soc.h
rename to soc/xilinx/zynqmp/soc.h
diff --git a/soc/xilinx/zynqmp/soc.yml b/soc/xilinx/zynqmp/soc.yml
new file mode 100644
index 00000000000..e1a20c4a5ef
--- /dev/null
+++ b/soc/xilinx/zynqmp/soc.yml
@@ -0,0 +1,4 @@
+family:
+- name: xilinx_zynqmp
+  socs:
+  - name: zynqmp_rpu