ARC: Kconfig: cleanup CPU_ARCEM / CPU_ARCHS options usage

Eugeniy Paltsev · nashif · commit 8311d27afcd8 · 2021-03-25T07:23:02.000-04:00
Don't allow user to choose CPU_ARCEM / CPU_ARCHS options
but select them when exact CPU type (i.e. EM4 / EM6 / HS3X/ etc)
is chosen.

Signed-off-by: Eugeniy Paltsev &lt;Eugeniy.Paltsev@synopsys.com&gt;
diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig
@@ -9,56 +9,61 @@ menu "ARC Options"
 config ARCH
 	default "arc"
 
-choice
-	prompt "ARC core family"
-	default CPU_ARCEM
 
 config CPU_ARCEM
-	bool "ARC EM cores"
-	select CPU_ARCV2
+	bool
 	select ATOMIC_OPERATIONS_C
 	help
 	  This option signifies the use of an ARC EM CPU
 
 config CPU_ARCHS
-	bool "ARC HS cores"
-	select CPU_ARCV2
+	bool
 	# FIXME: ATOMIC_OPERATIONS_BUILTIN still has some problem in arcmwdt
 	# toolchain, so choosing ATOMIC_OPERATIONS_C instead.
 	select ATOMIC_OPERATIONS_C if "$(ZEPHYR_TOOLCHAIN_VARIANT)" = "arcmwdt"
 	select ATOMIC_OPERATIONS_BUILTIN if "$(ZEPHYR_TOOLCHAIN_VARIANT)" != "arcmwdt"
 	help
 	  This option signifies the use of an ARC HS CPU
 
-endchoice
 
 config CPU_EM4
 	bool
+	select CPU_ARCEM
 	help
 	  If y, the SoC uses an ARC EM4 CPU
 
 config CPU_EM4_DMIPS
 	bool
+	select CPU_ARCEM
 	help
 	  If y, the SoC uses an ARC EM4 DMIPS CPU
 
 config CPU_EM4_FPUS
 	bool
+	select CPU_ARCEM
 	help
 	  If y, the SoC uses an ARC EM4 DMIPS CPU with the single-precision
 	  floating-point extension
 
 config CPU_EM4_FPUDA
 	bool
+	select CPU_ARCEM
 	help
 	  If y, the SoC uses an ARC EM4 DMIPS CPU with single-precision
 	  floating-point and double assist instructions
 
 config CPU_EM6
 	bool
+	select CPU_ARCEM
 	help
 	  If y, the SoC uses an ARC EM6 CPU
 
+config CPU_HS3X
+	bool
+	select CPU_ARCHS
+	help
+	  If y, the SoC uses an ARC HS3x or HS4x CPU
+
 config FP_FPU_DA
 	bool
 
diff --git a/boards/arc/em_starterkit/em_starterkit_defconfig b/boards/arc/em_starterkit/em_starterkit_defconfig
@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_CPU_ARCEM=y
 CONFIG_SOC_EMSK=y
 CONFIG_SOC_EMSK_EM9D=y
 CONFIG_BOARD_EM_STARTERKIT=y
diff --git a/boards/arc/em_starterkit/em_starterkit_em11d_defconfig b/boards/arc/em_starterkit/em_starterkit_em11d_defconfig
@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_CPU_ARCEM=y
 CONFIG_SOC_EMSK=y
 CONFIG_SOC_EMSK_EM11D=y
 CONFIG_BOARD_EM_STARTERKIT=y
diff --git a/boards/arc/em_starterkit/em_starterkit_em7d_defconfig b/boards/arc/em_starterkit/em_starterkit_em7d_defconfig
@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_CPU_ARCEM=y
 CONFIG_SOC_EMSK=y
 CONFIG_SOC_EMSK_EM7D=y
 CONFIG_BOARD_EM_STARTERKIT=y
diff --git a/boards/arc/em_starterkit/em_starterkit_em7d_v22_defconfig b/boards/arc/em_starterkit/em_starterkit_em7d_v22_defconfig
@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_CPU_ARCEM=y
 CONFIG_SOC_EMSK=y
 CONFIG_SOC_EMSK_EM7D=y
 CONFIG_BOARD_EM_STARTERKIT=y
