diff --git a/boards/boards_legacy/arc/nsim/Kconfig.board b/boards/boards_legacy/arc/nsim/Kconfig.board deleted file mode 100644 index 6bec8088323..00000000000 --- a/boards/boards_legacy/arc/nsim/Kconfig.board +++ /dev/null @@ -1,13 +0,0 @@ -# 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 - select HAS_COVERAGE_SUPPORT - 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 ns16550 UART model. diff --git a/boards/boards_legacy/arc/nsim/Kconfig.defconfig b/boards/boards_legacy/arc/nsim/Kconfig.defconfig deleted file mode 100644 index 1f1e19ee38a..00000000000 --- a/boards/boards_legacy/arc/nsim/Kconfig.defconfig +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_NSIM - -config BOARD - default "nsim" - -endif # BOARD_NSIM diff --git a/boards/boards_legacy/arc/nsim/nsim_hs5x_smp_12cores_defconfig b/boards/boards_legacy/arc/nsim/nsim_hs5x_smp_12cores_defconfig deleted file mode 100644 index c27e5d81ede..00000000000 --- a/boards/boards_legacy/arc/nsim/nsim_hs5x_smp_12cores_defconfig +++ /dev/null @@ -1,17 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -CONFIG_ISA_ARCV3=y -CONFIG_SOC_NSIM=y -CONFIG_SOC_NSIM_HS5X_SMP=y -CONFIG_BOARD_NSIM=y -CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 -CONFIG_XIP=n -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_SMP=y -CONFIG_MP_MAX_NUM_CPUS=12 -CONFIG_TICKET_SPINLOCKS=y diff --git a/boards/boards_legacy/arc/nsim/nsim_hs5x_smp_defconfig b/boards/boards_legacy/arc/nsim/nsim_hs5x_smp_defconfig deleted file mode 100644 index ac6baba1858..00000000000 --- a/boards/boards_legacy/arc/nsim/nsim_hs5x_smp_defconfig +++ /dev/null @@ -1,17 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -CONFIG_ISA_ARCV3=y -CONFIG_SOC_NSIM=y -CONFIG_SOC_NSIM_HS5X_SMP=y -CONFIG_BOARD_NSIM=y -CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 -CONFIG_XIP=n -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_SMP=y -CONFIG_MP_MAX_NUM_CPUS=2 -CONFIG_TICKET_SPINLOCKS=y diff --git a/boards/boards_legacy/arc/nsim/nsim_hs6x_smp_12cores_defconfig b/boards/boards_legacy/arc/nsim/nsim_hs6x_smp_12cores_defconfig deleted file mode 100644 index 2e14a87ed40..00000000000 --- a/boards/boards_legacy/arc/nsim/nsim_hs6x_smp_12cores_defconfig +++ /dev/null @@ -1,17 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -CONFIG_ISA_ARCV3=y -CONFIG_SOC_NSIM=y -CONFIG_SOC_NSIM_HS6X_SMP=y -CONFIG_BOARD_NSIM=y -CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 -CONFIG_XIP=n -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_SMP=y -CONFIG_MP_MAX_NUM_CPUS=12 -CONFIG_TICKET_SPINLOCKS=y diff --git a/boards/boards_legacy/arc/nsim/nsim_hs6x_smp_defconfig b/boards/boards_legacy/arc/nsim/nsim_hs6x_smp_defconfig deleted file mode 100644 index c34a380d1d0..00000000000 --- a/boards/boards_legacy/arc/nsim/nsim_hs6x_smp_defconfig +++ /dev/null @@ -1,17 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -CONFIG_ISA_ARCV3=y -CONFIG_SOC_NSIM=y -CONFIG_SOC_NSIM_HS6X_SMP=y -CONFIG_BOARD_NSIM=y -CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 -CONFIG_XIP=n -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_SMP=y -CONFIG_MP_MAX_NUM_CPUS=2 -CONFIG_TICKET_SPINLOCKS=y diff --git a/boards/boards_legacy/arc/nsim/nsim_hs_defconfig b/boards/boards_legacy/arc/nsim/nsim_hs_defconfig deleted file mode 100644 index eddd5076c65..00000000000 --- a/boards/boards_legacy/arc/nsim/nsim_hs_defconfig +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -CONFIG_SOC_NSIM=y -CONFIG_SOC_NSIM_HS=y -CONFIG_BOARD_NSIM=y -CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 -CONFIG_XIP=n -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_ARC_MPU_ENABLE=y diff --git a/boards/boards_legacy/arc/nsim/nsim_hs_flash_xip_defconfig b/boards/boards_legacy/arc/nsim/nsim_hs_flash_xip_defconfig deleted file mode 100644 index e4124a3ed69..00000000000 --- a/boards/boards_legacy/arc/nsim/nsim_hs_flash_xip_defconfig +++ /dev/null @@ -1,15 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -CONFIG_SOC_NSIM=y -CONFIG_SOC_NSIM_HS=y -CONFIG_BOARD_NSIM=y -CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 -CONFIG_XIP=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_HARVARD=n -CONFIG_ARC_MPU_ENABLE=y diff --git a/boards/boards_legacy/arc/nsim/nsim_hs_mpuv6_defconfig b/boards/boards_legacy/arc/nsim/nsim_hs_mpuv6_defconfig deleted file mode 100644 index 4f57122f208..00000000000 --- a/boards/boards_legacy/arc/nsim/nsim_hs_mpuv6_defconfig +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -CONFIG_SOC_NSIM=y -CONFIG_SOC_NSIM_HS_MPUV6=y -CONFIG_BOARD_NSIM=y -CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 -CONFIG_XIP=n -CONFIG_BUILD_OUTPUT_BIN=n -CONFIG_ARCV2_INTERRUPT_UNIT=y -CONFIG_ARCV2_TIMER=y -CONFIG_ARC_MPU_ENABLE=y -CONFIG_CONSOLE=y -CONFIG_UART_CONSOLE=y -CONFIG_SERIAL=y diff --git a/boards/boards_legacy/arc/nsim/nsim_hs_smp_defconfig b/boards/boards_legacy/arc/nsim/nsim_hs_smp_defconfig deleted file mode 100644 index 1b0d663da8d..00000000000 --- a/boards/boards_legacy/arc/nsim/nsim_hs_smp_defconfig +++ /dev/null @@ -1,16 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -CONFIG_SOC_NSIM=y -CONFIG_SOC_NSIM_HS_SMP=y -CONFIG_BOARD_NSIM=y -CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 -CONFIG_XIP=n -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_SMP=y -CONFIG_MP_MAX_NUM_CPUS=2 -CONFIG_TICKET_SPINLOCKS=y diff --git a/boards/boards_legacy/arc/nsim/nsim_hs_sram_defconfig b/boards/boards_legacy/arc/nsim/nsim_hs_sram_defconfig deleted file mode 100644 index 8c4032b2054..00000000000 --- a/boards/boards_legacy/arc/nsim/nsim_hs_sram_defconfig +++ /dev/null @@ -1,15 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -CONFIG_SOC_NSIM=y -CONFIG_SOC_NSIM_HS=y -CONFIG_BOARD_NSIM=y -CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 -CONFIG_XIP=n -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_HARVARD=n -CONFIG_ARC_MPU_ENABLE=y diff --git a/boards/boards_legacy/arc/nsim/nsim_sem_mpu_stack_guard_defconfig b/boards/boards_legacy/arc/nsim/nsim_sem_mpu_stack_guard_defconfig deleted file mode 100644 index 4f846b18d61..00000000000 --- a/boards/boards_legacy/arc/nsim/nsim_sem_mpu_stack_guard_defconfig +++ /dev/null @@ -1,16 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -CONFIG_SOC_NSIM=y -CONFIG_SOC_NSIM_SEM=y -CONFIG_BOARD_NSIM=y -CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 -CONFIG_XIP=n -CONFIG_BUILD_OUTPUT_BIN=n -CONFIG_ARCV2_INTERRUPT_UNIT=y -CONFIG_ARCV2_TIMER=y -CONFIG_ARC_HAS_STACK_CHECKING=n -CONFIG_ARC_MPU_ENABLE=y -CONFIG_CONSOLE=y -CONFIG_UART_CONSOLE=y -CONFIG_SERIAL=y -CONFIG_TRUSTED_EXECUTION_SECURE=y diff --git a/boards/boards_legacy/arc/nsim/CMakeLists.txt b/boards/synopsys/nsim/CMakeLists.txt similarity index 100% rename from boards/boards_legacy/arc/nsim/CMakeLists.txt rename to boards/synopsys/nsim/CMakeLists.txt diff --git a/boards/synopsys/nsim/Kconfig b/boards/synopsys/nsim/Kconfig new file mode 100644 index 00000000000..5fefd2b3877 --- /dev/null +++ b/boards/synopsys/nsim/Kconfig @@ -0,0 +1,7 @@ +# DesignWare ARC nSIM simulated platform configuration + +# Copyright (c) 2016, 2019 Synopsys, Inc. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NSIM + select HAS_COVERAGE_SUPPORT diff --git a/boards/synopsys/nsim/Kconfig.nsim b/boards/synopsys/nsim/Kconfig.nsim new file mode 100644 index 00000000000..88601b8e48a --- /dev/null +++ b/boards/synopsys/nsim/Kconfig.nsim @@ -0,0 +1,28 @@ +# DesignWare ARC nSIM simulated platform configuration + +# Copyright (c) 2016, 2019 Synopsys, Inc. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NSIM + select SOC_NSIM_EM if BOARD_NSIM_NSIM_EM + select SOC_NSIM_EM7D_V22 if BOARD_NSIM_NSIM_EM7D_V22 + select SOC_NSIM_EM11D if BOARD_NSIM_NSIM_EM11D + select SOC_NSIM_HS if BOARD_NSIM_NSIM_HS + select SOC_NSIM_HS if BOARD_NSIM_NSIM_HS_SRAM + select SOC_NSIM_HS_SMP if BOARD_NSIM_NSIM_HS_SMP + select SOC_NSIM_HS if BOARD_NSIM_NSIM_HS_FLASH_XIP + select SOC_NSIM_HS_MPUV6 if BOARD_NSIM_NSIM_HS_MPUV6 + select SOC_NSIM_HS if BOARD_NSIM_NSIM_HS_HOSTLINK + select SOC_NSIM_HS5X if BOARD_NSIM_NSIM_HS5X + select SOC_NSIM_HS5X_SMP if BOARD_NSIM_NSIM_HS5X_SMP + select SOC_NSIM_HS5X_SMP if BOARD_NSIM_NSIM_HS5X_SMP_12CORES + select SOC_NSIM_HS6X if BOARD_NSIM_NSIM_HS6X + select SOC_NSIM_HS6X_SMP if BOARD_NSIM_NSIM_HS6X_SMP + select SOC_NSIM_HS6X_SMP if BOARD_NSIM_NSIM_HS6X_SMP_12CORES + select SOC_NSIM_SEM if BOARD_NSIM_NSIM_SEM + select SOC_NSIM_SEM if BOARD_NSIM_NSIM_SEM_MPU_STACK_GUARD + select SOC_NSIM_VPX5 if BOARD_NSIM_NSIM_VPX5 + 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 ns16550 UART model. diff --git a/boards/boards_legacy/arc/nsim/arc_mpu_regions.c b/boards/synopsys/nsim/arc_mpu_regions.c similarity index 100% rename from boards/boards_legacy/arc/nsim/arc_mpu_regions.c rename to boards/synopsys/nsim/arc_mpu_regions.c diff --git a/boards/boards_legacy/arc/nsim/board.cmake b/boards/synopsys/nsim/board.cmake similarity index 100% rename from boards/boards_legacy/arc/nsim/board.cmake rename to boards/synopsys/nsim/board.cmake diff --git a/boards/synopsys/nsim/board.yml b/boards/synopsys/nsim/board.yml new file mode 100644 index 00000000000..95d3413bfa8 --- /dev/null +++ b/boards/synopsys/nsim/board.yml @@ -0,0 +1,28 @@ +board: + name: nsim + vendor: Synopsys + socs: + - name: nsim_em + - name: nsim_em7d_v22 + - name: nsim_em11d + - name: nsim_hs + variants: + - name: sram + - name: smp + - name: flash_xip + - name: mpuv6 + - name: hostlink + - name: nsim_hs5x + variants: + - name: smp + variants: + - name: 12cores + - name: nsim_hs6x + variants: + - name: smp + variants: + - name: 12cores + - name: nsim_sem + variants: + - name: mpu_stack_guard + - name: nsim_vpx5 diff --git a/boards/boards_legacy/arc/nsim/doc/index.rst b/boards/synopsys/nsim/doc/index.rst similarity index 87% rename from boards/boards_legacy/arc/nsim/doc/index.rst rename to boards/synopsys/nsim/doc/index.rst index 4e7054fc43b..a42aed165f9 100644 --- a/boards/boards_legacy/arc/nsim/doc/index.rst +++ b/boards/synopsys/nsim/doc/index.rst @@ -22,24 +22,24 @@ are currently supported in the Zephyr RTOS for ARC, again please refer to There are multiple supported sub-configurations for that platform. Some but not all of currently available configurations are listed below: -* ``nsim_em`` - ARC EM core v4.0 with two register banks, FastIRQ's, MPUv2, DSP options and +* ``nsim/nsim_em`` - ARC EM core v4.0 with two register banks, FastIRQ's, MPUv2, DSP options and XY-memory -* ``nsim_em_em7d_v22`` - ARC EM core v3.0 with one register bank and FastIRQ's -* ``nsim_em_em11d`` - ARC EM core v4.0 with one register bank, no FastIRQ's, MPUv2, DSP options and +* ``nsim/nsim_em7d_v22`` - ARC EM core v3.0 with one register bank and FastIRQ's +* ``nsim/nsim_em11d`` - ARC EM core v4.0 with one register bank, no FastIRQ's, MPUv2, DSP options and XY-memory -* ``nsim_sem`` - ARC EM core v4.0 with secure features (thus "SEM", i.e. Secure EM) and MPUv4 -* ``nsim_hs`` - ARCv2 HS core v2.1 with two register banks, FastIRQ's and MPUv3 -* ``nsim_hs_smp`` - Dual-core ARCv2 HS core v2.1 with two register banks, FastIRQ's and MPUv3 -* ``nsim_vpx5`` - ARCv2 VPX5 core, close to vpx5_integer_full template -* ``nsim_hs5x`` - 32-bit ARCv3 HS core with rich set of options -* ``nsim_hs6x`` - 64-bit ARCv3 HS core with rich set of options -* ``nsim_hs5x_smp_12cores`` - SMP 12 cores 32-bit ARCv3 HS platform -* ``nsim_hs6x_smp_12cores`` - SMP 12 cores 64-bit ARCv3 HS platform +* ``nsim/nsim_sem`` - ARC EM core v4.0 with secure features (thus "SEM", i.e. Secure EM) and MPUv4 +* ``nsim/nsim_hs`` - ARCv2 HS core v2.1 with two register banks, FastIRQ's and MPUv3 +* ``nsim/nsim_hs/smp`` - Dual-core ARCv2 HS core v2.1 with two register banks, FastIRQ's and MPUv3 +* ``nsim/nsim_vpx5`` - ARCv2 VPX5 core, close to vpx5_integer_full template +* ``nsim/nsim_hs5x`` - 32-bit ARCv3 HS core with rich set of options +* ``nsim/nsim_hs6x`` - 64-bit ARCv3 HS core with rich set of options +* ``nsim/nsim_hs5x/smp/12cores`` - SMP 12 cores 32-bit ARCv3 HS platform +* ``nsim/nsim_hs6x/smp/12cores`` - SMP 12 cores 64-bit ARCv3 HS platform .. _board_arc_nsim_prop_args_files: It is recommended to look at precise description of a particular sub-configuration in either -``.props`` or ``.args`` files in :zephyr_file:`boards/arc/nsim/support/` directory to understand +``.props`` or ``.args`` files in :zephyr_file:`boards/synopsys/nsim/support/` directory to understand which options are configured and so will be used on invocation of the simulator. In case of single-core configurations it would be ``.props`` file which contains configuration @@ -54,15 +54,15 @@ simulation anyway). defined in ``.props`` and ``.args`` are semantically identical (unfortunately options of nSIM & MDB don't exactly match, so care should be taken). -I.e. for the single-core ``nsim_hs5x`` platform there are -:zephyr_file:`boards/arc/nsim/support/nsim_hs5x.props` and -:zephyr_file:`boards/arc/nsim/support/mdb_hs5x.args`. +I.e. for the single-core ``nsim/nsim_hs5x`` platform there are +:zephyr_file:`boards/synopsys/nsim/support/nsim_hs5x.props` and +:zephyr_file:`boards/synopsys/nsim/support/mdb_hs5x.args`. For the multi-core configurations there is only ``.args`` file as the multi-core configuration can only be instantiated with help of MDB. -I.e. for the multi-core ``nsim_hs5x_smp`` platform there is only -:zephyr_file:`boards/arc/nsim/support/mdb_hs5x_smp.args`. +I.e. for the multi-core ``nsim/nsim_hs5x/smp`` platform there is only +:zephyr_file:`boards/synopsys/nsim/support/mdb_hs5x_smp.args`. .. warning:: All nSIM/MDB configurations are used for demo and testing purposes. They are not meant to @@ -90,7 +90,7 @@ Most board sub-configurations support building with both GNU and ARC MWDT toolch there might be exceptions from that, especially for newly added targets. You can check supported toolchains for the sub-configurations in the corresponding ``.yaml`` file. -I.e. for the ``nsim_hs5x`` board we can check :zephyr_file:`boards/arc/nsim/nsim_hs5x.yaml` +I.e. for the ``nsim/nsim_hs5x`` board we can check :zephyr_file:`boards/synopsys/nsim/nsim_hs5x.yaml` The supported toolchains are listed in ``toolchain:`` array in ``.yaml`` file, where we can find: @@ -189,15 +189,15 @@ platform: west -v debug --runner mdb-nsim - it will produce the following output (the ``nsim_hs5x_smp`` configuration was used for that + it will produce the following output (the ``nsim/nsim_hs5x/smp`` configuration was used for that example): .. code-block:: console < *snip* > -- west debug: using runner mdb-nsim - runners.mdb-nsim: mdb -pset=1 -psetname=core0 -nooptions -nogoifmain -toggle=include_local_symbols=1 -nsim @/path/zephyr/boards/arc/nsim/support/mdb_hs5x_smp.args /path/zephyr/build/zephyr/zephyr.elf - runners.mdb-nsim: mdb -pset=2 -psetname=core1 -prop=download=2 -nooptions -nogoifmain -toggle=include_local_symbols=1 -nsim @/path/zephyr/boards/arc/nsim/support/mdb_hs5x_smp.args /path/zephyr/build/zephyr/zephyr.elf + runners.mdb-nsim: mdb -pset=1 -psetname=core0 -nooptions -nogoifmain -toggle=include_local_symbols=1 -nsim @/path/zephyr/boards/synopsys/nsim/support/mdb_hs5x_smp.args /path/zephyr/build/zephyr/zephyr.elf + runners.mdb-nsim: mdb -pset=2 -psetname=core1 -prop=download=2 -nooptions -nogoifmain -toggle=include_local_symbols=1 -nsim @/path/zephyr/boards/synopsys/nsim/support/mdb_hs5x_smp.args /path/zephyr/build/zephyr/zephyr.elf runners.mdb-nsim: mdb -multifiles=core1,core0 -OKN From that output it's possible to extract MDB commands used for setting-up the GUI debugging @@ -205,8 +205,8 @@ platform: .. code-block:: console - mdb -pset=1 -psetname=core0 -nooptions -nogoifmain -toggle=include_local_symbols=1 -nsim @/path/zephyr/boards/arc/nsim/support/mdb_hs5x_smp.args /path/zephyr/build/zephyr/zephyr.elf - mdb -pset=2 -psetname=core1 -prop=download=2 -nooptions -nogoifmain -toggle=include_local_symbols=1 -nsim @/path/zephyr/boards/arc/nsim/support/mdb_hs5x_smp.args /path/zephyr/build/zephyr/zephyr.elf + mdb -pset=1 -psetname=core0 -nooptions -nogoifmain -toggle=include_local_symbols=1 -nsim @/path/zephyr/boards/synopsys/nsim/support/mdb_hs5x_smp.args /path/zephyr/build/zephyr/zephyr.elf + mdb -pset=2 -psetname=core1 -prop=download=2 -nooptions -nogoifmain -toggle=include_local_symbols=1 -nsim @/path/zephyr/boards/synopsys/nsim/support/mdb_hs5x_smp.args /path/zephyr/build/zephyr/zephyr.elf mdb -multifiles=core1,core0 -OKN Then it's possible to use them directly or in some machinery if required. @@ -316,7 +316,7 @@ GNU & MWDT toolchain compiler options ===================================== The hardware-specific compiler options are set in corresponding SoC cmake file. For ``nsim`` board -it is :zephyr_file:`soc/arc/snps_nsim/CMakeLists.txt`. +it is :zephyr_file:`soc/synopsys/nsim/CMakeLists.txt`. For the GNU toolchain the basic configuration is set via ``-mcpu`` which is defined in generic code and based on the selected CPU model via Kconfig. It still can be forcefully set to required value diff --git a/boards/boards_legacy/arc/nsim/haps_arcv3_init.c b/boards/synopsys/nsim/haps_arcv3_init.c similarity index 100% rename from boards/boards_legacy/arc/nsim/haps_arcv3_init.c rename to boards/synopsys/nsim/haps_arcv3_init.c diff --git a/boards/boards_legacy/arc/nsim/nsim-ccm-mem.dtsi b/boards/synopsys/nsim/nsim-ccm-mem.dtsi similarity index 100% rename from boards/boards_legacy/arc/nsim/nsim-ccm-mem.dtsi rename to boards/synopsys/nsim/nsim-ccm-mem.dtsi diff --git a/boards/boards_legacy/arc/nsim/nsim-flash-sram-mem.dtsi b/boards/synopsys/nsim/nsim-flash-sram-mem.dtsi similarity index 100% rename from boards/boards_legacy/arc/nsim/nsim-flash-sram-mem.dtsi rename to boards/synopsys/nsim/nsim-flash-sram-mem.dtsi diff --git a/boards/boards_legacy/arc/nsim/nsim-flat-mem.dtsi b/boards/synopsys/nsim/nsim-flat-mem.dtsi similarity index 100% rename from boards/boards_legacy/arc/nsim/nsim-flat-mem.dtsi rename to boards/synopsys/nsim/nsim-flat-mem.dtsi diff --git a/boards/boards_legacy/arc/nsim/nsim-smp.dtsi b/boards/synopsys/nsim/nsim-smp.dtsi similarity index 100% rename from boards/boards_legacy/arc/nsim/nsim-smp.dtsi rename to boards/synopsys/nsim/nsim-smp.dtsi diff --git a/boards/boards_legacy/arc/nsim/nsim-uart-hostlink.dtsi b/boards/synopsys/nsim/nsim-uart-hostlink.dtsi similarity index 100% rename from boards/boards_legacy/arc/nsim/nsim-uart-hostlink.dtsi rename to boards/synopsys/nsim/nsim-uart-hostlink.dtsi diff --git a/boards/boards_legacy/arc/nsim/nsim-uart-ns16550.dtsi b/boards/synopsys/nsim/nsim-uart-ns16550.dtsi similarity index 100% rename from boards/boards_legacy/arc/nsim/nsim-uart-ns16550.dtsi rename to boards/synopsys/nsim/nsim-uart-ns16550.dtsi diff --git a/boards/boards_legacy/arc/nsim/nsim.dtsi b/boards/synopsys/nsim/nsim.dtsi similarity index 100% rename from boards/boards_legacy/arc/nsim/nsim.dtsi rename to boards/synopsys/nsim/nsim.dtsi diff --git a/boards/boards_legacy/arc/nsim/nsim_em-sec.dtsi b/boards/synopsys/nsim/nsim_em-sec.dtsi similarity index 100% rename from boards/boards_legacy/arc/nsim/nsim_em-sec.dtsi rename to boards/synopsys/nsim/nsim_em-sec.dtsi diff --git a/boards/boards_legacy/arc/nsim/nsim_em.dtsi b/boards/synopsys/nsim/nsim_em.dtsi similarity index 100% rename from boards/boards_legacy/arc/nsim/nsim_em.dtsi rename to boards/synopsys/nsim/nsim_em.dtsi diff --git a/boards/boards_legacy/arc/nsim/nsim_em.dts b/boards/synopsys/nsim/nsim_nsim_em.dts similarity index 100% rename from boards/boards_legacy/arc/nsim/nsim_em.dts rename to boards/synopsys/nsim/nsim_nsim_em.dts diff --git a/boards/boards_legacy/arc/nsim/nsim_em.yaml b/boards/synopsys/nsim/nsim_nsim_em.yaml similarity index 88% rename from boards/boards_legacy/arc/nsim/nsim_em.yaml rename to boards/synopsys/nsim/nsim_nsim_em.yaml index 9eb0c88ad50..7fd973932eb 100644 --- a/boards/boards_legacy/arc/nsim/nsim_em.yaml +++ b/boards/synopsys/nsim/nsim_nsim_em.yaml @@ -1,4 +1,4 @@ -identifier: nsim_em +identifier: nsim/nsim_em name: EM Nsim simulator type: sim simulation: nsim diff --git a/boards/boards_legacy/arc/nsim/nsim_em11d.dts b/boards/synopsys/nsim/nsim_nsim_em11d.dts similarity index 100% rename from boards/boards_legacy/arc/nsim/nsim_em11d.dts rename to boards/synopsys/nsim/nsim_nsim_em11d.dts diff --git a/boards/boards_legacy/arc/nsim/nsim_em11d.yaml b/boards/synopsys/nsim/nsim_nsim_em11d.yaml similarity index 87% rename from boards/boards_legacy/arc/nsim/nsim_em11d.yaml rename to boards/synopsys/nsim/nsim_nsim_em11d.yaml index a37c9c3888d..e37aeb2f442 100644 --- a/boards/boards_legacy/arc/nsim/nsim_em11d.yaml +++ b/boards/synopsys/nsim/nsim_nsim_em11d.yaml @@ -1,4 +1,4 @@ -identifier: nsim_em11d +identifier: nsim/nsim_em11d name: EM11D Nsim simulator type: sim simulation: nsim diff --git a/boards/boards_legacy/arc/nsim/nsim_em_defconfig b/boards/synopsys/nsim/nsim_nsim_em11d_defconfig similarity index 78% rename from boards/boards_legacy/arc/nsim/nsim_em_defconfig rename to boards/synopsys/nsim/nsim_nsim_em11d_defconfig index 263c5b27af5..1cdf8a0b67e 100644 --- a/boards/boards_legacy/arc/nsim/nsim_em_defconfig +++ b/boards/synopsys/nsim/nsim_nsim_em11d_defconfig @@ -1,10 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_NSIM=y -CONFIG_SOC_NSIM_EM=y -CONFIG_BOARD_NSIM=y CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 -CONFIG_XIP=n CONFIG_BUILD_OUTPUT_BIN=n CONFIG_ARCV2_INTERRUPT_UNIT=y CONFIG_ARCV2_TIMER=y diff --git a/boards/boards_legacy/arc/nsim/nsim_em7d_v22.dts b/boards/synopsys/nsim/nsim_nsim_em7d_v22.dts similarity index 100% rename from boards/boards_legacy/arc/nsim/nsim_em7d_v22.dts rename to boards/synopsys/nsim/nsim_nsim_em7d_v22.dts diff --git a/boards/boards_legacy/arc/nsim/nsim_em7d_v22.yaml b/boards/synopsys/nsim/nsim_nsim_em7d_v22.yaml similarity index 86% rename from boards/boards_legacy/arc/nsim/nsim_em7d_v22.yaml rename to boards/synopsys/nsim/nsim_nsim_em7d_v22.yaml index bd2069c8359..c77c883ccc8 100644 --- a/boards/boards_legacy/arc/nsim/nsim_em7d_v22.yaml +++ b/boards/synopsys/nsim/nsim_nsim_em7d_v22.yaml @@ -1,4 +1,4 @@ -identifier: nsim_em7d_v22 +identifier: nsim/nsim_em7d_v22 name: EM nSIM simulator (EM7D_v22) type: sim simulation: nsim diff --git a/boards/boards_legacy/arc/nsim/nsim_em11d_defconfig b/boards/synopsys/nsim/nsim_nsim_em7d_v22_defconfig similarity index 78% rename from boards/boards_legacy/arc/nsim/nsim_em11d_defconfig rename to boards/synopsys/nsim/nsim_nsim_em7d_v22_defconfig index 494ff760838..1cdf8a0b67e 100644 --- a/boards/boards_legacy/arc/nsim/nsim_em11d_defconfig +++ b/boards/synopsys/nsim/nsim_nsim_em7d_v22_defconfig @@ -1,10 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_NSIM=y -CONFIG_SOC_NSIM_EM11D=y -CONFIG_BOARD_NSIM=y CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 -CONFIG_XIP=n CONFIG_BUILD_OUTPUT_BIN=n CONFIG_ARCV2_INTERRUPT_UNIT=y CONFIG_ARCV2_TIMER=y diff --git a/boards/boards_legacy/arc/nsim/nsim_em7d_v22_defconfig b/boards/synopsys/nsim/nsim_nsim_em_defconfig similarity index 77% rename from boards/boards_legacy/arc/nsim/nsim_em7d_v22_defconfig rename to boards/synopsys/nsim/nsim_nsim_em_defconfig index 0a6d7ad5e4c..1cdf8a0b67e 100644 --- a/boards/boards_legacy/arc/nsim/nsim_em7d_v22_defconfig +++ b/boards/synopsys/nsim/nsim_nsim_em_defconfig @@ -1,10 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_NSIM=y -CONFIG_SOC_NSIM_EM7D_V22=y -CONFIG_BOARD_NSIM=y CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 -CONFIG_XIP=n CONFIG_BUILD_OUTPUT_BIN=n CONFIG_ARCV2_INTERRUPT_UNIT=y CONFIG_ARCV2_TIMER=y diff --git a/boards/boards_legacy/arc/nsim/nsim_hs.dts b/boards/synopsys/nsim/nsim_nsim_hs.dts similarity index 100% rename from boards/boards_legacy/arc/nsim/nsim_hs.dts rename to boards/synopsys/nsim/nsim_nsim_hs.dts diff --git a/boards/boards_legacy/arc/nsim/nsim_hs.yaml b/boards/synopsys/nsim/nsim_nsim_hs.yaml similarity index 88% rename from boards/boards_legacy/arc/nsim/nsim_hs.yaml rename to boards/synopsys/nsim/nsim_nsim_hs.yaml index 18f2a71039a..2f02bf5c85a 100644 --- a/boards/boards_legacy/arc/nsim/nsim_hs.yaml +++ b/boards/synopsys/nsim/nsim_nsim_hs.yaml @@ -1,4 +1,4 @@ -identifier: nsim_hs +identifier: nsim/nsim_hs name: HS nSIM simulator type: sim simulation: nsim diff --git a/boards/boards_legacy/arc/nsim/nsim_hs5x.dts b/boards/synopsys/nsim/nsim_nsim_hs5x.dts similarity index 100% rename from boards/boards_legacy/arc/nsim/nsim_hs5x.dts rename to boards/synopsys/nsim/nsim_nsim_hs5x.dts diff --git a/boards/boards_legacy/arc/nsim/nsim_hs5x.yaml b/boards/synopsys/nsim/nsim_nsim_hs5x.yaml similarity index 88% rename from boards/boards_legacy/arc/nsim/nsim_hs5x.yaml rename to boards/synopsys/nsim/nsim_nsim_hs5x.yaml index 14d6cf03f8e..a20ad79a34a 100644 --- a/boards/boards_legacy/arc/nsim/nsim_hs5x.yaml +++ b/boards/synopsys/nsim/nsim_nsim_hs5x.yaml @@ -1,4 +1,4 @@ -identifier: nsim_hs5x +identifier: nsim/nsim_hs5x name: HS5x nSIM simulator type: sim simulation: nsim diff --git a/boards/boards_legacy/arc/nsim/nsim_hs5x_defconfig b/boards/synopsys/nsim/nsim_nsim_hs5x_defconfig similarity index 75% rename from boards/boards_legacy/arc/nsim/nsim_hs5x_defconfig rename to boards/synopsys/nsim/nsim_nsim_hs5x_defconfig index 03c5f678869..5a48971e06d 100644 --- a/boards/boards_legacy/arc/nsim/nsim_hs5x_defconfig +++ b/boards/synopsys/nsim/nsim_nsim_hs5x_defconfig @@ -1,11 +1,7 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_ISA_ARCV3=y -CONFIG_SOC_NSIM=y -CONFIG_SOC_NSIM_HS5X=y -CONFIG_BOARD_NSIM=y CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 -CONFIG_XIP=n CONFIG_BUILD_OUTPUT_BIN=n CONFIG_ARCV2_INTERRUPT_UNIT=y CONFIG_ARCV2_TIMER=y diff --git a/boards/boards_legacy/arc/nsim/nsim_hs5x_smp.dts b/boards/synopsys/nsim/nsim_nsim_hs5x_smp.dts similarity index 100% rename from boards/boards_legacy/arc/nsim/nsim_hs5x_smp.dts rename to boards/synopsys/nsim/nsim_nsim_hs5x_smp.dts diff --git a/boards/boards_legacy/arc/nsim/nsim_hs5x_smp.yaml b/boards/synopsys/nsim/nsim_nsim_hs5x_smp.yaml similarity index 89% rename from boards/boards_legacy/arc/nsim/nsim_hs5x_smp.yaml rename to boards/synopsys/nsim/nsim_nsim_hs5x_smp.yaml index 21015ecee69..09dcfd014ef 100644 --- a/boards/boards_legacy/arc/nsim/nsim_hs5x_smp.yaml +++ b/boards/synopsys/nsim/nsim_nsim_hs5x_smp.yaml @@ -1,4 +1,4 @@ -identifier: nsim_hs5x_smp +identifier: nsim/nsim_hs5x/smp name: Multi-core HS5x nSIM simulator type: sim simulation: mdb-nsim diff --git a/boards/boards_legacy/arc/nsim/nsim_hs5x_smp_12cores.dts b/boards/synopsys/nsim/nsim_nsim_hs5x_smp_12cores.dts similarity index 100% rename from boards/boards_legacy/arc/nsim/nsim_hs5x_smp_12cores.dts rename to boards/synopsys/nsim/nsim_nsim_hs5x_smp_12cores.dts diff --git a/boards/boards_legacy/arc/nsim/nsim_hs5x_smp_12cores.yaml b/boards/synopsys/nsim/nsim_nsim_hs5x_smp_12cores.yaml similarity index 86% rename from boards/boards_legacy/arc/nsim/nsim_hs5x_smp_12cores.yaml rename to boards/synopsys/nsim/nsim_nsim_hs5x_smp_12cores.yaml index f7f9fa1ec72..63a60a3423a 100644 --- a/boards/boards_legacy/arc/nsim/nsim_hs5x_smp_12cores.yaml +++ b/boards/synopsys/nsim/nsim_nsim_hs5x_smp_12cores.yaml @@ -1,4 +1,4 @@ -identifier: nsim_hs5x_smp_12cores +identifier: nsim/nsim_hs5x/smp/12cores name: Multi-core HS5x nSIM simulator (12 cores) type: sim simulation: mdb-nsim diff --git a/boards/synopsys/nsim/nsim_nsim_hs5x_smp_12cores_defconfig b/boards/synopsys/nsim/nsim_nsim_hs5x_smp_12cores_defconfig new file mode 100644 index 00000000000..cea98ef287a --- /dev/null +++ b/boards/synopsys/nsim/nsim_nsim_hs5x_smp_12cores_defconfig @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: Apache-2.0 + +CONFIG_MP_MAX_NUM_CPUS=12 diff --git a/boards/synopsys/nsim/nsim_nsim_hs5x_smp_defconfig b/boards/synopsys/nsim/nsim_nsim_hs5x_smp_defconfig new file mode 100644 index 00000000000..112ba7f1bd0 --- /dev/null +++ b/boards/synopsys/nsim/nsim_nsim_hs5x_smp_defconfig @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: Apache-2.0 + +CONFIG_SMP=y +CONFIG_MP_MAX_NUM_CPUS=2 +CONFIG_TICKET_SPINLOCKS=y diff --git a/boards/boards_legacy/arc/nsim/nsim_hs6x.dts b/boards/synopsys/nsim/nsim_nsim_hs6x.dts similarity index 100% rename from boards/boards_legacy/arc/nsim/nsim_hs6x.dts rename to boards/synopsys/nsim/nsim_nsim_hs6x.dts diff --git a/boards/boards_legacy/arc/nsim/nsim_hs6x.yaml b/boards/synopsys/nsim/nsim_nsim_hs6x.yaml similarity index 88% rename from boards/boards_legacy/arc/nsim/nsim_hs6x.yaml rename to boards/synopsys/nsim/nsim_nsim_hs6x.yaml index 08b881eb743..08d1fecc9c2 100644 --- a/boards/boards_legacy/arc/nsim/nsim_hs6x.yaml +++ b/boards/synopsys/nsim/nsim_nsim_hs6x.yaml @@ -1,4 +1,4 @@ -identifier: nsim_hs6x +identifier: nsim/nsim_hs6x name: HS6x nSIM simulator type: sim simulation: nsim diff --git a/boards/boards_legacy/arc/nsim/nsim_hs6x_defconfig b/boards/synopsys/nsim/nsim_nsim_hs6x_defconfig similarity index 75% rename from boards/boards_legacy/arc/nsim/nsim_hs6x_defconfig rename to boards/synopsys/nsim/nsim_nsim_hs6x_defconfig index dfb41bf2215..5a48971e06d 100644 --- a/boards/boards_legacy/arc/nsim/nsim_hs6x_defconfig +++ b/boards/synopsys/nsim/nsim_nsim_hs6x_defconfig @@ -1,11 +1,7 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_ISA_ARCV3=y -CONFIG_SOC_NSIM=y -CONFIG_SOC_NSIM_HS6X=y -CONFIG_BOARD_NSIM=y CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 -CONFIG_XIP=n CONFIG_BUILD_OUTPUT_BIN=n CONFIG_ARCV2_INTERRUPT_UNIT=y CONFIG_ARCV2_TIMER=y diff --git a/boards/boards_legacy/arc/nsim/nsim_hs6x_smp.dts b/boards/synopsys/nsim/nsim_nsim_hs6x_smp.dts similarity index 100% rename from boards/boards_legacy/arc/nsim/nsim_hs6x_smp.dts rename to boards/synopsys/nsim/nsim_nsim_hs6x_smp.dts diff --git a/boards/boards_legacy/arc/nsim/nsim_hs6x_smp.yaml b/boards/synopsys/nsim/nsim_nsim_hs6x_smp.yaml similarity index 89% rename from boards/boards_legacy/arc/nsim/nsim_hs6x_smp.yaml rename to boards/synopsys/nsim/nsim_nsim_hs6x_smp.yaml index d05faa51b29..5db80b6afa1 100644 --- a/boards/boards_legacy/arc/nsim/nsim_hs6x_smp.yaml +++ b/boards/synopsys/nsim/nsim_nsim_hs6x_smp.yaml @@ -1,4 +1,4 @@ -identifier: nsim_hs6x_smp +identifier: nsim/nsim_hs6x/smp name: Multi-core HS6x nSIM simulator type: sim simulation: mdb-nsim diff --git a/boards/boards_legacy/arc/nsim/nsim_hs6x_smp_12cores.dts b/boards/synopsys/nsim/nsim_nsim_hs6x_smp_12cores.dts similarity index 100% rename from boards/boards_legacy/arc/nsim/nsim_hs6x_smp_12cores.dts rename to boards/synopsys/nsim/nsim_nsim_hs6x_smp_12cores.dts diff --git a/boards/boards_legacy/arc/nsim/nsim_hs6x_smp_12cores.yaml b/boards/synopsys/nsim/nsim_nsim_hs6x_smp_12cores.yaml similarity index 86% rename from boards/boards_legacy/arc/nsim/nsim_hs6x_smp_12cores.yaml rename to boards/synopsys/nsim/nsim_nsim_hs6x_smp_12cores.yaml index 9abea29aabc..085f4bb93d5 100644 --- a/boards/boards_legacy/arc/nsim/nsim_hs6x_smp_12cores.yaml +++ b/boards/synopsys/nsim/nsim_nsim_hs6x_smp_12cores.yaml @@ -1,4 +1,4 @@ -identifier: nsim_hs6x_smp_12cores +identifier: nsim/nsim_hs6x/smp/12cores name: Multi-core HS6x nSIM simulator (12 cores) type: sim simulation: mdb-nsim diff --git a/boards/synopsys/nsim/nsim_nsim_hs6x_smp_12cores_defconfig b/boards/synopsys/nsim/nsim_nsim_hs6x_smp_12cores_defconfig new file mode 100644 index 00000000000..cea98ef287a --- /dev/null +++ b/boards/synopsys/nsim/nsim_nsim_hs6x_smp_12cores_defconfig @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: Apache-2.0 + +CONFIG_MP_MAX_NUM_CPUS=12 diff --git a/boards/synopsys/nsim/nsim_nsim_hs6x_smp_defconfig b/boards/synopsys/nsim/nsim_nsim_hs6x_smp_defconfig new file mode 100644 index 00000000000..112ba7f1bd0 --- /dev/null +++ b/boards/synopsys/nsim/nsim_nsim_hs6x_smp_defconfig @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: Apache-2.0 + +CONFIG_SMP=y +CONFIG_MP_MAX_NUM_CPUS=2 +CONFIG_TICKET_SPINLOCKS=y diff --git a/boards/boards_legacy/arc/nsim/nsim_hs3x_hostlink_defconfig b/boards/synopsys/nsim/nsim_nsim_hs_defconfig similarity index 76% rename from boards/boards_legacy/arc/nsim/nsim_hs3x_hostlink_defconfig rename to boards/synopsys/nsim/nsim_nsim_hs_defconfig index eddd5076c65..123983e3241 100644 --- a/boards/boards_legacy/arc/nsim/nsim_hs3x_hostlink_defconfig +++ b/boards/synopsys/nsim/nsim_nsim_hs_defconfig @@ -1,10 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_NSIM=y -CONFIG_SOC_NSIM_HS=y -CONFIG_BOARD_NSIM=y CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 -CONFIG_XIP=n CONFIG_BUILD_OUTPUT_BIN=n CONFIG_ARCV2_INTERRUPT_UNIT=y CONFIG_ARCV2_TIMER=y diff --git a/boards/boards_legacy/arc/nsim/nsim_hs_flash_xip.dts b/boards/synopsys/nsim/nsim_nsim_hs_flash_xip.dts similarity index 100% rename from boards/boards_legacy/arc/nsim/nsim_hs_flash_xip.dts rename to boards/synopsys/nsim/nsim_nsim_hs_flash_xip.dts diff --git a/boards/boards_legacy/arc/nsim/nsim_hs_flash_xip.yaml b/boards/synopsys/nsim/nsim_nsim_hs_flash_xip.yaml similarity index 85% rename from boards/boards_legacy/arc/nsim/nsim_hs_flash_xip.yaml rename to boards/synopsys/nsim/nsim_nsim_hs_flash_xip.yaml index eabe0c9cd84..e39cfe00f9a 100644 --- a/boards/boards_legacy/arc/nsim/nsim_hs_flash_xip.yaml +++ b/boards/synopsys/nsim/nsim_nsim_hs_flash_xip.yaml @@ -1,4 +1,4 @@ -identifier: nsim_hs_flash_xip +identifier: nsim/nsim_hs/flash_xip name: HS nSIM simulator (FLASH XIP) type: sim simulation: nsim diff --git a/boards/synopsys/nsim/nsim_nsim_hs_flash_xip_defconfig b/boards/synopsys/nsim/nsim_nsim_hs_flash_xip_defconfig new file mode 100644 index 00000000000..4c4786d7291 --- /dev/null +++ b/boards/synopsys/nsim/nsim_nsim_hs_flash_xip_defconfig @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: Apache-2.0 + +CONFIG_XIP=y +CONFIG_HARVARD=n diff --git a/boards/boards_legacy/arc/nsim/nsim_hs3x_hostlink.dts b/boards/synopsys/nsim/nsim_nsim_hs_hostlink.dts similarity index 100% rename from boards/boards_legacy/arc/nsim/nsim_hs3x_hostlink.dts rename to boards/synopsys/nsim/nsim_nsim_hs_hostlink.dts diff --git a/boards/boards_legacy/arc/nsim/nsim_hs3x_hostlink.yaml b/boards/synopsys/nsim/nsim_nsim_hs_hostlink.yaml similarity index 85% rename from boards/boards_legacy/arc/nsim/nsim_hs3x_hostlink.yaml rename to boards/synopsys/nsim/nsim_nsim_hs_hostlink.yaml index f23cdc18501..6a2a224d2e6 100644 --- a/boards/boards_legacy/arc/nsim/nsim_hs3x_hostlink.yaml +++ b/boards/synopsys/nsim/nsim_nsim_hs_hostlink.yaml @@ -1,4 +1,4 @@ -identifier: nsim_hs3x_hostlink +identifier: nsim/nsim_hs/hostlink name: HS3x nSIM simulator type: sim simulation: nsim diff --git a/boards/boards_legacy/arc/nsim/nsim_hs_mpuv6.dts b/boards/synopsys/nsim/nsim_nsim_hs_mpuv6.dts similarity index 100% rename from boards/boards_legacy/arc/nsim/nsim_hs_mpuv6.dts rename to boards/synopsys/nsim/nsim_nsim_hs_mpuv6.dts diff --git a/boards/boards_legacy/arc/nsim/nsim_hs_mpuv6.yaml b/boards/synopsys/nsim/nsim_nsim_hs_mpuv6.yaml similarity index 88% rename from boards/boards_legacy/arc/nsim/nsim_hs_mpuv6.yaml rename to boards/synopsys/nsim/nsim_nsim_hs_mpuv6.yaml index cf1fdba06a7..03e5609e703 100644 --- a/boards/boards_legacy/arc/nsim/nsim_hs_mpuv6.yaml +++ b/boards/synopsys/nsim/nsim_nsim_hs_mpuv6.yaml @@ -1,4 +1,4 @@ -identifier: nsim_hs_mpuv6 +identifier: nsim/nsim_hs/mpuv6 name: HS (with MPU v6) nSIM simulator type: sim simulation: nsim diff --git a/boards/boards_legacy/arc/nsim/nsim_hs_smp.dts b/boards/synopsys/nsim/nsim_nsim_hs_smp.dts similarity index 100% rename from boards/boards_legacy/arc/nsim/nsim_hs_smp.dts rename to boards/synopsys/nsim/nsim_nsim_hs_smp.dts diff --git a/boards/boards_legacy/arc/nsim/nsim_hs_smp.yaml b/boards/synopsys/nsim/nsim_nsim_hs_smp.yaml similarity index 90% rename from boards/boards_legacy/arc/nsim/nsim_hs_smp.yaml rename to boards/synopsys/nsim/nsim_nsim_hs_smp.yaml index ccc1fab694d..50f910e3f8c 100644 --- a/boards/boards_legacy/arc/nsim/nsim_hs_smp.yaml +++ b/boards/synopsys/nsim/nsim_nsim_hs_smp.yaml @@ -1,4 +1,4 @@ -identifier: nsim_hs_smp +identifier: nsim/nsim_hs/smp name: Multi-core HS nSIM simulator type: sim simulation: mdb-nsim diff --git a/boards/synopsys/nsim/nsim_nsim_hs_smp_defconfig b/boards/synopsys/nsim/nsim_nsim_hs_smp_defconfig new file mode 100644 index 00000000000..f6818014718 --- /dev/null +++ b/boards/synopsys/nsim/nsim_nsim_hs_smp_defconfig @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: Apache-2.0 + +CONFIG_ARC_MPU_ENABLE=n +CONFIG_SMP=y +CONFIG_MP_MAX_NUM_CPUS=2 +CONFIG_TICKET_SPINLOCKS=y diff --git a/boards/boards_legacy/arc/nsim/nsim_hs_sram.dts b/boards/synopsys/nsim/nsim_nsim_hs_sram.dts similarity index 100% rename from boards/boards_legacy/arc/nsim/nsim_hs_sram.dts rename to boards/synopsys/nsim/nsim_nsim_hs_sram.dts diff --git a/boards/boards_legacy/arc/nsim/nsim_hs_sram.yaml b/boards/synopsys/nsim/nsim_nsim_hs_sram.yaml similarity index 87% rename from boards/boards_legacy/arc/nsim/nsim_hs_sram.yaml rename to boards/synopsys/nsim/nsim_nsim_hs_sram.yaml index cfbf02d6023..f2d8a0e8bd9 100644 --- a/boards/boards_legacy/arc/nsim/nsim_hs_sram.yaml +++ b/boards/synopsys/nsim/nsim_nsim_hs_sram.yaml @@ -1,4 +1,4 @@ -identifier: nsim_hs_sram +identifier: nsim/nsim_hs/sram name: HS nSIM simulator (SRAM) type: sim simulation: nsim diff --git a/boards/synopsys/nsim/nsim_nsim_hs_sram_defconfig b/boards/synopsys/nsim/nsim_nsim_hs_sram_defconfig new file mode 100644 index 00000000000..fec69adbb50 --- /dev/null +++ b/boards/synopsys/nsim/nsim_nsim_hs_sram_defconfig @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: Apache-2.0 + +CONFIG_HARVARD=n diff --git a/boards/boards_legacy/arc/nsim/nsim_sem.dts b/boards/synopsys/nsim/nsim_nsim_sem.dts similarity index 100% rename from boards/boards_legacy/arc/nsim/nsim_sem.dts rename to boards/synopsys/nsim/nsim_nsim_sem.dts diff --git a/boards/boards_legacy/arc/nsim/nsim_sem.yaml b/boards/synopsys/nsim/nsim_nsim_sem.yaml similarity index 89% rename from boards/boards_legacy/arc/nsim/nsim_sem.yaml rename to boards/synopsys/nsim/nsim_nsim_sem.yaml index 13afb56ca69..fadc0783f72 100644 --- a/boards/boards_legacy/arc/nsim/nsim_sem.yaml +++ b/boards/synopsys/nsim/nsim_nsim_sem.yaml @@ -1,4 +1,4 @@ -identifier: nsim_sem +identifier: nsim/nsim_sem name: SEM Nsim simulator type: sim arch: arc diff --git a/boards/boards_legacy/arc/nsim/nsim_sem_defconfig b/boards/synopsys/nsim/nsim_nsim_sem_defconfig similarity index 78% rename from boards/boards_legacy/arc/nsim/nsim_sem_defconfig rename to boards/synopsys/nsim/nsim_nsim_sem_defconfig index c6be9e45d58..deb2c9c0571 100644 --- a/boards/boards_legacy/arc/nsim/nsim_sem_defconfig +++ b/boards/synopsys/nsim/nsim_nsim_sem_defconfig @@ -1,10 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_NSIM=y -CONFIG_SOC_NSIM_SEM=y -CONFIG_BOARD_NSIM=y CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 -CONFIG_XIP=n CONFIG_BUILD_OUTPUT_BIN=n CONFIG_ARCV2_INTERRUPT_UNIT=y CONFIG_ARCV2_TIMER=y diff --git a/boards/boards_legacy/arc/nsim/nsim_sem_mpu_stack_guard.dts b/boards/synopsys/nsim/nsim_nsim_sem_mpu_stack_guard.dts similarity index 100% rename from boards/boards_legacy/arc/nsim/nsim_sem_mpu_stack_guard.dts rename to boards/synopsys/nsim/nsim_nsim_sem_mpu_stack_guard.dts diff --git a/boards/boards_legacy/arc/nsim/nsim_sem_mpu_stack_guard.yaml b/boards/synopsys/nsim/nsim_nsim_sem_mpu_stack_guard.yaml similarity index 83% rename from boards/boards_legacy/arc/nsim/nsim_sem_mpu_stack_guard.yaml rename to boards/synopsys/nsim/nsim_nsim_sem_mpu_stack_guard.yaml index 13a48179fd5..986345ab8e0 100644 --- a/boards/boards_legacy/arc/nsim/nsim_sem_mpu_stack_guard.yaml +++ b/boards/synopsys/nsim/nsim_nsim_sem_mpu_stack_guard.yaml @@ -1,4 +1,4 @@ -identifier: nsim_sem_mpu_stack_guard +identifier: nsim/nsim_sem/mpu_stack_guard name: SEM nSIM simulator (stack guard) type: sim arch: arc diff --git a/boards/synopsys/nsim/nsim_nsim_sem_mpu_stack_guard_defconfig b/boards/synopsys/nsim/nsim_nsim_sem_mpu_stack_guard_defconfig new file mode 100644 index 00000000000..8fe546e4302 --- /dev/null +++ b/boards/synopsys/nsim/nsim_nsim_sem_mpu_stack_guard_defconfig @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: Apache-2.0 + +CONFIG_ARC_HAS_STACK_CHECKING=n diff --git a/boards/boards_legacy/arc/nsim/nsim_vpx5.dts b/boards/synopsys/nsim/nsim_nsim_vpx5.dts similarity index 100% rename from boards/boards_legacy/arc/nsim/nsim_vpx5.dts rename to boards/synopsys/nsim/nsim_nsim_vpx5.dts diff --git a/boards/boards_legacy/arc/nsim/nsim_vpx5.yaml b/boards/synopsys/nsim/nsim_nsim_vpx5.yaml similarity index 86% rename from boards/boards_legacy/arc/nsim/nsim_vpx5.yaml rename to boards/synopsys/nsim/nsim_nsim_vpx5.yaml index 4d5a3c8e96e..b1169acd111 100644 --- a/boards/boards_legacy/arc/nsim/nsim_vpx5.yaml +++ b/boards/synopsys/nsim/nsim_nsim_vpx5.yaml @@ -1,4 +1,4 @@ -identifier: nsim_vpx5 +identifier: nsim/nsim_vpx5 name: VPX5 nSIM simulator type: sim simulation: nsim diff --git a/boards/boards_legacy/arc/nsim/nsim_vpx5_defconfig b/boards/synopsys/nsim/nsim_nsim_vpx5_defconfig similarity index 73% rename from boards/boards_legacy/arc/nsim/nsim_vpx5_defconfig rename to boards/synopsys/nsim/nsim_nsim_vpx5_defconfig index 83fdaa12a7d..8ba152d9d36 100644 --- a/boards/boards_legacy/arc/nsim/nsim_vpx5_defconfig +++ b/boards/synopsys/nsim/nsim_nsim_vpx5_defconfig @@ -1,10 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_NSIM=y -CONFIG_SOC_NSIM_VPX5=y -CONFIG_BOARD_NSIM=y CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 -CONFIG_XIP=n CONFIG_BUILD_OUTPUT_BIN=n CONFIG_ARCV2_INTERRUPT_UNIT=y CONFIG_ARCV2_TIMER=y diff --git a/boards/boards_legacy/arc/nsim/support/mdb_em.args b/boards/synopsys/nsim/support/mdb_em.args similarity index 100% rename from boards/boards_legacy/arc/nsim/support/mdb_em.args rename to boards/synopsys/nsim/support/mdb_em.args diff --git a/boards/boards_legacy/arc/nsim/support/mdb_em11d.args b/boards/synopsys/nsim/support/mdb_em11d.args similarity index 100% rename from boards/boards_legacy/arc/nsim/support/mdb_em11d.args rename to boards/synopsys/nsim/support/mdb_em11d.args diff --git a/boards/boards_legacy/arc/nsim/support/mdb_em7d_v22.args b/boards/synopsys/nsim/support/mdb_em7d_v22.args similarity index 100% rename from boards/boards_legacy/arc/nsim/support/mdb_em7d_v22.args rename to boards/synopsys/nsim/support/mdb_em7d_v22.args diff --git a/boards/boards_legacy/arc/nsim/support/mdb_hs.args b/boards/synopsys/nsim/support/mdb_hs.args similarity index 100% rename from boards/boards_legacy/arc/nsim/support/mdb_hs.args rename to boards/synopsys/nsim/support/mdb_hs.args diff --git a/boards/boards_legacy/arc/nsim/support/mdb_hs3x_hostlink.args b/boards/synopsys/nsim/support/mdb_hs3x_hostlink.args similarity index 100% rename from boards/boards_legacy/arc/nsim/support/mdb_hs3x_hostlink.args rename to boards/synopsys/nsim/support/mdb_hs3x_hostlink.args diff --git a/boards/boards_legacy/arc/nsim/support/mdb_hs5x.args b/boards/synopsys/nsim/support/mdb_hs5x.args similarity index 100% rename from boards/boards_legacy/arc/nsim/support/mdb_hs5x.args rename to boards/synopsys/nsim/support/mdb_hs5x.args diff --git a/boards/boards_legacy/arc/nsim/support/mdb_hs5x_smp.args b/boards/synopsys/nsim/support/mdb_hs5x_smp.args similarity index 100% rename from boards/boards_legacy/arc/nsim/support/mdb_hs5x_smp.args rename to boards/synopsys/nsim/support/mdb_hs5x_smp.args diff --git a/boards/boards_legacy/arc/nsim/support/mdb_hs5x_smp_12cores.args b/boards/synopsys/nsim/support/mdb_hs5x_smp_12cores.args similarity index 100% rename from boards/boards_legacy/arc/nsim/support/mdb_hs5x_smp_12cores.args rename to boards/synopsys/nsim/support/mdb_hs5x_smp_12cores.args diff --git a/boards/boards_legacy/arc/nsim/support/mdb_hs6x.args b/boards/synopsys/nsim/support/mdb_hs6x.args similarity index 100% rename from boards/boards_legacy/arc/nsim/support/mdb_hs6x.args rename to boards/synopsys/nsim/support/mdb_hs6x.args diff --git a/boards/boards_legacy/arc/nsim/support/mdb_hs6x_smp.args b/boards/synopsys/nsim/support/mdb_hs6x_smp.args similarity index 100% rename from boards/boards_legacy/arc/nsim/support/mdb_hs6x_smp.args rename to boards/synopsys/nsim/support/mdb_hs6x_smp.args diff --git a/boards/boards_legacy/arc/nsim/support/mdb_hs6x_smp_12cores.args b/boards/synopsys/nsim/support/mdb_hs6x_smp_12cores.args similarity index 100% rename from boards/boards_legacy/arc/nsim/support/mdb_hs6x_smp_12cores.args rename to boards/synopsys/nsim/support/mdb_hs6x_smp_12cores.args diff --git a/boards/boards_legacy/arc/nsim/support/mdb_hs_flash_xip.args b/boards/synopsys/nsim/support/mdb_hs_flash_xip.args similarity index 100% rename from boards/boards_legacy/arc/nsim/support/mdb_hs_flash_xip.args rename to boards/synopsys/nsim/support/mdb_hs_flash_xip.args diff --git a/boards/boards_legacy/arc/nsim/support/mdb_hs_mpuv6.args b/boards/synopsys/nsim/support/mdb_hs_mpuv6.args similarity index 100% rename from boards/boards_legacy/arc/nsim/support/mdb_hs_mpuv6.args rename to boards/synopsys/nsim/support/mdb_hs_mpuv6.args diff --git a/boards/boards_legacy/arc/nsim/support/mdb_hs_smp.args b/boards/synopsys/nsim/support/mdb_hs_smp.args similarity index 100% rename from boards/boards_legacy/arc/nsim/support/mdb_hs_smp.args rename to boards/synopsys/nsim/support/mdb_hs_smp.args diff --git a/boards/boards_legacy/arc/nsim/support/mdb_hs_sram.args b/boards/synopsys/nsim/support/mdb_hs_sram.args similarity index 100% rename from boards/boards_legacy/arc/nsim/support/mdb_hs_sram.args rename to boards/synopsys/nsim/support/mdb_hs_sram.args diff --git a/boards/boards_legacy/arc/nsim/support/mdb_sem.args b/boards/synopsys/nsim/support/mdb_sem.args similarity index 100% rename from boards/boards_legacy/arc/nsim/support/mdb_sem.args rename to boards/synopsys/nsim/support/mdb_sem.args diff --git a/boards/boards_legacy/arc/nsim/support/mdb_vpx5.args b/boards/synopsys/nsim/support/mdb_vpx5.args similarity index 100% rename from boards/boards_legacy/arc/nsim/support/mdb_vpx5.args rename to boards/synopsys/nsim/support/mdb_vpx5.args diff --git a/boards/boards_legacy/arc/nsim/support/nsim_em.props b/boards/synopsys/nsim/support/nsim_em.props similarity index 100% rename from boards/boards_legacy/arc/nsim/support/nsim_em.props rename to boards/synopsys/nsim/support/nsim_em.props diff --git a/boards/boards_legacy/arc/nsim/support/nsim_em11d.props b/boards/synopsys/nsim/support/nsim_em11d.props similarity index 100% rename from boards/boards_legacy/arc/nsim/support/nsim_em11d.props rename to boards/synopsys/nsim/support/nsim_em11d.props diff --git a/boards/boards_legacy/arc/nsim/support/nsim_em7d_v22.props b/boards/synopsys/nsim/support/nsim_em7d_v22.props similarity index 100% rename from boards/boards_legacy/arc/nsim/support/nsim_em7d_v22.props rename to boards/synopsys/nsim/support/nsim_em7d_v22.props diff --git a/boards/boards_legacy/arc/nsim/support/nsim_hs.props b/boards/synopsys/nsim/support/nsim_hs.props similarity index 100% rename from boards/boards_legacy/arc/nsim/support/nsim_hs.props rename to boards/synopsys/nsim/support/nsim_hs.props diff --git a/boards/boards_legacy/arc/nsim/support/nsim_hs3x_hostlink.props b/boards/synopsys/nsim/support/nsim_hs3x_hostlink.props similarity index 100% rename from boards/boards_legacy/arc/nsim/support/nsim_hs3x_hostlink.props rename to boards/synopsys/nsim/support/nsim_hs3x_hostlink.props diff --git a/boards/boards_legacy/arc/nsim/support/nsim_hs5x.props b/boards/synopsys/nsim/support/nsim_hs5x.props similarity index 100% rename from boards/boards_legacy/arc/nsim/support/nsim_hs5x.props rename to boards/synopsys/nsim/support/nsim_hs5x.props diff --git a/boards/boards_legacy/arc/nsim/support/nsim_hs6x.props b/boards/synopsys/nsim/support/nsim_hs6x.props similarity index 100% rename from boards/boards_legacy/arc/nsim/support/nsim_hs6x.props rename to boards/synopsys/nsim/support/nsim_hs6x.props diff --git a/boards/boards_legacy/arc/nsim/support/nsim_hs_flash_xip.props b/boards/synopsys/nsim/support/nsim_hs_flash_xip.props similarity index 100% rename from boards/boards_legacy/arc/nsim/support/nsim_hs_flash_xip.props rename to boards/synopsys/nsim/support/nsim_hs_flash_xip.props diff --git a/boards/boards_legacy/arc/nsim/support/nsim_hs_mpuv6.props b/boards/synopsys/nsim/support/nsim_hs_mpuv6.props similarity index 100% rename from boards/boards_legacy/arc/nsim/support/nsim_hs_mpuv6.props rename to boards/synopsys/nsim/support/nsim_hs_mpuv6.props diff --git a/boards/boards_legacy/arc/nsim/support/nsim_hs_sram.props b/boards/synopsys/nsim/support/nsim_hs_sram.props similarity index 100% rename from boards/boards_legacy/arc/nsim/support/nsim_hs_sram.props rename to boards/synopsys/nsim/support/nsim_hs_sram.props diff --git a/boards/boards_legacy/arc/nsim/support/nsim_sem.props b/boards/synopsys/nsim/support/nsim_sem.props similarity index 100% rename from boards/boards_legacy/arc/nsim/support/nsim_sem.props rename to boards/synopsys/nsim/support/nsim_sem.props diff --git a/boards/boards_legacy/arc/nsim/support/nsim_sem_mpu_stack_guard.args b/boards/synopsys/nsim/support/nsim_sem_mpu_stack_guard.args similarity index 100% rename from boards/boards_legacy/arc/nsim/support/nsim_sem_mpu_stack_guard.args rename to boards/synopsys/nsim/support/nsim_sem_mpu_stack_guard.args diff --git a/boards/boards_legacy/arc/nsim/support/nsim_sem_mpu_stack_guard.props b/boards/synopsys/nsim/support/nsim_sem_mpu_stack_guard.props similarity index 100% rename from boards/boards_legacy/arc/nsim/support/nsim_sem_mpu_stack_guard.props rename to boards/synopsys/nsim/support/nsim_sem_mpu_stack_guard.props diff --git a/boards/boards_legacy/arc/nsim/support/nsim_vpx5.props b/boards/synopsys/nsim/support/nsim_vpx5.props similarity index 100% rename from boards/boards_legacy/arc/nsim/support/nsim_vpx5.props rename to boards/synopsys/nsim/support/nsim_vpx5.props