soc: bcm_vk: Port to HWMv2

Ports the bcm_vk SoC configuration to hardware model version 2

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

soc/arm/bcm_vk/Kconfig.defconfig

@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-#
-# Copyright 2020 Broadcom.
-#
-
-source "soc/arm/bcm_vk/*/Kconfig.defconfig.series"

soc/arm/bcm_vk/valkyrie/Kconfig.defconfig.valkyrie_bcm58400

@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-#
-# Copyright 2020 Broadcom.
-
-config SOC
-	default "BCM58400"
-	depends on SOC_BCM58400

soc/arm/bcm_vk/valkyrie/Kconfig.soc

@@ -1,12 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-#
-# Copyright 2020 Broadcom.
-#
-
-choice
-prompt "Broadcom Valkyrie SoC"
-depends on SOC_SERIES_VALKYRIE
-
-config SOC_BCM58400
-	bool "Broadcom BCM58400"
-endchoice

soc/arm/bcm_vk/viper/CMakeLists.txt

@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-zephyr_include_directories(.)
-zephyr_sources(
-	soc.c
-)
-
-set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_m/scripts/linker.ld CACHE INTERNAL "")

soc/arm/bcm_vk/viper/Kconfig.series

@@ -1,9 +0,0 @@
-# Copyright 2020 Broadcom
-# SPDX-License-Identifier: Apache-2.0
-
-config SOC_SERIES_VIPER
-	bool "Broadcom Viper Series"
-	select ARM
-	select SOC_FAMILY_BCMVK
-	help
-	  Enable support for Broadcom Viper Series.

soc/arm/bcm_vk/viper/Kconfig.soc

@@ -1,14 +0,0 @@
-# Copyright 2020 Broadcom
-# SPDX-License-Identifier: Apache-2.0
-
-choice
-prompt "Broadcom Viper SoC"
-depends on SOC_SERIES_VIPER
-
-config SOC_BCM58402_M7
-	bool "Broadcom BCM58402 M7"
-	select CPU_CORTEX_M7
-	select CPU_CORTEX_M_HAS_SYSTICK
-	select CPU_HAS_ARM_MPU
-
-endchoice

soc/arm64/bcm_vk/CMakeLists.txt

@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-add_subdirectory(${SOC_SERIES})

soc/arm64/bcm_vk/Kconfig

@@ -1,16 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-#
-# Copyright 2020 Broadcom.
-#
-
-config SOC_FAMILY_BCMVK
-	bool
-
-if SOC_FAMILY_BCMVK
-config SOC_FAMILY
-	string
-	default "bcm_vk"
-
-source "soc/arm64/bcm_vk/*/Kconfig.soc"
-
-endif

soc/arm64/bcm_vk/Kconfig.defconfig

@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-#
-# Copyright 2020 Broadcom.
-#
-
-source "soc/arm64/bcm_vk/*/Kconfig.defconfig.series"

soc/arm64/bcm_vk/viper/CMakeLists.txt

@@ -1,11 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-zephyr_include_directories(.)
-zephyr_sources(
-	soc.c
-)
-zephyr_sources_ifdef(CONFIG_SOC_BCM58402_A72	plat_core.c)
-
-zephyr_sources_ifdef(CONFIG_ARM_MMU mmu_regions.c)
-
-set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm64/scripts/linker.ld CACHE INTERNAL "")

soc/arm64/bcm_vk/viper/Kconfig.defconfig.series

@@ -1,11 +0,0 @@
-# Copyright 2020 Broadcom
-# SPDX-License-Identifier: Apache-2.0
-
-if SOC_SERIES_VIPER
-
-config SOC_SERIES
-	default "viper"
-
-source "soc/arm64/bcm_vk/viper/Kconfig.defconfig.viper*"
-
-endif # SOC_SERIES_VIPER

soc/arm64/bcm_vk/viper/Kconfig.series

@@ -1,9 +0,0 @@
-# Copyright 2020 Broadcom
-# SPDX-License-Identifier: Apache-2.0
-
-config SOC_SERIES_VIPER
-	bool "Broadcom Viper Series"
-	select ARM64
-	select SOC_FAMILY_BCMVK
-	help
-	  Enable support for Broadcom Viper Series.

soc/v2/broadcom/bcm_vk/Kconfig

@@ -3,4 +3,8 @@
 # Copyright 2020 Broadcom.
 #
 
-source "soc/arm64/bcm_vk/*/Kconfig.series"
+if SOC_FAMILY_BCMVK
+
+rsource "*/Kconfig"
+
+endif

soc/v2/broadcom/bcm_vk/Kconfig.defconfig

@@ -3,4 +3,4 @@
 # Copyright 2020 Broadcom.
 #
 
-source "soc/arm/bcm_vk/*/Kconfig.series"
+rsource "*/Kconfig.defconfig"

soc/v2/broadcom/bcm_vk/Kconfig.soc

@@ -6,11 +6,8 @@
 config SOC_FAMILY_BCMVK
 	bool
 
-if SOC_FAMILY_BCMVK
 config SOC_FAMILY
 	string
-	default "bcm_vk"
+	default "bcm_vk" if SOC_FAMILY_BCMVK
 
-source "soc/arm/bcm_vk/*/Kconfig.soc"
-
-endif
+rsource "*/Kconfig.soc"

soc/v2/broadcom/bcm_vk/soc.yml

