board/nsim: Move CPU selection in defconfigs

This will allow us to easily specify other CPUs looking forward and not rely on any default value. Signed-off-by: Alexey Brodkin <[email protected]>
andrewboie · Jun 6, 2019 · 7971650 · 7971650
1 parent b1dcf05
commit 7971650
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 3 deletions.
diff --git a/boards/arc/nsim/Kconfig.defconfig b/boards/arc/nsim/Kconfig.defconfig
@@ -5,9 +5,6 @@ if BOARD_NSIM
 config BOARD
 	default "nsim"
 
-config CPU_ARCEM4
-	default y
-
 if SERIAL
 
 config UART_NSIM

diff --git a/boards/arc/nsim/nsim_em_defconfig b/boards/arc/nsim/nsim_em_defconfig
@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 CONFIG_ARC=y
+CONFIG_CPU_ARCEM4=y
 CONFIG_SOC_NSIM=y
 CONFIG_SOC_NSIM_EM=y
 CONFIG_BOARD_NSIM=y

diff --git a/boards/arc/nsim/nsim_em_mpu_stack_guard_defconfig b/boards/arc/nsim/nsim_em_mpu_stack_guard_defconfig
@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 CONFIG_ARC=y
+CONFIG_CPU_ARCEM4=y
 CONFIG_SOC_NSIM=y
 CONFIG_SOC_NSIM_EM=y
 CONFIG_BOARD_NSIM=y

diff --git a/boards/arc/nsim/nsim_sem_defconfig b/boards/arc/nsim/nsim_sem_defconfig
@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 CONFIG_ARC=y
+CONFIG_CPU_ARCEM4=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,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 CONFIG_ARC=y
+CONFIG_CPU_ARCEM4=y
 CONFIG_SOC_NSIM=y
 CONFIG_SOC_NSIM_SEM=y
 CONFIG_BOARD_NSIM=y