soc: snps_nsim: Port to HWMv2

Ports the snps_nsim SoC configuration to hardware model version 2

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

soc/soc_legacy/arc/snps_nsim/Kconfig

@@ -1,58 +0,0 @@
-# Copyright (c) 2018 Synopsys, Inc. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-choice
-	prompt "ARC nSIM SoC Selection"
-	default SOC_NSIM_EM
-	depends on SOC_NSIM
-
-config SOC_NSIM_EM
-	bool "Synopsys ARC EM in nSIM"
-	select CPU_HAS_MPU
-
-config SOC_NSIM_EM7D_V22
-	bool "Synopsys ARC EM7D_V22 in nSIM"
-	select CPU_HAS_MPU
-	select CPU_HAS_FPU
-
-config SOC_NSIM_EM11D
-	bool "Synopsys ARC EM11D in nSIM"
-	select CPU_HAS_MPU
-	select CPU_HAS_DSP
-
-config SOC_NSIM_SEM
-	bool "Synopsys ARC SEM in nSIM"
-	select CPU_HAS_MPU
-	select CPU_HAS_FPU
-	select ARC_HAS_SECURE
-
-config SOC_NSIM_HS
-	bool "Synopsys ARC HS in nSIM"
-	select CPU_HAS_FPU
-	select CPU_HAS_MPU
-
-config SOC_NSIM_HS_SMP
-	bool "Multi-core Synopsys ARC HS in nSIM"
-	select CPU_HAS_FPU
-
-config SOC_NSIM_HS_MPUV6
-	bool "Synopsys ARC HS with MPU v6 in nSIM"
-	select CPU_HAS_MPU
-	select CPU_HAS_FPU
-
-config SOC_NSIM_VPX5
-	bool "Synopsys ARC VPX5 in nSIM"
-
-config SOC_NSIM_HS6X
-	bool "Synopsys ARC HS6x in nSIM"
-
-config SOC_NSIM_HS6X_SMP
-	bool "Multi-core Synopsys ARC HS6x in nSIM"
-
-config SOC_NSIM_HS5X
-	bool "Synopsys ARC HS5x in nSIM"
-
-config SOC_NSIM_HS5X_SMP
-	bool "Multi-core Synopsys ARC HS5x in nSIM"
-
-endchoice

soc/soc_legacy/arc/snps_nsim/Kconfig.defconfig

@@ -1,25 +0,0 @@
-# Copyright (c) 2018 Synopsys, Inc. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-if SOC_NSIM
-
-config SOC
-	default "snps_nsim"
-
-config XIP
-	default n
-
-source "soc/soc_legacy/arc/snps_nsim/Kconfig.defconfig.em"
-source "soc/soc_legacy/arc/snps_nsim/Kconfig.defconfig.em11d"
-source "soc/soc_legacy/arc/snps_nsim/Kconfig.defconfig.em7d_v22"
-source "soc/soc_legacy/arc/snps_nsim/Kconfig.defconfig.sem"
-source "soc/soc_legacy/arc/snps_nsim/Kconfig.defconfig.hs"
-source "soc/soc_legacy/arc/snps_nsim/Kconfig.defconfig.hs_smp"
-source "soc/soc_legacy/arc/snps_nsim/Kconfig.defconfig.vpx5"
-source "soc/soc_legacy/arc/snps_nsim/Kconfig.defconfig.hs6x"
-source "soc/soc_legacy/arc/snps_nsim/Kconfig.defconfig.hs6x_smp"
-source "soc/soc_legacy/arc/snps_nsim/Kconfig.defconfig.hs_mpuv6"
-source "soc/soc_legacy/arc/snps_nsim/Kconfig.defconfig.hs5x"
-source "soc/soc_legacy/arc/snps_nsim/Kconfig.defconfig.hs5x_smp"
-
-endif # SOC_NSIM

soc/synopsys/nsim/Kconfig

@@ -0,0 +1,32 @@
+# Copyright (c) 2018 Synopsys, Inc. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_NSIM
+	select ARC
+
+config SOC_NSIM_EM
+	select CPU_HAS_MPU
+
+config SOC_NSIM_EM7D_V22
+	select CPU_HAS_MPU
+	select CPU_HAS_FPU
+
+config SOC_NSIM_EM11D
+	select CPU_HAS_MPU
+	select CPU_HAS_DSP
+
+config SOC_NSIM_SEM
+	select CPU_HAS_MPU
+	select CPU_HAS_FPU
+	select ARC_HAS_SECURE
+
+config SOC_NSIM_HS
+	select CPU_HAS_FPU
+	select CPU_HAS_MPU
+
+config SOC_NSIM_HS_SMP
+	select CPU_HAS_FPU
+
+config SOC_NSIM_HS_MPUV6
+	select CPU_HAS_MPU
+	select CPU_HAS_FPU