diff --git a/boards/arc/emsdp/emsdp_defconfig b/boards/arc/emsdp/emsdp_defconfig
@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_CPU_ARCEM=y
 CONFIG_SOC_ARC_EMSDP=y
 CONFIG_SOC_EMSDP_EM11D=y
 CONFIG_BOARD_EMSDP=y
diff --git a/boards/arc/emsdp/emsdp_em4_defconfig b/boards/arc/emsdp/emsdp_em4_defconfig
@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_CPU_ARCEM=y
 CONFIG_SOC_ARC_EMSDP=y
 CONFIG_SOC_EMSDP_EM4=y
 CONFIG_BOARD_EMSDP=y
diff --git a/boards/arc/emsdp/emsdp_em5d_defconfig b/boards/arc/emsdp/emsdp_em5d_defconfig
@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_CPU_ARCEM=y
 CONFIG_SOC_ARC_EMSDP=y
 CONFIG_SOC_EMSDP_EM5D=y
 CONFIG_BOARD_EMSDP=y
diff --git a/boards/arc/emsdp/emsdp_em6_defconfig b/boards/arc/emsdp/emsdp_em6_defconfig
@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_CPU_ARCEM=y
 CONFIG_SOC_ARC_EMSDP=y
 CONFIG_SOC_EMSDP_EM6=y
 CONFIG_BOARD_EMSDP=y
diff --git a/boards/arc/emsdp/emsdp_em7d_defconfig b/boards/arc/emsdp/emsdp_em7d_defconfig
@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_CPU_ARCEM=y
 CONFIG_SOC_ARC_EMSDP=y
 CONFIG_SOC_EMSDP_EM7D=y
 CONFIG_BOARD_EMSDP=y
diff --git a/boards/arc/emsdp/emsdp_em7d_esp_defconfig b/boards/arc/emsdp/emsdp_em7d_esp_defconfig
@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_CPU_ARCEM=y
 CONFIG_SOC_ARC_EMSDP=y
 CONFIG_SOC_EMSDP_EM7D_ESP=y
 CONFIG_BOARD_EMSDP=y
diff --git a/boards/arc/emsdp/emsdp_em9d_defconfig b/boards/arc/emsdp/emsdp_em9d_defconfig
@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_CPU_ARCEM=y
 CONFIG_SOC_ARC_EMSDP=y
 CONFIG_SOC_EMSDP_EM9D=y
 CONFIG_BOARD_EMSDP=y
diff --git a/boards/arc/hsdk/hsdk_2cores_defconfig b/boards/arc/hsdk/hsdk_2cores_defconfig
@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_CPU_ARCHS=y
 CONFIG_SOC_ARC_HSDK=y
 CONFIG_BOARD_HSDK=y
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=100
diff --git a/boards/arc/hsdk/hsdk_defconfig b/boards/arc/hsdk/hsdk_defconfig
@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_CPU_ARCHS=y
 CONFIG_SOC_ARC_HSDK=y
 CONFIG_BOARD_HSDK=y
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=100
diff --git a/boards/arc/iotdk/iotdk_defconfig b/boards/arc/iotdk/iotdk_defconfig
@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_CPU_ARCEM=y
 CONFIG_SOC_ARC_IOT=y
 CONFIG_BOARD_IOTDK=y
 CONFIG_XIP=n
diff --git a/boards/arc/nsim/nsim_em7d_v22_defconfig b/boards/arc/nsim/nsim_em7d_v22_defconfig
@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_CPU_ARCEM=y
 CONFIG_SOC_NSIM=y
 CONFIG_SOC_NSIM_EM7D_V22=y
 CONFIG_BOARD_NSIM=y
diff --git a/boards/arc/nsim/nsim_em_defconfig b/boards/arc/nsim/nsim_em_defconfig
@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_CPU_ARCEM=y
 CONFIG_SOC_NSIM=y
 CONFIG_SOC_NSIM_EM=y
 CONFIG_BOARD_NSIM=y
diff --git a/boards/arc/nsim/nsim_hs_defconfig b/boards/arc/nsim/nsim_hs_defconfig
@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_CPU_ARCHS=y
 CONFIG_SOC_NSIM=y
 CONFIG_SOC_NSIM_HS=y
 CONFIG_BOARD_NSIM=y
diff --git a/boards/arc/nsim/nsim_hs_smp_defconfig b/boards/arc/nsim/nsim_hs_smp_defconfig
@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_CPU_ARCHS=y
 CONFIG_SOC_NSIM=y
 CONFIG_SOC_NSIM_HS_SMP=y
 CONFIG_BOARD_NSIM=y
