boards: arc: emsdp: Convert to v2

Converts the board to hwmv2

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

boards/boards_legacy/arc/emsdp/emsdp_em4_defconfig

@@ -1,17 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_SOC_ARC_EMSDP=y
-CONFIG_SOC_EMSDP_EM4=y
-CONFIG_BOARD_EMSDP=y
-CONFIG_SYS_CLOCK_TICKS_PER_SEC=100
-CONFIG_XIP=n
-CONFIG_BUILD_NO_GAP_FILL=y
-CONFIG_BUILD_OUTPUT_BIN=n
-CONFIG_ARCV2_INTERRUPT_UNIT=y
-CONFIG_ARCV2_TIMER=y
-CONFIG_CONSOLE=y
-CONFIG_UART_CONSOLE=y
-CONFIG_SERIAL=y
-CONFIG_UART_INTERRUPT_DRIVEN=y
-CONFIG_ARC_MPU_ENABLE=y
-CONFIG_GPIO=y

boards/boards_legacy/arc/emsdp/emsdp_em5d_defconfig

@@ -1,18 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_SOC_ARC_EMSDP=y
-CONFIG_SOC_EMSDP_EM5D=y
-CONFIG_BOARD_EMSDP=y
-CONFIG_SYS_CLOCK_TICKS_PER_SEC=100
-CONFIG_XIP=n
-CONFIG_BUILD_NO_GAP_FILL=y
-CONFIG_BUILD_OUTPUT_BIN=n
-CONFIG_ARCV2_INTERRUPT_UNIT=y
-CONFIG_ARCV2_TIMER=y
-CONFIG_CONSOLE=y
-CONFIG_UART_CONSOLE=y
-CONFIG_SERIAL=y
-CONFIG_UART_INTERRUPT_DRIVEN=y
-CONFIG_ARC_MPU_ENABLE=y
-CONFIG_GPIO=y
-CONFIG_SPI=y

boards/boards_legacy/arc/emsdp/emsdp_em6_defconfig

@@ -1,18 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_SOC_ARC_EMSDP=y
-CONFIG_SOC_EMSDP_EM6=y
-CONFIG_BOARD_EMSDP=y
-CONFIG_SYS_CLOCK_TICKS_PER_SEC=100
-CONFIG_XIP=n
-CONFIG_BUILD_NO_GAP_FILL=y
-CONFIG_BUILD_OUTPUT_BIN=n
-CONFIG_ARCV2_INTERRUPT_UNIT=y
-CONFIG_ARCV2_TIMER=y
-CONFIG_CONSOLE=y
-CONFIG_UART_CONSOLE=y
-CONFIG_SERIAL=y
-CONFIG_UART_INTERRUPT_DRIVEN=y
-CONFIG_ARC_MPU_ENABLE=y
-CONFIG_GPIO=y
-CONFIG_SPI=y

boards/boards_legacy/arc/emsdp/emsdp_em7d_defconfig

@@ -1,17 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_SOC_ARC_EMSDP=y
-CONFIG_SOC_EMSDP_EM7D=y
-CONFIG_BOARD_EMSDP=y
-CONFIG_SYS_CLOCK_TICKS_PER_SEC=100
-CONFIG_XIP=n
-CONFIG_BUILD_NO_GAP_FILL=y
-CONFIG_BUILD_OUTPUT_BIN=n
-CONFIG_ARCV2_INTERRUPT_UNIT=y
-CONFIG_ARCV2_TIMER=y
-CONFIG_CONSOLE=y
-CONFIG_UART_CONSOLE=y
-CONFIG_SERIAL=y
-CONFIG_UART_INTERRUPT_DRIVEN=y
-CONFIG_ARC_MPU_ENABLE=y
-CONFIG_GPIO=y

boards/boards_legacy/arc/emsdp/emsdp_em7d_esp_defconfig

@@ -1,20 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_SOC_ARC_EMSDP=y
-CONFIG_SOC_EMSDP_EM7D_ESP=y
-CONFIG_BOARD_EMSDP=y
-CONFIG_SYS_CLOCK_TICKS_PER_SEC=100
-CONFIG_XIP=n
-CONFIG_BUILD_NO_GAP_FILL=y
-CONFIG_BUILD_OUTPUT_BIN=n
-CONFIG_ARCV2_INTERRUPT_UNIT=y
-CONFIG_ARCV2_TIMER=y
-CONFIG_CONSOLE=y
-CONFIG_UART_CONSOLE=y
-CONFIG_SERIAL=y
-CONFIG_UART_INTERRUPT_DRIVEN=y
-CONFIG_ARC_MPU_ENABLE=y
-CONFIG_GPIO=y
-CONFIG_ARC_HAS_SECURE=y
-CONFIG_TRUSTED_EXECUTION_SECURE=y
-CONFIG_SPI=y

