soc: snps_emsk: Port to HWMv2

Ports the snps_emsk SoC configuration to hardware model version 2

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

soc/soc_legacy/arc/snps_emsk/Kconfig.defconfig

@@ -1,14 +0,0 @@
-# Copyright (c) 2014 Wind River Systems, Inc.
-# Copyright (c) 2018 Synopsys, Inc. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-if SOC_EMSK
-
-config SOC
-	default "snps_emsk"
-
-source "soc/soc_legacy/arc/snps_emsk/Kconfig.defconfig.em7d"
-source "soc/soc_legacy/arc/snps_emsk/Kconfig.defconfig.em11d"
-source "soc/soc_legacy/arc/snps_emsk/Kconfig.defconfig.em9d"
-
-endif # SOC_EMSK

soc/synopsys/emsk/CMakeLists.txt

@@ -2,9 +2,9 @@
 zephyr_compile_options(-mcpu=${GCC_M_CPU} -mno-sdata -mmpy-option=6)
 
 if(CONFIG_SOC_EMSK_EM9D)
-zephyr_compile_options_ifdef(CONFIG_FPU -mfpu=fpus_all)
+  zephyr_compile_options_ifdef(CONFIG_FPU -mfpu=fpus_all)
 elseif(CONFIG_SOC_EMSK_EM11D)
-zephyr_compile_options_ifdef(CONFIG_FPU -mfpu=fpuda_all)
+  zephyr_compile_options_ifdef(CONFIG_FPU -mfpu=fpuda_all)
 endif()
 
 zephyr_sources(soc_config.c)

soc/synopsys/emsk/Kconfig

@@ -2,21 +2,14 @@
 # Copyright (c) 2018 Synopsys, Inc. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-choice
+config SOC_EMSK
-	prompt "ARC EM Starter Kit Core Selection"
+	select ARC
-	default SOC_EMSK_EM7D
-	depends on SOC_EMSK
 
 config SOC_EMSK_EM7D
-	bool "Synopsys ARC EM7D of EMSK"
 	select CPU_HAS_MPU
 
-config SOC_EMSK_EM11D
-	bool "Synopsys ARC EM11D of EMSK"
-	select CPU_HAS_FPU
-
 config SOC_EMSK_EM9D
-	bool "Synopsys ARC EM9D of EMSK"
 	select CPU_HAS_FPU
 
-endchoice
+config SOC_EMSK_EM11D
+	select CPU_HAS_FPU

soc/synopsys/emsk/Kconfig.defconfig

@@ -2,6 +2,8 @@
 # Copyright (c) 2018 Synopsys, Inc. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-config SOC_EMSK
+if SOC_EMSK
-	bool "Synopsys ARC EM Starter Kit SoC"
+
-	select ARC
+rsource "Kconfig.defconfig.*"
+
+endif # SOC_EMSK

soc/synopsys/emsk/Kconfig.soc

@@ -0,0 +1,34 @@
+# Copyright (c) 2014 Wind River Systems, Inc.
+# Copyright (c) 2018 Synopsys, Inc. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_EMSK
+	bool
+	help
+	  Synopsys ARC EM Starter Kit SoC
+
+config SOC_EMSK_EM7D
+	bool
+	select SOC_EMSK
+	help
+	  Synopsys ARC EM7D of EMSK
+
+config SOC_EMSK_EM9D
+	bool
+	select SOC_EMSK
+	help
+	  Synopsys ARC EM9D of EMSK
+
+config SOC_EMSK_EM11D
+	bool
+	select SOC_EMSK
+	help
+	  Synopsys ARC EM11D of EMSK
+
+config SOC_SERIES
+	default "emsk" if SOC_EMSK
+
+config SOC
+	default "emsk_em7d" if SOC_EMSK_EM7D
+	default "emsk_em9d" if SOC_EMSK_EM9D
+	default "emsk_em11d" if SOC_EMSK_EM11D

soc/synopsys/emsk/soc.yml

@@ -0,0 +1,6 @@
+series:
+- name: emsk
+  socs:
+  - name: emsk_em7d
+  - name: emsk_em9d
+  - name: emsk_em11d