soc: rk3399: Port to HWMv2

Ports the rk3399 SoC configuration to hardware model version 2

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>

soc/arm64/rockchip/CMakeLists.txt

@@ -1,7 +0,0 @@
-#
-# Copyright 2022 Huawei France Technologies SASU
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-add_subdirectory(${SOC_SERIES})

soc/arm64/rockchip/Kconfig

@@ -1,22 +0,0 @@
-#
-# Copyright 2021 Huawei France Technologies SASU
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-config SOC_FAMILY_ROCKCHIP
-	bool
-
-if SOC_FAMILY_ROCKCHIP
-
-config SOC_FAMILY
-	string
-	default "rockchip"
-
-source "soc/arm64/rockchip/*/Kconfig.soc"
-
-config SOC_PART_NUMBER
-	default "RK3399" if SOC_SERIES_RK3399
-	default "RK3568" if SOC_SERIES_RK3568
-
-endif # SOC_FAMILY_ROCKCHIP

soc/arm64/rockchip/Kconfig.defconfig

@@ -1,7 +0,0 @@
-#
-# Copyright 2021 Huawei France Technologies SASU
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-source "soc/arm64/rockchip/*/Kconfig.defconfig.series"

soc/arm64/rockchip/Kconfig.soc

@@ -1,7 +0,0 @@
-#
-# Copyright 2022 Huawei France Technologies SASU
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-source "soc/arm64/rockchip/*/Kconfig.series"

soc/arm64/rockchip/rk3399/Kconfig.series

@@ -1,12 +0,0 @@
-#
-# Copyright 2022 Huawei France Technologies SASU
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-config SOC_SERIES_RK3399
-	bool "Rockchip RK3399 Series"
-	select ARM64
-	select SOC_FAMILY_ROCKCHIP
-	help
-	  Enable support for Rockchip RK3399 Series.

soc/v2/rockchip/rk3399/Kconfig

@@ -4,14 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-choice
-prompt "Rockchip RK3399 SoC"
-depends on SOC_SERIES_RK3399
-
 config SOC_RK3399
-	bool "Rockchip RK3399"
 	select ARM64
 	select CPU_CORTEX_A53
 	select ARM_ARCH_TIMER if SYS_CLOCK_EXISTS
-
-endchoice

soc/v2/rockchip/rk3399/Kconfig.defconfig

@@ -6,9 +6,6 @@
 
 if SOC_SERIES_RK3399
 
-config SOC_SERIES
-	default "rk3399"
-
-source "soc/arm64/rockchip/rk3399/Kconfig.defconfig.rk3399"
+rsource "Kconfig.defconfig.rk3399"
 
 endif # SOC_SERIES_RK3399

soc/v2/rockchip/rk3399/Kconfig.defconfig.rk3399

@@ -6,9 +6,6 @@
 
 if SOC_RK3399
 
-config SOC
-	default "rk3399"
-
 config NUM_IRQS
 	int
 	default 240

soc/v2/rockchip/rk3399/Kconfig.soc

@@ -0,0 +1,22 @@
+#
+# Copyright 2022 Huawei France Technologies SASU
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config SOC_RK3399
+	bool
+	select SOC_SERIES_RK3399
+
+config SOC_SERIES_RK3399
+	bool
+	select SOC_FAMILY_ROCKCHIP
+
+config SOC
+	default "rk3399" if SOC_RK3399
+
+config SOC_SERIES
+	default "rk3399" if SOC_SERIES_RK3399
+
+config SOC_PART_NUMBER
+	default "RK3399" if SOC_SERIES_RK3399

soc/v2/rockchip/soc.yml

@@ -1,4 +1,7 @@
 series:
+- name: rk3399
+  socs:
+  - name: rk3399
 - name: rk3568
   socs:
   - name: rk3568