board/nsim: Make it CPU-family independent

ARC nSIM simulates all flavors or ARC cores so there's no point in limiting its usage to ARC EM family only. Moreover with upcoming addition of ARC HS family support in Zephyr we'll be re-using nSIM "board" for them as well. Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
zephyrproject-rtos · Jun 6, 2019 · b1dcf05 · b1dcf05
1 parent bceaed6
commit b1dcf05
Show file tree

Hide file tree

Showing 21 changed files with 20 additions and 20 deletions.
diff --git a/boards/arc/nsim_em/CMakeLists.txt → boards/arc/nsim/CMakeLists.txt b/boards/arc/nsim_em/CMakeLists.txt → boards/arc/nsim/CMakeLists.txt
diff --git a/boards/arc/nsim/Kconfig.board b/boards/arc/nsim/Kconfig.board
@@ -0,0 +1,13 @@
+# Kconfig - DesignWare ARC nSIM simulated platform configuration
+#
+# Copyright (c) 2016, 2019 Synopsys, Inc. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+config BOARD_NSIM
+	bool "ARC nSIM simulator"
+	depends on SOC_NSIM
+	help
+	  The DesignWare ARC nSIM board is a virtual board based on
+	  the ARC nSIM simulator. It demonstrates the ARC core features
+	  and a console based on the legacy ARC UART model.
diff --git a/boards/arc/nsim_em/Kconfig.defconfig → boards/arc/nsim/Kconfig.defconfig b/boards/arc/nsim_em/Kconfig.defconfig → boards/arc/nsim/Kconfig.defconfig
@@ -1,9 +1,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
-if BOARD_NSIM_EM
+if BOARD_NSIM
 
 config BOARD
-	default "nsim_em"
+	default "nsim"
 
 config CPU_ARCEM4
 	default y
@@ -16,4 +16,4 @@ config UART_NSIM
 endif # SERIAL
 
 
-endif # BOARD_NSIM_EM
+endif # BOARD_NSIM
diff --git a/boards/arc/nsim_em/arc_mpu_regions.c → boards/arc/nsim/arc_mpu_regions.c b/boards/arc/nsim_em/arc_mpu_regions.c → boards/arc/nsim/arc_mpu_regions.c
diff --git a/boards/arc/nsim_em/board.cmake → boards/arc/nsim/board.cmake b/boards/arc/nsim_em/board.cmake → boards/arc/nsim/board.cmake
diff --git a/boards/arc/nsim_em/doc/index.rst → boards/arc/nsim/doc/index.rst b/boards/arc/nsim_em/doc/index.rst → boards/arc/nsim/doc/index.rst
diff --git a/boards/arc/nsim_em/nsim_em.dts → boards/arc/nsim/nsim_em.dts b/boards/arc/nsim_em/nsim_em.dts → boards/arc/nsim/nsim_em.dts
diff --git a/boards/arc/nsim_em/nsim_em.yaml → boards/arc/nsim/nsim_em.yaml b/boards/arc/nsim_em/nsim_em.yaml → boards/arc/nsim/nsim_em.yaml
diff --git a/boards/arc/nsim_em/nsim_em_defconfig → boards/arc/nsim/nsim_em_defconfig b/boards/arc/nsim_em/nsim_em_defconfig → boards/arc/nsim/nsim_em_defconfig
@@ -3,7 +3,7 @@
 CONFIG_ARC=y
 CONFIG_SOC_NSIM=y
 CONFIG_SOC_NSIM_EM=y
-CONFIG_BOARD_NSIM_EM=y
+CONFIG_BOARD_NSIM=y
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=100
 CONFIG_XIP=n
 CONFIG_BUILD_OUTPUT_BIN=n