@@ -0,0 +1,10 @@
+series:
+- name: valkyrie
+  socs:
+  - name: bcm58400
+- name: viper
+  socs:
+  - name: bcm58402
+    cpuclusters:
+    - name: m7
+    - name: a72

soc/v2/broadcom/bcm_vk/valkyrie/Kconfig

@@ -4,11 +4,7 @@
 #
 
 config SOC_SERIES_VALKYRIE
-	bool "Broadcom Valkyrie Series"
 	select ARM
 	select CPU_CORTEX_M7
-	select SOC_FAMILY_BCMVK
 	select CPU_CORTEX_M_HAS_SYSTICK
 	select CPU_HAS_ARM_MPU
-	help
-	  Enable support for Broadcom Valkyrie Series

soc/v2/broadcom/bcm_vk/valkyrie/Kconfig.defconfig

@@ -5,9 +5,6 @@
 
 if SOC_SERIES_VALKYRIE
 
-config SOC_SERIES
-	default "valkyrie"
-
 config NUM_IRQS
 	int
 	default 240
@@ -16,6 +13,4 @@ config SYS_CLOCK_HW_CYCLES_PER_SEC
 	int
 	default 500000000
 
-source "soc/arm/bcm_vk/valkyrie/Kconfig.defconfig.valkyrie*"
-
 endif # SOC_SERIES_VALKYRIE

soc/v2/broadcom/bcm_vk/valkyrie/Kconfig.soc

@@ -0,0 +1,22 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright 2020 Broadcom.
+#
+
+config SOC_SERIES_VALKYRIE
+	bool
+	select SOC_FAMILY_BCMVK
+	help
+	  Enable support for Broadcom Valkyrie Series
+
+config SOC_BCM58400
+	bool
+	select SOC_SERIES_VALKYRIE
+	help
+	  Broadcom BCM58400
+
+config SOC_SERIES
+	default "valkyrie" if SOC_SERIES_VALKYRIE
+
+config SOC
+	default "bcm58400" if SOC_BCM58400

soc/v2/broadcom/bcm_vk/viper/CMakeLists.txt

@@ -0,0 +1,19 @@
+# SPDX-License-Identifier: Apache-2.0
+
+if(CONFIG_SOC_BCM58402_A72)
+  zephyr_include_directories(a72)
+
+  zephyr_sources(
+    a72/soc.c
+    a72/plat_core.c
+  )
+
+  zephyr_sources_ifdef(CONFIG_ARM_MMU a72/mmu_regions.c)
+
+  set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm64/scripts/linker.ld CACHE INTERNAL "")
+elseif(CONFIG_SOC_BCM58402_M7)
+  zephyr_include_directories(m7)
+  zephyr_sources(m7/soc.c)
+
+  set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_m/scripts/linker.ld CACHE INTERNAL "")
+endif()

soc/v2/broadcom/bcm_vk/viper/Kconfig

@@ -1,14 +1,13 @@
 # Copyright 2020 Broadcom
 # SPDX-License-Identifier: Apache-2.0
 
-choice
-prompt "Broadcom Viper SoC"
-depends on SOC_SERIES_VIPER
+config SOC_BCM58402_M7
+	select ARM
+	select CPU_CORTEX_M7
+	select CPU_CORTEX_M_HAS_SYSTICK
+	select CPU_HAS_ARM_MPU
 
 config SOC_BCM58402_A72
-	bool "Broadcom BCM58402 A72"
 	select ARM64
 	select CPU_CORTEX_A72
 	select ARM_ARCH_TIMER if SYS_CLOCK_EXISTS
-
-endchoice

soc/v2/broadcom/bcm_vk/viper/Kconfig.defconfig

@@ -3,9 +3,6 @@
 
 if SOC_SERIES_VIPER
 
-config SOC_SERIES
-	default "viper"
-
-source "soc/arm/bcm_vk/viper/Kconfig.defconfig.viper*"
+rsource "Kconfig.defconfig.viper*"
 
 endif # SOC_SERIES_VIPER

soc/v2/broadcom/bcm_vk/viper/Kconfig.defconfig.viper_bcm58402_a72

@@ -3,9 +3,6 @@
 
 if SOC_BCM58402_A72
 
-config SOC
-	default "bcm58402_a72"
-
 config NUM_IRQS
 	int
 	default 260

soc/v2/broadcom/bcm_vk/viper/Kconfig.defconfig.viper_bcm58402_m7

@@ -3,9 +3,6 @@
 
 if SOC_BCM58402_M7
 
-config SOC
-	default "bcm58402_m7"
-
 config NUM_IRQS
 	int
 	default 240

soc/v2/broadcom/bcm_vk/viper/Kconfig.soc

@@ -0,0 +1,27 @@
+# Copyright 2020 Broadcom
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_SERIES_VIPER
+	bool
+	select SOC_FAMILY_BCMVK
+	help
+	  Enable support for Broadcom Viper Series.
+
+config SOC_BCM58402_M7
+	bool
+	select SOC_SERIES_VIPER
+	help
+	  Broadcom BCM58402 M7
+
+config SOC_BCM58402_A72
+	bool
+	select SOC_SERIES_VIPER
+	help
+	  Broadcom BCM58402 A72
+
+config SOC_SERIES
+	default "viper" if SOC_SERIES_VIPER
+
+config SOC
+	default "bcm58402_m7" if SOC_BCM58402_M7
+	default "bcm58402_a72" if SOC_BCM58402_A72