soc: snps_emsdp: Port to HWMv2

Ports the snps_emsdp SoC configuration to hardware model version 2

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

soc/soc_legacy/arc/snps_emsdp/Kconfig.defconfig

@@ -1,23 +0,0 @@
-# Copyright (c) 2019 Synopsys, Inc. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-if SOC_ARC_EMSDP
-
-config SOC
-	default "snps_emsdp"
-
-config NUM_IRQ_PRIO_LEVELS
-	# This processor supports 4 priority levels:
-	# 0 for Fast Interrupts (FIRQs) and 1-3 for Regular Interrupts (IRQs).
-	default 4
-
-source "soc/soc_legacy/arc/snps_emsdp/Kconfig.defconfig.em4"
-source "soc/soc_legacy/arc/snps_emsdp/Kconfig.defconfig.em5d"
-source "soc/soc_legacy/arc/snps_emsdp/Kconfig.defconfig.em6"
-source "soc/soc_legacy/arc/snps_emsdp/Kconfig.defconfig.em7d"
-source "soc/soc_legacy/arc/snps_emsdp/Kconfig.defconfig.em7d_esp"
-source "soc/soc_legacy/arc/snps_emsdp/Kconfig.defconfig.em9d"
-source "soc/soc_legacy/arc/snps_emsdp/Kconfig.defconfig.em11d"
-
-
-endif # SOC_ARC_EMSDP

soc/soc_legacy/arc/snps_emsdp/Kconfig.soc

@@ -1,6 +0,0 @@
-# Copyright (c) 2019 Synopsys, Inc. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-config SOC_ARC_EMSDP
-	bool "Synopsys ARC EM Software Development Platform"
-	select ARC

soc/synopsys/emsdp/CMakeLists.txt

@@ -19,4 +19,6 @@ elseif(CONFIG_SOC_EMSDP_EM11D)
   zephyr_compile_options_ifdef(CONFIG_FPU -mfpu=fpuda_all)
 endif()
 
+zephyr_include_directories(.)
+
 set(SOC_LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/linker.ld CACHE INTERNAL "")

soc/synopsys/emsdp/Kconfig

@@ -1,43 +1,32 @@
 # Copyright (c) 2019 Synopsys, Inc. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-choice
-	prompt "ARC EM Software Development Platform Core Selection"
-	default SOC_EMSDP_EM11D
-	depends on SOC_ARC_EMSDP
+config SOC_ARC_EMSDP
+	select ARC
 
 config SOC_EMSDP_EM4
-	bool "Synopsys ARC EM4 of EMSDP"
-	select CPU_HAS_MPU
-
-config SOC_EMSDP_EM6
-	bool "Synopsys ARC EM6 of EMSDP"
 	select CPU_HAS_MPU
 
 config SOC_EMSDP_EM5D
-	bool "Synopsys ARC EM5D of EMSDP"
 	select CPU_HAS_MPU
 	select CPU_HAS_FPU
 
+config SOC_EMSDP_EM6
+	select CPU_HAS_MPU
+
 config SOC_EMSDP_EM7D
-	bool "Synopsys ARC EM7D of EMSDP"
 	select CPU_HAS_MPU
 	select CPU_HAS_FPU
 
 config SOC_EMSDP_EM7D_ESP
-	bool "Synopsys ARC EM7D+ESP of EMSDP"
 	select CPU_HAS_MPU
 	select CPU_HAS_FPU
 	select ARC_HAS_SECURE
 
 config SOC_EMSDP_EM9D
-	bool "Synopsys ARC EM9D of EMSDP"
 	select CPU_HAS_MPU
 	select CPU_HAS_FPU
 
 config SOC_EMSDP_EM11D
-	bool "Synopsys ARC EM11D of EMSDP"
 	select CPU_HAS_MPU
 	select CPU_HAS_FPU
-
-endchoice

soc/synopsys/emsdp/Kconfig.defconfig

@@ -0,0 +1,13 @@
+# Copyright (c) 2019 Synopsys, Inc. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+if SOC_ARC_EMSDP
+
+config NUM_IRQ_PRIO_LEVELS
+	# This processor supports 4 priority levels:
+	# 0 for Fast Interrupts (FIRQs) and 1-3 for Regular Interrupts (IRQs).
+	default 4
+
+rsource "Kconfig.defconfig.*"
+
+endif # SOC_ARC_EMSDP

soc/synopsys/emsdp/Kconfig.soc

@@ -0,0 +1,59 @@
+# Copyright (c) 2019 Synopsys, Inc. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_ARC_EMSDP
+	bool
+
+config SOC_EMSDP_EM4
+	bool
+	select SOC_ARC_EMSDP
+	help
+	  Synopsys ARC EM4 of EMSDP
+
+config SOC_EMSDP_EM5D
+	bool
+	select SOC_ARC_EMSDP
+	help
+	  Synopsys ARC EM5D of EMSDP
+
+config SOC_EMSDP_EM6
+	bool
+	select SOC_ARC_EMSDP
+	help
+	  Synopsys ARC EM6 of EMSDP
+
+config SOC_EMSDP_EM7D
+	bool
+	select SOC_ARC_EMSDP
+	help
+	  Synopsys ARC EM7D of EMSDP
+
+config SOC_EMSDP_EM7D_ESP
+	bool
+	select SOC_ARC_EMSDP
+	help
+	  Synopsys ARC EM7D+ESP of EMSDP
+
+config SOC_EMSDP_EM9D
+	bool
+	select SOC_ARC_EMSDP
+	help
+	  Synopsys ARC EM9D of EMSDP
+
+config SOC_EMSDP_EM11D
+	bool
+	select SOC_ARC_EMSDP
+	help
+	  Synopsys ARC EM11D of EMSDP
+
+config SOC_SERIES
+	default "emsdp" if SOC_ARC_EMSDP
+
+config SOC
+	default "emsdp_em4d" if SOC_EMSDP_EM4
+	default "emsdp_em5d" if SOC_EMSDP_EM5D
+	default "emsdp_em6" if SOC_EMSDP_EM6
+	default "emsdp_em7d" if SOC_EMSDP_EM7D
+	default "emsdp_em7d_esp" if SOC_EMSDP_EM7D_ESP
+	default "emsdp_em9d" if SOC_EMSDP_EM9D
+	default "emsdp_em11d" if SOC_EMSDP_EM11D

soc/synopsys/emsdp/soc.yml

@@ -0,0 +1,10 @@
+series:
+- name: emsdp
+  socs:
+  - name: emsdp_em4
+  - name: emsdp_em5d
+  - name: emsdp_em6
+  - name: emsdp_em7d
+  - name: emsdp_em7d_esp
+  - name: emsdp_em9d
+  - name: emsdp_em11d