boards/boards_legacy/arc/emsdp/emsdp_em9d_defconfig

@@ -1,18 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_SOC_ARC_EMSDP=y
-CONFIG_SOC_EMSDP_EM9D=y
-CONFIG_BOARD_EMSDP=y
-CONFIG_SYS_CLOCK_TICKS_PER_SEC=100
-CONFIG_XIP=n
-CONFIG_BUILD_NO_GAP_FILL=y
-CONFIG_BUILD_OUTPUT_BIN=n
-CONFIG_ARCV2_INTERRUPT_UNIT=y
-CONFIG_ARCV2_TIMER=y
-CONFIG_CONSOLE=y
-CONFIG_UART_CONSOLE=y
-CONFIG_SERIAL=y
-CONFIG_UART_INTERRUPT_DRIVEN=y
-CONFIG_ARC_MPU_ENABLE=y
-CONFIG_GPIO=y
-CONFIG_SPI=y

boards/synopsys/emsdp/Kconfig.defconfig

@@ -5,9 +5,6 @@
 
 if BOARD_EMSDP
 
-config BOARD
-	default "emsdp"
-
 if SPI
 
 config SPI_DW

boards/synopsys/emsdp/Kconfig.emsdp

@@ -4,8 +4,14 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_EMSDP
-	bool "EM Software Development Platform"
-	depends on SOC_ARC_EMSDP
+	select SOC_ARC_EMSDP
+	select SOC_EMSDP_EM4 if BOARD_EMSDP_EMSDP_EM4
+	select SOC_EMSDP_EM5D if BOARD_EMSDP_EMSDP_EM5D
+	select SOC_EMSDP_EM6 if BOARD_EMSDP_EMSDP_EM6
+	select SOC_EMSDP_EM7D if BOARD_EMSDP_EMSDP_EM7D
+	select SOC_EMSDP_EM7D_ESP if BOARD_EMSDP_EMSDP_EM7D_ESP
+	select SOC_EMSDP_EM9D if BOARD_EMSDP_EMSDP_EM9D
+	select SOC_EMSDP_EM11D if BOARD_EMSDP_EMSDP_EM11D
 	help
 	  The ARC EM Software Development Platform (emsdp) is an FPGA based
 	  development platform intended to support ARC licenses in developing

boards/synopsys/emsdp/board.yml

@@ -0,0 +1,11 @@
+board:
+  name: emsdp
+  vendor: Synopsys
+  socs:
+  - name: emsdp_em4
+  - name: emsdp_em5d
+  - name: emsdp_em6
+  - name: emsdp_em7d
+  - name: emsdp_em7d_esp
+  - name: emsdp_em9d
+  - name: emsdp_em11d

boards/synopsys/emsdp/doc/index.rst

@@ -24,11 +24,10 @@ Hardware
 ********
 
 The EM Software Development Platform supports different core configurations, such as EM4,
-EM5D, EM6, EM7D, EM9D, EM9D+ESP, EM11D, the default core configuration is EM11D. Use
-:kconfig:option:`CONFIG_SOC_EMSDP_EM4`, :kconfig:option:`CONFIG_SOC_EMSDP_EM5D`,
-:kconfig:option:`CONFIG_SOC_EMSDP_EM6`, :kconfig:option:`CONFIG_SOC_EMSDP_EM7D`,
-:kconfig:option:`CONFIG_SOC_EMSDP_EM7D_ESP`, :kconfig:option:`CONFIG_SOC_EMSDP_EM9D` or
-:kconfig:option:`CONFIG_SOC_EMSDP_EM11D` to select different core configuration.
+EM5D, EM6, EM7D, EM7D+ESP, EM9D, EM11D. The core must be supplied as the variant of the base
+board which takes the form ``emsdp/<core>`` whereby core is ``emsdp_em4`` for EM4,
+``emsdp_em5D`` for EM5D, ``emsdp_em6`` for EM6, ``emsdp_em7d`` for EM7D, ``emsdp_em7d_esp``
+for EM7D+ESP, ``emsdp_em9d`` for EM9D and ``emsdp_em11d`` for EM11D.
 
 The following table shows the hardware features supported for different core configuration:
 
@@ -171,10 +170,11 @@ Configuring
 You may need to write a prj_arc.conf file if the sample doesn't have one.
 Next, you can use the menuconfig rule to configure the target. By specifying
 ``emsdp`` as the board configuration, you can select the ARC EM Software
-Development Platform board support for Zephyr.
+Development Platform board support for Zephyr, note that the core also need to
+be supplied, for example for the em7d:
 
 .. zephyr-app-commands::
-   :board: emsdp
+   :board: emsdp/emsdp_em7d
    :zephyr-app: samples/hello_world
    :goals: menuconfig
 