diff --git a/...s/arc/nsim_em/nsim_em_mpu_stack_guard.dts → boards/arc/nsim/nsim_em_mpu_stack_guard.dts b/...s/arc/nsim_em/nsim_em_mpu_stack_guard.dts → boards/arc/nsim/nsim_em_mpu_stack_guard.dts
diff --git a/.../arc/nsim_em/nsim_em_mpu_stack_guard.yaml → boards/arc/nsim/nsim_em_mpu_stack_guard.yaml b/.../arc/nsim_em/nsim_em_mpu_stack_guard.yaml → boards/arc/nsim/nsim_em_mpu_stack_guard.yaml
diff --git a/...nsim_em/nsim_em_mpu_stack_guard_defconfig → ...rc/nsim/nsim_em_mpu_stack_guard_defconfig b/...nsim_em/nsim_em_mpu_stack_guard_defconfig → ...rc/nsim/nsim_em_mpu_stack_guard_defconfig
@@ -3,7 +3,7 @@
 CONFIG_ARC=y
 CONFIG_SOC_NSIM=y
 CONFIG_SOC_NSIM_EM=y
-CONFIG_BOARD_NSIM_EM=y
+CONFIG_BOARD_NSIM=y
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=100
 CONFIG_XIP=n
 CONFIG_BUILD_OUTPUT_BIN=n

diff --git a/boards/arc/nsim_em/nsim_sem.dts → boards/arc/nsim/nsim_sem.dts b/boards/arc/nsim_em/nsim_sem.dts → boards/arc/nsim/nsim_sem.dts
diff --git a/boards/arc/nsim_em/nsim_sem.yaml → boards/arc/nsim/nsim_sem.yaml b/boards/arc/nsim_em/nsim_sem.yaml → boards/arc/nsim/nsim_sem.yaml
diff --git a/boards/arc/nsim_em/nsim_sem_defconfig → boards/arc/nsim/nsim_sem_defconfig b/boards/arc/nsim_em/nsim_sem_defconfig → boards/arc/nsim/nsim_sem_defconfig
@@ -3,7 +3,7 @@
 CONFIG_ARC=y
 CONFIG_SOC_NSIM=y
 CONFIG_SOC_NSIM_SEM=y
-CONFIG_BOARD_NSIM_EM=y
+CONFIG_BOARD_NSIM=y
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=100
 CONFIG_XIP=n
 CONFIG_BUILD_OUTPUT_BIN=n

diff --git a/.../arc/nsim_em/nsim_sem_mpu_stack_guard.dts → boards/arc/nsim/nsim_sem_mpu_stack_guard.dts b/.../arc/nsim_em/nsim_sem_mpu_stack_guard.dts → boards/arc/nsim/nsim_sem_mpu_stack_guard.dts
diff --git a/...arc/nsim_em/nsim_sem_mpu_stack_guard.yaml → ...ds/arc/nsim/nsim_sem_mpu_stack_guard.yaml b/...arc/nsim_em/nsim_sem_mpu_stack_guard.yaml → ...ds/arc/nsim/nsim_sem_mpu_stack_guard.yaml
diff --git a/...sim_em/nsim_sem_mpu_stack_guard_defconfig → ...c/nsim/nsim_sem_mpu_stack_guard_defconfig b/...sim_em/nsim_sem_mpu_stack_guard_defconfig → ...c/nsim/nsim_sem_mpu_stack_guard_defconfig
@@ -3,7 +3,7 @@
 CONFIG_ARC=y
 CONFIG_SOC_NSIM=y
 CONFIG_SOC_NSIM_SEM=y
-CONFIG_BOARD_NSIM_EM=y
+CONFIG_BOARD_NSIM=y
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=100
 CONFIG_XIP=n
 CONFIG_BUILD_OUTPUT_BIN=n

diff --git a/boards/arc/nsim_em/support/nsim_em.props → boards/arc/nsim/support/nsim_em.props b/boards/arc/nsim_em/support/nsim_em.props → boards/arc/nsim/support/nsim_em.props
diff --git a/boards/arc/nsim_em/support/nsim_sem.props → boards/arc/nsim/support/nsim_sem.props b/boards/arc/nsim_em/support/nsim_sem.props → boards/arc/nsim/support/nsim_sem.props
diff --git a/boards/arc/nsim_em/Kconfig.board b/boards/arc/nsim_em/Kconfig.board