soc: musca: Port to HWMv2

Ports the musca SoC configuration to hardware model version 2

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

soc/arm/musca/CMakeLists.txt

@@ -4,8 +4,11 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-zephyr_sources(
-  soc.c
-  )
+if(CONFIG_SOC_V2M_MUSCA_B1)
+  zephyr_sources(b1/soc.c)
+  zephyr_include_directories(b1)
+elseif(CONFIG_SOC_V2M_MUSCA_S1)
+  zephyr_include_directories(s1)
+endif()
 
 set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_m/scripts/linker.ld CACHE INTERNAL "")

soc/arm/musca/Kconfig

@@ -0,0 +1,20 @@
+# Copyright (c) 2019 Linaro Limited
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_SERIES_MUSCA
+	select ARM
+	select BUILD_OUTPUT_HEX
+
+config SOC_V2M_MUSCA_B1
+	select CPU_CORTEX_M33
+	select CPU_HAS_ARM_SAU
+	select CPU_HAS_ARM_MPU
+	select CPU_CORTEX_M_HAS_DWT
+
+config SOC_V2M_MUSCA_S1
+	select CPU_CORTEX_M33
+	select CPU_HAS_ARM_SAU
+	select CPU_HAS_ARM_MPU
+	select CPU_CORTEX_M_HAS_DWT
+	select CPU_HAS_FPU
+	select ARMV8_M_DSP

soc/arm/musca/Kconfig.defconfig

@@ -0,0 +1,9 @@
+# Copyright (c) 2019 Linaro Limited
+# SPDX-License-Identifier: Apache-2.0
+
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default 40000000 if SOC_V2M_MUSCA_B1
+	default 50000000 if SOC_V2M_MUSCA_S1
+
+config NUM_IRQS
+	default 96 if SOC_SERIES_MUSCA

soc/arm/musca/Kconfig.soc

@@ -0,0 +1,27 @@
+# Copyright (c) 2019 Linaro Limited
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_SERIES_MUSCA
+	bool
+	select SOC_FAMILY_ARM
+	help
+	   ARM v2m MUSCA MCU Series
+
+config SOC_V2M_MUSCA_B1
+	bool
+	select SOC_SERIES_MUSCA
+	help
+	  ARM Cortex-M33 SMM-SSE-200 on V2M-MUSCA-B1
+
+config SOC_V2M_MUSCA_S1
+	bool
+	select SOC_SERIES_MUSCA
+	help
+	  ARM Cortex-M33 SMM-SSE-200 on V2M-MUSCA-S1
+
+config SOC_SERIES
+	default "musca" if SOC_SERIES_MUSCA
+
+config SOC
+	default "musca_b1" if SOC_V2M_MUSCA_B1
+	default "musca_s1" if SOC_V2M_MUSCA_S1

soc/arm/soc.yml

@@ -11,6 +11,10 @@ family:
   - name: mps3
     socs:
     - name: an547
+  - name: musca
+    socs:
+    - name: musca_b1
+    - name: musca_s1
 - name: arm64
   series:
   - name: fvp_aemv8a

soc/soc_legacy/arm/arm/musca_b1/Kconfig.defconfig.musca_b1

@@ -1,12 +0,0 @@
-# Copyright (c) 2019 Linaro Limited
-# SPDX-License-Identifier: Apache-2.0
-
-if SOC_V2M_MUSCA_B1
-
-config SOC
-	default "musca_b1"
-
-config NUM_IRQS
-	default 96
-
-endif

soc/soc_legacy/arm/arm/musca_b1/Kconfig.defconfig.series

@@ -1,14 +0,0 @@
-# Copyright (c) 2019 Linaro Limited
-# SPDX-License-Identifier: Apache-2.0
-
-if SOC_SERIES_MUSCA_B1
-
-config SOC_SERIES
-	default "musca_b1"
-
-config SYS_CLOCK_HW_CYCLES_PER_SEC
-	default 40000000
-
-source "soc/soc_legacy/arm/arm/musca_b1/Kconfig.defconfig.musca_b1"
-
-endif # SOC_SERIES_MUSCA_B1

