boards: arc: qemu_arc: Convert to v2

Converts the board to hwmv2

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

boards/qemu/arc/Kconfig

@@ -3,7 +3,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_QEMU_ARC
-	bool "ARC QEMU for EM & HS cores"
-	depends on SOC_QEMU_ARC
 	select QEMU_TARGET
 	select HAS_COVERAGE_SUPPORT

boards/qemu/arc/Kconfig.defconfig

@@ -3,16 +3,13 @@
 
 if BOARD_QEMU_ARC
 
-config BOARD
-	default "qemu_arc"
-
 if NETWORKING
 
-	config NET_L2_ETHERNET
+config NET_L2_ETHERNET
 	default y
 
-	# Required to satisfy dependency of networking stack on RNG
-	config TEST_RANDOM_GENERATOR
+# Required to satisfy dependency of networking stack on RNG
+config TEST_RANDOM_GENERATOR
 	default y
 
 endif # NETWORKING

boards/qemu/arc/Kconfig.qemu_arc

@@ -0,0 +1,9 @@
+# Copyright (c) 2020 Synopsys, Inc. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_QEMU_ARC
+	select SOC_QEMU_ARC_EM if BOARD_QEMU_ARC_QEMU_ARC_EM
+	select SOC_QEMU_ARC_HS if BOARD_QEMU_ARC_QEMU_ARC_HS || BOARD_QEMU_ARC_QEMU_ARC_HS_XIP
+	select SOC_QEMU_ARC_HS5X if BOARD_QEMU_ARC_QEMU_ARC_HS5X
+	select SOC_QEMU_ARC_HS6X if BOARD_QEMU_ARC_QEMU_ARC_HS6X

boards/qemu/arc/board.cmake

@@ -3,19 +3,19 @@ set(SUPPORTED_EMU_PLATFORMS qemu)
 set(QEMU_CPU_TYPE_${ARCH} arc)
 
 if(${CONFIG_SOC_QEMU_ARC_EM})
-set(QEMU_CPU_TYPE_${ARCH} arcem)
-set(QEMU_FLAGS_${ARCH} -cpu arcem)
+  set(QEMU_CPU_TYPE_${ARCH} arcem)
+  set(QEMU_FLAGS_${ARCH} -cpu arcem)
 elseif(${CONFIG_SOC_QEMU_ARC_HS})
-set(QEMU_CPU_TYPE_${ARCH} archs)
-set(QEMU_FLAGS_${ARCH} -cpu archs)
+  set(QEMU_CPU_TYPE_${ARCH} archs)
+  set(QEMU_FLAGS_${ARCH} -cpu archs)
 elseif(${CONFIG_SOC_QEMU_ARC_HS5X})
-set(QEMU_ARCH arc)
-set(QEMU_CPU_TYPE_${ARCH} hs5x)
-set(QEMU_FLAGS_${ARCH} -cpu hs5x)
+  set(QEMU_ARCH arc)
+  set(QEMU_CPU_TYPE_${ARCH} hs5x)
+  set(QEMU_FLAGS_${ARCH} -cpu hs5x)
 elseif(${CONFIG_SOC_QEMU_ARC_HS6X})
-set(QEMU_ARCH arc64)
-set(QEMU_CPU_TYPE_${ARCH} hs6x)
-set(QEMU_FLAGS_${ARCH} -cpu hs6x)
+  set(QEMU_ARCH arc64)
+  set(QEMU_CPU_TYPE_${ARCH} hs6x)
+  set(QEMU_FLAGS_${ARCH} -cpu hs6x)
 endif()
 
 # For old QEMU we had 'simhs' qemu board, however we are going to rename it

boards/qemu/arc/board.yml

@@ -0,0 +1,10 @@
+board:
+  name: qemu_arc
+  vendor: QEMU
+  socs:
+  - name: qemu_arc_em
+  - name: qemu_arc_hs
+    variants:
+    - name: xip
+  - name: qemu_arc_hs5x
+  - name: qemu_arc_hs6x

boards/qemu/arc/doc/index.rst

@@ -68,13 +68,13 @@ Programming and Debugging
 
 Use this configuration to run basic Zephyr applications and kernel tests in the QEMU
 emulated environment, for example, with the :zephyr:code-sample:`synchronization` sample
