diff --git a/boards/boards_legacy/arm/qemu_cortex_m3/Kconfig.board b/boards/qemu/cortex_m3/Kconfig similarity index 58% rename from boards/boards_legacy/arm/qemu_cortex_m3/Kconfig.board rename to boards/qemu/cortex_m3/Kconfig index 6322724df89..eef57a4eea4 100644 --- a/boards/boards_legacy/arm/qemu_cortex_m3/Kconfig.board +++ b/boards/qemu/cortex_m3/Kconfig @@ -1,6 +1,5 @@ +# Copyright (c) 2016 Zephyr Contributors # SPDX-License-Identifier: Apache-2.0 config BOARD_QEMU_CORTEX_M3 - bool "Cortex-M3 Emulation (QEMU)" - depends on SOC_TI_LM3S6965 select QEMU_TARGET diff --git a/boards/boards_legacy/arm/qemu_cortex_m3/Kconfig.defconfig b/boards/qemu/cortex_m3/Kconfig.defconfig similarity index 86% rename from boards/boards_legacy/arm/qemu_cortex_m3/Kconfig.defconfig rename to boards/qemu/cortex_m3/Kconfig.defconfig index bfbda98cb73..07f168ce414 100644 --- a/boards/boards_legacy/arm/qemu_cortex_m3/Kconfig.defconfig +++ b/boards/qemu/cortex_m3/Kconfig.defconfig @@ -1,3 +1,4 @@ +# Copyright (c) 2016 Zephyr Contributors # SPDX-License-Identifier: Apache-2.0 if BOARD_QEMU_CORTEX_M3 @@ -5,9 +6,6 @@ if BOARD_QEMU_CORTEX_M3 config BUILD_OUTPUT_BIN default n -config BOARD - default "qemu_cortex_m3" - # DWT is not properly emulated in QEMU choice NULL_POINTER_EXCEPTION_DETECTION bool diff --git a/boards/qemu/cortex_m3/Kconfig.qemu_cortex_m3 b/boards/qemu/cortex_m3/Kconfig.qemu_cortex_m3 new file mode 100644 index 00000000000..0e8d2cb2301 --- /dev/null +++ b/boards/qemu/cortex_m3/Kconfig.qemu_cortex_m3 @@ -0,0 +1,7 @@ +# Copyright (c) 2016 Zephyr Contributors +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_QEMU_CORTEX_M3 + select SOC_TI_LM3S6965 + help + Cortex-M3 Emulation (QEMU) diff --git a/boards/boards_legacy/arm/qemu_cortex_m3/board.cmake b/boards/qemu/cortex_m3/board.cmake similarity index 85% rename from boards/boards_legacy/arm/qemu_cortex_m3/board.cmake rename to boards/qemu/cortex_m3/board.cmake index 51f04bfd2dc..47d20e706a9 100644 --- a/boards/boards_legacy/arm/qemu_cortex_m3/board.cmake +++ b/boards/qemu/cortex_m3/board.cmake @@ -1,3 +1,4 @@ +# Copyright (c) 2016 Zephyr Contributors # SPDX-License-Identifier: Apache-2.0 set(SUPPORTED_EMU_PLATFORMS qemu) diff --git a/boards/boards_legacy/arm/qemu_cortex_m3/doc/index.rst b/boards/qemu/cortex_m3/doc/index.rst similarity index 100% rename from boards/boards_legacy/arm/qemu_cortex_m3/doc/index.rst rename to boards/qemu/cortex_m3/doc/index.rst diff --git a/boards/boards_legacy/arm/qemu_cortex_m3/qemu_cortex_m3.dts b/boards/qemu/cortex_m3/qemu_cortex_m3.dts similarity index 95% rename from boards/boards_legacy/arm/qemu_cortex_m3/qemu_cortex_m3.dts rename to boards/qemu/cortex_m3/qemu_cortex_m3.dts index 2d8e2f02dc6..2e0bd95755f 100644 --- a/boards/boards_legacy/arm/qemu_cortex_m3/qemu_cortex_m3.dts +++ b/boards/qemu/cortex_m3/qemu_cortex_m3.dts @@ -1,3 +1,4 @@ +/* Copyright (c) 2016 Zephyr Contributors */ /* SPDX-License-Identifier: Apache-2.0 */ /dts-v1/; diff --git a/boards/boards_legacy/arm/qemu_cortex_m3/qemu_cortex_m3.yaml b/boards/qemu/cortex_m3/qemu_cortex_m3.yaml similarity index 100% rename from boards/boards_legacy/arm/qemu_cortex_m3/qemu_cortex_m3.yaml rename to boards/qemu/cortex_m3/qemu_cortex_m3.yaml diff --git a/boards/boards_legacy/arm/qemu_cortex_m3/qemu_cortex_m3_defconfig b/boards/qemu/cortex_m3/qemu_cortex_m3_defconfig similarity index 77% rename from boards/boards_legacy/arm/qemu_cortex_m3/qemu_cortex_m3_defconfig rename to boards/qemu/cortex_m3/qemu_cortex_m3_defconfig index 7abc1e1d58a..ed69699fa71 100644 --- a/boards/boards_legacy/arm/qemu_cortex_m3/qemu_cortex_m3_defconfig +++ b/boards/qemu/cortex_m3/qemu_cortex_m3_defconfig @@ -1,8 +1,7 @@ +# Copyright (c) 2016 Zephyr Contributors # SPDX-License-Identifier: Apache-2.0 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=12000000 -CONFIG_SOC_TI_LM3S6965=y -CONFIG_BOARD_QEMU_CORTEX_M3=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y