soc/soc_legacy/arm/arm/musca_b1/Kconfig.series

@@ -1,10 +0,0 @@
-# Copyright (c) 2019 Linaro Limited
-# SPDX-License-Identifier: Apache-2.0
-
-config SOC_SERIES_MUSCA_B1
-	bool "Arm v2m MUSCA B1 MCU Series"
-	select ARM
-	select SOC_FAMILY_ARM
-	select BUILD_OUTPUT_HEX
-	help
-	  Enable support for arm V2M Musca B1 MCU Series

soc/soc_legacy/arm/arm/musca_b1/Kconfig.soc

@@ -1,15 +0,0 @@
-# Copyright (c) 2019 Linaro Limited
-# SPDX-License-Identifier: Apache-2.0
-
-choice
-	prompt "ARM Musca B1 SoCs"
-	depends on SOC_SERIES_MUSCA_B1
-
-config SOC_V2M_MUSCA_B1
-	bool "ARM Cortex-M33 SMM-SSE-200 on V2M-MUSCA-B1"
-	select CPU_CORTEX_M33
-	select CPU_HAS_ARM_SAU
-	select CPU_HAS_ARM_MPU
-	select CPU_CORTEX_M_HAS_DWT
-
-endchoice

soc/soc_legacy/arm/arm/musca_s1/CMakeLists.txt

@@ -1,7 +0,0 @@
-#
-# Copyright (c) 2018 Linaro Limited
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_m/scripts/linker.ld CACHE INTERNAL "")

soc/soc_legacy/arm/arm/musca_s1/Kconfig.defconfig.musca_s1

@@ -1,12 +0,0 @@
-# Copyright (c) 2019-2020 Linaro Limited
-# SPDX-License-Identifier: Apache-2.0
-
-if SOC_V2M_MUSCA_S1
-
-config SOC
-	default "musca_s1"
-
-config NUM_IRQS
-	default 96
-
-endif

soc/soc_legacy/arm/arm/musca_s1/Kconfig.defconfig.series

@@ -1,14 +0,0 @@
-# Copyright (c) 2019-2020 Linaro Limited
-# SPDX-License-Identifier: Apache-2.0
-
-if SOC_SERIES_MUSCA_S1
-
-config SOC_SERIES
-	default "musca_s1"
-
-config SYS_CLOCK_HW_CYCLES_PER_SEC
-	default 50000000
-
-source "soc/soc_legacy/arm/arm/musca_s1/Kconfig.defconfig.musca_s1"
-
-endif # SOC_SERIES_MUSCA_S1

soc/soc_legacy/arm/arm/musca_s1/Kconfig.series

@@ -1,10 +0,0 @@
-# Copyright (c) 2019-2020 Linaro Limited
-# SPDX-License-Identifier: Apache-2.0
-
-config SOC_SERIES_MUSCA_S1
-	bool "Arm v2m MUSCA-S1 MCU Series"
-	select ARM
-	select SOC_FAMILY_ARM
-	select BUILD_OUTPUT_HEX
-	help
-	  Enable support for Arm V2M Musca-S1 MCU Series

soc/soc_legacy/arm/arm/musca_s1/Kconfig.soc

@@ -1,17 +0,0 @@
-# Copyright (c) 2019-2020 Linaro Limited
-# SPDX-License-Identifier: Apache-2.0
-
-choice
-	prompt "ARM Musca-S1 SoCs"
-	depends on SOC_SERIES_MUSCA_S1
-
-config SOC_V2M_MUSCA_S1
-	bool "ARM Cortex-M33 SMM-SSE-200 on V2M-MUSCA-S1"
-	select CPU_CORTEX_M33
-	select CPU_HAS_ARM_SAU
-	select CPU_HAS_ARM_MPU
-	select CPU_CORTEX_M_HAS_DWT
-	select CPU_HAS_FPU
-	select ARMV8_M_DSP
-
-endchoice