-(note you may use ``qemu_arc_em``, ``qemu_arc_hs``,  ``qemu_arc_hs5x`` or
-``qemu_arc_hs6x`` depending on target CPU):
+(note you may use ``qemu_arc/qemu_em``, ``qemu_arc/qemu_hs``,  ``qemu_arc/qemu_hs5x`` or
+``qemu_arc/qemu_hs6x`` depending on target CPU):
 
 .. zephyr-app-commands::
    :zephyr-app: samples/synchronization
    :host-os: unix
-   :board: qemu_arc_em
+   :board: qemu_arc/qemu_em
    :goals: run
 
 This will build an image with the synchronization sample app, boot it using

boards/qemu/arc/qemu_arc_qemu_arc_em.yaml

@@ -1,4 +1,4 @@
-identifier: qemu_arc_em
+identifier: qemu_arc/qemu_arc_em
 name: QEMU Emulation for ARC EM
 type: qemu
 simulation: qemu

boards/qemu/arc/qemu_arc_qemu_arc_em_defconfig

@@ -1,5 +1,3 @@
-CONFIG_SOC_QEMU_ARC=y
-CONFIG_SOC_QEMU_ARC_EM=y
 CONFIG_XIP=y
 CONFIG_BUILD_OUTPUT_BIN=n
 CONFIG_ARCV2_INTERRUPT_UNIT=y

boards/qemu/arc/qemu_arc_qemu_arc_hs.yaml

@@ -1,4 +1,4 @@
-identifier: qemu_arc_hs
+identifier: qemu_arc/qemu_arc_hs
 name: QEMU Emulation for ARC HS
 type: qemu
 simulation: qemu

boards/qemu/arc/qemu_arc_qemu_arc_hs5x.yaml

@@ -1,4 +1,4 @@
-identifier: qemu_arc_hs5x
+identifier: qemu_arc/qemu_arc_hs5x
 name: QEMU Emulation for ARC HS5x
 type: qemu
 simulation: qemu

boards/qemu/arc/qemu_arc_qemu_arc_hs5x_defconfig

@@ -1,6 +1,4 @@
 CONFIG_ISA_ARCV3=y
-CONFIG_SOC_QEMU_ARC=y
-CONFIG_SOC_QEMU_ARC_HS5X=y
 CONFIG_XIP=n
 CONFIG_BUILD_OUTPUT_BIN=n
 CONFIG_ARCV2_INTERRUPT_UNIT=y

boards/qemu/arc/qemu_arc_qemu_arc_hs6x.yaml

@@ -1,4 +1,4 @@
-identifier: qemu_arc_hs6x
+identifier: qemu_arc/qemu_arc_hs6x
 name: QEMU Emulation for ARC HS6x
 type: qemu
 simulation: qemu

boards/qemu/arc/qemu_arc_qemu_arc_hs6x_defconfig

@@ -1,6 +1,4 @@
 CONFIG_ISA_ARCV3=y
-CONFIG_SOC_QEMU_ARC=y
-CONFIG_SOC_QEMU_ARC_HS6X=y
 CONFIG_XIP=n
 CONFIG_BUILD_OUTPUT_BIN=n
 CONFIG_ARCV2_INTERRUPT_UNIT=y

boards/qemu/arc/qemu_arc_qemu_arc_hs_defconfig

@@ -1,5 +1,3 @@
-CONFIG_SOC_QEMU_ARC=y
-CONFIG_SOC_QEMU_ARC_HS=y
 CONFIG_XIP=n
 CONFIG_BUILD_OUTPUT_BIN=n
 CONFIG_ARCV2_INTERRUPT_UNIT=y

boards/qemu/arc/qemu_arc_qemu_arc_hs_xip.yaml

@@ -1,4 +1,4 @@
-identifier: qemu_arc_hs_xip
+identifier: qemu_arc/qemu_arc_hs/xip
 name: QEMU Emulation for ARC HS (XIP)
 type: qemu
 simulation: qemu

boards/qemu/arc/qemu_arc_qemu_arc_hs_xip_defconfig

@@ -1,5 +1,3 @@
-CONFIG_SOC_QEMU_ARC=y
-CONFIG_SOC_QEMU_ARC_HS=y
 CONFIG_XIP=y
 CONFIG_BUILD_OUTPUT_BIN=n
 CONFIG_ARCV2_INTERRUPT_UNIT=y