diff --git a/boards/v2/qemu/qemu_xtensa/Kconfig b/boards/v2/qemu/qemu_xtensa/Kconfig new file mode 100644 index 00000000000..1f03057fb80 --- /dev/null +++ b/boards/v2/qemu/qemu_xtensa/Kconfig @@ -0,0 +1,10 @@ +# XTENSA board configuration + +# Copyright (c) 2017, 2023 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_QEMU_XTENSA + select SOC_XTENSA_DC233C + select QEMU_TARGET + select ARCH_SUPPORTS_COREDUMP + select XTENSA_MMU if BOARD_QEMU_XTENSA_DC233C_MMU diff --git a/boards/xtensa/qemu_xtensa/Kconfig.defconfig b/boards/v2/qemu/qemu_xtensa/Kconfig.defconfig similarity index 50% rename from boards/xtensa/qemu_xtensa/Kconfig.defconfig rename to boards/v2/qemu/qemu_xtensa/Kconfig.defconfig index a6beed9151c..081971b5e81 100644 --- a/boards/xtensa/qemu_xtensa/Kconfig.defconfig +++ b/boards/v2/qemu/qemu_xtensa/Kconfig.defconfig @@ -6,22 +6,6 @@ if BOARD_QEMU_XTENSA config BUILD_OUTPUT_BIN default n -config BOARD - default "qemu_xtensa" - -config IPM_CONSOLE_STACK_SIZE - default 2048 if IPM_CONSOLE_RECEIVER - -endif # BOARD_QEMU_XTENSA - -if BOARD_QEMU_XTENSA_MMU - -config BUILD_OUTPUT_BIN - default n - -config BOARD - default "qemu_xtensa_mmu" - config IPM_CONSOLE_STACK_SIZE default 2048 if IPM_CONSOLE_RECEIVER diff --git a/boards/xtensa/qemu_xtensa/board.cmake b/boards/v2/qemu/qemu_xtensa/board.cmake similarity index 83% rename from boards/xtensa/qemu_xtensa/board.cmake rename to boards/v2/qemu/qemu_xtensa/board.cmake index 56a6c358be4..40818845da6 100644 --- a/boards/xtensa/qemu_xtensa/board.cmake +++ b/boards/v2/qemu/qemu_xtensa/board.cmake @@ -2,7 +2,7 @@ set(SUPPORTED_EMU_PLATFORMS qemu) -if(CONFIG_BOARD_QEMU_XTENSA OR CONFIG_BOARD_QEMU_XTENSA_MMU) +if(CONFIG_BOARD_QEMU_XTENSA) set(QEMU_CPU_TYPE_${ARCH} dc233c) set(QEMU_FLAGS_${ARCH} diff --git a/boards/v2/qemu/qemu_xtensa/board.yml b/boards/v2/qemu/qemu_xtensa/board.yml new file mode 100644 index 00000000000..d4f41d4677f --- /dev/null +++ b/boards/v2/qemu/qemu_xtensa/board.yml @@ -0,0 +1,7 @@ +board: + name: qemu_xtensa + vendor: Cadence Design Systems + socs: + - name: dc233c + variants: + - name: mmu diff --git a/boards/xtensa/qemu_xtensa/doc/index.rst b/boards/v2/qemu/qemu_xtensa/doc/index.rst similarity index 100% rename from boards/xtensa/qemu_xtensa/doc/index.rst rename to boards/v2/qemu/qemu_xtensa/doc/index.rst diff --git a/boards/xtensa/qemu_xtensa/qemu_xtensa.dts b/boards/v2/qemu/qemu_xtensa/qemu_xtensa.dts similarity index 100% rename from boards/xtensa/qemu_xtensa/qemu_xtensa.dts rename to boards/v2/qemu/qemu_xtensa/qemu_xtensa.dts diff --git a/boards/xtensa/qemu_xtensa/qemu_xtensa.yaml b/boards/v2/qemu/qemu_xtensa/qemu_xtensa.yaml similarity index 100% rename from boards/xtensa/qemu_xtensa/qemu_xtensa.yaml rename to boards/v2/qemu/qemu_xtensa/qemu_xtensa.yaml diff --git a/boards/xtensa/qemu_xtensa/qemu_xtensa_mmu.dts b/boards/v2/qemu/qemu_xtensa/qemu_xtensa_dc233c_mmu.dts similarity index 100% rename from boards/xtensa/qemu_xtensa/qemu_xtensa_mmu.dts rename to boards/v2/qemu/qemu_xtensa/qemu_xtensa_dc233c_mmu.dts diff --git a/boards/xtensa/qemu_xtensa/qemu_xtensa_mmu.yaml b/boards/v2/qemu/qemu_xtensa/qemu_xtensa_dc233c_mmu.yaml similarity index 83% rename from boards/xtensa/qemu_xtensa/qemu_xtensa_mmu.yaml rename to boards/v2/qemu/qemu_xtensa/qemu_xtensa_dc233c_mmu.yaml index aa2ef7692d4..61ab14c9130 100644 --- a/boards/xtensa/qemu_xtensa/qemu_xtensa_mmu.yaml +++ b/boards/v2/qemu/qemu_xtensa/qemu_xtensa_dc233c_mmu.yaml @@ -1,4 +1,4 @@ -identifier: qemu_xtensa_mmu +identifier: qemu_xtensa/dc233c/mmu name: QEMU Emulation for Xtensa with MMU type: qemu simulation: qemu diff --git a/boards/xtensa/qemu_xtensa/qemu_xtensa_mmu_defconfig b/boards/v2/qemu/qemu_xtensa/qemu_xtensa_dc233c_mmu_defconfig similarity index 81% rename from boards/xtensa/qemu_xtensa/qemu_xtensa_mmu_defconfig rename to boards/v2/qemu/qemu_xtensa/qemu_xtensa_dc233c_mmu_defconfig index 6587737bd88..d23b5a9f174 100644 --- a/boards/xtensa/qemu_xtensa/qemu_xtensa_mmu_defconfig +++ b/boards/v2/qemu/qemu_xtensa/qemu_xtensa_dc233c_mmu_defconfig @@ -1,9 +1,7 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_BOARD_QEMU_XTENSA_MMU=y CONFIG_CONSOLE=y -CONFIG_SOC_XTENSA_DC233C=y CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=10000000 CONFIG_STACK_SENTINEL=y CONFIG_GEN_ISR_TABLES=y diff --git a/boards/xtensa/qemu_xtensa/qemu_xtensa_defconfig b/boards/v2/qemu/qemu_xtensa/qemu_xtensa_defconfig similarity index 82% rename from boards/xtensa/qemu_xtensa/qemu_xtensa_defconfig rename to boards/v2/qemu/qemu_xtensa/qemu_xtensa_defconfig index ec51bb17a38..d23b5a9f174 100644 --- a/boards/xtensa/qemu_xtensa/qemu_xtensa_defconfig +++ b/boards/v2/qemu/qemu_xtensa/qemu_xtensa_defconfig @@ -1,9 +1,7 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_BOARD_QEMU_XTENSA=y CONFIG_CONSOLE=y -CONFIG_SOC_XTENSA_DC233C=y CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=10000000 CONFIG_STACK_SENTINEL=y CONFIG_GEN_ISR_TABLES=y diff --git a/boards/xtensa/qemu_xtensa/Kconfig b/boards/xtensa/qemu_xtensa/Kconfig deleted file mode 100644 index 2ecdedbd716..00000000000 --- a/boards/xtensa/qemu_xtensa/Kconfig +++ /dev/null @@ -1,4 +0,0 @@ -# Xtensa Qemu board configuration - -# Copyright (c) 2016 Cadence Design Systems, Inc. -# SPDX-License-Identifier: Apache-2.0 diff --git a/boards/xtensa/qemu_xtensa/Kconfig.board b/boards/xtensa/qemu_xtensa/Kconfig.board deleted file mode 100644 index 34cdf44a15c..00000000000 --- a/boards/xtensa/qemu_xtensa/Kconfig.board +++ /dev/null @@ -1,17 +0,0 @@ -# XTENSA board configuration - -# Copyright (c) 2017, 2023 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_QEMU_XTENSA - bool "Xtensa emulation using QEMU" - depends on SOC_XTENSA_DC233C - select QEMU_TARGET - select ARCH_SUPPORTS_COREDUMP - -config BOARD_QEMU_XTENSA_MMU - bool "Xtensa emulation using QEMU with MMU" - depends on SOC_XTENSA_DC233C - select QEMU_TARGET - select ARCH_SUPPORTS_COREDUMP - select XTENSA_MMU