@@ -184,10 +184,10 @@ Building
 
 You can build an application in the usual way.  Refer to
 :ref:`build_an_application` for more details. Here is an example for
-:ref:`hello_world`.
+:ref:`hello_world` for the em4.
 
 .. zephyr-app-commands::
-   :board: emsdp
+   :board: emsdp/emsdp_em4
    :zephyr-app: samples/hello_world
    :maybe-skip-config:
    :goals: build
@@ -222,10 +222,10 @@ Using the latest version of Zephyr SDK(>=0.9), you can debug and flash IoT
 Development Kit directly.
 
 One option is to build and debug the application using the usual
-Zephyr build system commands.
+Zephyr build system commands, for example for the em6
 
 .. zephyr-app-commands::
-   :board: emsdp
+   :board: emsdp/emsdp_em6
    :app: <my app>
    :goals: debug
 
@@ -235,7 +235,7 @@ At this point you can do your normal debug session. Set breakpoints and then
 The other option is to launch a debug server, as follows.
 
 .. zephyr-app-commands::
-   :board: emsdp
+   :board: emsdp/emsdp_em6
    :app: <my app>
    :goals: debugserver
 
@@ -259,7 +259,7 @@ If you just want to download the application to the EM Software Development
 Platform's CCM and run, you can do so in the usual way.
 
 .. zephyr-app-commands::
-   :board: emsdp
+   :board: emsdp/emsdp_em6
    :app: <my app>
    :goals: flash
 

boards/synopsys/emsdp/emsdp_defconfig

@@ -1,8 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_ARC_EMSDP=y
-CONFIG_SOC_EMSDP_EM11D=y
-CONFIG_BOARD_EMSDP=y
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=100
 CONFIG_XIP=n
 CONFIG_BUILD_NO_GAP_FILL=y
@@ -15,5 +12,3 @@ CONFIG_SERIAL=y
 CONFIG_UART_INTERRUPT_DRIVEN=y
 CONFIG_ARC_MPU_ENABLE=y
 CONFIG_GPIO=y
-CONFIG_SPI=y
-CONFIG_PINCTRL=y

boards/synopsys/emsdp/emsdp_emsdp_em11d.yaml

@@ -1,4 +1,4 @@
-identifier: emsdp
+identifier: emsdp/emsdp_em11d
 name: EM Software Development Platform (EM11D)
 type: mcu
 arch: arc

boards/synopsys/emsdp/emsdp_emsdp_em11d_defconfig

@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_SPI=y
+CONFIG_PINCTRL=y

boards/synopsys/emsdp/emsdp_emsdp_em4.yaml

@@ -1,4 +1,4 @@
-identifier: emsdp_em4
+identifier: emsdp/emsdp_em4
 name: EM Software Development Platform (EM4)
 type: mcu
 arch: arc

boards/synopsys/emsdp/emsdp_emsdp_em5d.yaml

@@ -1,4 +1,4 @@
-identifier: emsdp_em5d
+identifier: emsdp/emsdp_em5d
 name: EM Software Development Platform (EM5D)
 type: mcu
 arch: arc

boards/synopsys/emsdp/emsdp_emsdp_em5d_defconfig

@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_SPI=y

boards/synopsys/emsdp/emsdp_emsdp_em6.yaml

@@ -1,4 +1,4 @@
-identifier: emsdp_em6
+identifier: emsdp/emsdp_em6
 name: EM Software Development Platform (EM6)
 type: mcu
 arch: arc

boards/synopsys/emsdp/emsdp_emsdp_em6_defconfig

@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_SPI=y

boards/synopsys/emsdp/emsdp_emsdp_em7d.yaml

@@ -1,4 +1,4 @@
-identifier: emsdp_em7d
+identifier: emsdp/emsdp_em7d
 name: EM Software Development Platform (EM7D)
 type: mcu
 arch: arc

boards/synopsys/emsdp/emsdp_emsdp_em7d_esp.yaml

@@ -1,4 +1,4 @@
-identifier: emsdp_em7d_esp
+identifier: emsdp/emsdp_em7d_esp
 name: EM Software Development Platform (EM7D_ESP)
 type: mcu
 arch: arc

boards/synopsys/emsdp/emsdp_emsdp_em7d_esp_defconfig

@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_ARC_HAS_SECURE=y
+CONFIG_TRUSTED_EXECUTION_SECURE=y
+CONFIG_SPI=y

boards/synopsys/emsdp/emsdp_emsdp_em9d.yaml

@@ -1,4 +1,4 @@
-identifier: emsdp_em9d
+identifier: emsdp/emsdp_em9d
 name: EM Software Development Platform (EM9D)
 type: mcu
 arch: arc

boards/synopsys/emsdp/emsdp_emsdp_em9d_defconfig

@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_SPI=y