diff --git a/boards/arc/nsim/nsim_sem_defconfig b/boards/arc/nsim/nsim_sem_defconfig
@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_CPU_ARCEM=y
 CONFIG_SOC_NSIM=y
 CONFIG_SOC_NSIM_SEM=y
 CONFIG_BOARD_NSIM=y
diff --git a/boards/arc/nsim/nsim_sem_mpu_stack_guard_defconfig b/boards/arc/nsim/nsim_sem_mpu_stack_guard_defconfig
@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_CPU_ARCEM=y
 CONFIG_SOC_NSIM=y
 CONFIG_SOC_NSIM_SEM=y
 CONFIG_BOARD_NSIM=y
diff --git a/boards/arc/qemu_arc/qemu_arc_em_defconfig b/boards/arc/qemu_arc/qemu_arc_em_defconfig
@@ -1,4 +1,3 @@
-CONFIG_CPU_ARCEM=y
 CONFIG_SOC_QEMU_ARC=y
 CONFIG_SOC_QEMU_ARC_EM=y
 CONFIG_XIP=y
diff --git a/boards/arc/qemu_arc/qemu_arc_hs_defconfig b/boards/arc/qemu_arc/qemu_arc_hs_defconfig
@@ -1,4 +1,3 @@
-CONFIG_CPU_ARCHS=y
 CONFIG_SOC_QEMU_ARC=y
 CONFIG_SOC_QEMU_ARC_HS=y
 CONFIG_XIP=y
diff --git a/samples/boards/arc_secure_services/nsim_sem_normal_defconfig b/samples/boards/arc_secure_services/nsim_sem_normal_defconfig
@@ -1,4 +1,3 @@
-CONFIG_CPU_ARCEM=y
 CONFIG_SOC_NSIM=y
 CONFIG_SOC_NSIM_SEM=y
 CONFIG_BOARD_NSIM=y
diff --git a/soc/arc/snps_arc_hsdk/Kconfig.defconfig b/soc/arc/snps_arc_hsdk/Kconfig.defconfig
@@ -6,6 +6,9 @@ if SOC_ARC_HSDK
 config SOC
 	default "snps_arc_hsdk"
 
+config CPU_HS3X
+	default y
+
 config NUM_IRQ_PRIO_LEVELS
 	# This processor supports 2 priority levels:
 	# 0 for Fast Interrupts (FIRQs) and 1 for Regular Interrupts (IRQs).
diff --git a/soc/arc/snps_nsim/Kconfig.defconfig.hs b/soc/arc/snps_nsim/Kconfig.defconfig.hs
@@ -3,6 +3,9 @@
 
 if SOC_NSIM_HS
 
+config CPU_HS3X
+	default y
+
 config NUM_IRQ_PRIO_LEVELS
 	# This processor supports 16 priority levels:
 	# 0 for Fast Interrupts (FIRQs) and 1-15 for Regular Interrupts (IRQs).
diff --git a/soc/arc/snps_nsim/Kconfig.defconfig.hs_smp b/soc/arc/snps_nsim/Kconfig.defconfig.hs_smp
@@ -3,6 +3,9 @@
 
 if SOC_NSIM_HS_SMP
 
+config CPU_HS3X
+	default y
+
 config NUM_IRQ_PRIO_LEVELS
 	# This processor supports 16 priority levels:
 	# 0 for Fast Interrupts (FIRQs) and 1-15 for Regular Interrupts (IRQs).
diff --git a/soc/arc/snps_qemu/Kconfig.defconfig b/soc/arc/snps_qemu/Kconfig.defconfig
@@ -28,5 +28,6 @@ config NUM_IRQS
 	default 25
 
 source "soc/arc/snps_qemu/Kconfig.defconfig.em"
+source "soc/arc/snps_qemu/Kconfig.defconfig.hs"
 
 endif
diff --git a/soc/arc/snps_qemu/Kconfig.defconfig.hs b/soc/arc/snps_qemu/Kconfig.defconfig.hs
@@ -0,0 +1,9 @@
+# Copyright (c) 2021 Synopsys, Inc. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+if SOC_QEMU_ARC_HS
+
+config CPU_HS3X
+	default y
+
+endif