soc/synopsys/nsim/Kconfig.defconfig

@@ -1,6 +1,11 @@
 # Copyright (c) 2018 Synopsys, Inc. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-config SOC_NSIM
+if SOC_NSIM
-	bool "Synopsys nSIM simulator for ARC cores"
+
-	select ARC
+config XIP
+	default n
+
+rsource "Kconfig.defconfig.*"
+
+endif # SOC_NSIM

soc/synopsys/nsim/Kconfig.soc

@@ -0,0 +1,94 @@
+# Copyright (c) 2018 Synopsys, Inc. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_NSIM
+	bool
+
+config SOC_NSIM_EM
+	bool
+	select SOC_NSIM
+	help
+	  Synopsys ARC EM4 in nSIM
+
+config SOC_NSIM_EM7D_V22
+	bool
+	select SOC_NSIM
+	help
+	  Synopsys ARC EM7D_V22 in nSIM
+
+config SOC_NSIM_EM11D
+	bool
+	select SOC_NSIM
+	help
+	  Synopsys ARC EM11D in nSIM
+
+config SOC_NSIM_SEM
+	bool
+	select SOC_NSIM
+	help
+	  Synopsys ARC SEM in nSIM
+
+config SOC_NSIM_HS
+	bool
+	select SOC_NSIM
+	help
+	  Synopsys ARC HS3X in nSIM
+
+config SOC_NSIM_HS_SMP
+	bool
+	select SOC_NSIM
+	help
+	  Multi-core Synopsys ARC HS3X in nSIM
+
+config SOC_NSIM_HS_MPUV6
+	bool
+	select SOC_NSIM
+	help
+	  Synopsys ARC HS3X with MPU v6 in nSIM
+
+config SOC_NSIM_VPX5
+	bool
+	select SOC_NSIM
+	help
+	  Synopsys ARC VPX5 in nSIM
+
+config SOC_NSIM_HS5X
+	bool
+	select SOC_NSIM
+	help
+	  Synopsys ARC HS5x in nSIM
+
+config SOC_NSIM_HS5X_SMP
+	bool
+	select SOC_NSIM
+	help
+	  Multi-core Synopsys ARC HS5x in nSIM
+
+config SOC_NSIM_HS6X
+	bool
+	select SOC_NSIM
+	help
+	  Synopsys ARC HS6x in nSIM
+
+config SOC_NSIM_HS6X_SMP
+	bool
+	select SOC_NSIM
+	help
+	  Multi-core Synopsys ARC HS6x in nSIM
+
+config SOC
+	default "nsim_em" if SOC_NSIM_EM
+	default "nsim_em7d_v22" if SOC_NSIM_EM7D_V22
+	default "nsim_em11d" if SOC_NSIM_EM11D
+	default "nsim_sem" if SOC_NSIM_SEM
+	default "nsim_hs" if SOC_NSIM_HS
+	default "nsim_hs_smp" if SOC_NSIM_HS_SMP
+	default "nsim_hs_mpuv6" if SOC_NSIM_HS_MPUV6
+	default "nsim_vpx5" if SOC_NSIM_VPX5
+	default "nsim_hs5x" if SOC_NSIM_HS5X
+	default "nsim_hs5x_smp" if SOC_NSIM_HS5X_SMP
+	default "nsim_hs6x" if SOC_NSIM_HS6X
+	default "nsim_hs6x_smp" if SOC_NSIM_HS6X_SMP
+
+config SOC_SERIES
+	default "nsim" if SOC_NSIM

soc/synopsys/nsim/soc.yml

@@ -0,0 +1,15 @@
+series:
+- name: nsim
+  socs:
+  - name: nsim_em
+  - name: nsim_em7d_v22
+  - name: nsim_em11d
+  - name: nsim_hs
+  - name: nsim_hs_smp
+  - name: nsim_hs_mpuv6
+  - name: nsim_hs5x
+  - name: nsim_hs5x_smp
+  - name: nsim_hs6x
+  - name: nsim_hs6x_smp
+  - name: nsim_vpx5
+  - name: nsim_sem