diff --git a/boards/boards_legacy/arm/v2m_beetle/CMakeLists.txt b/boards/arm/v2m_beetle/CMakeLists.txt similarity index 100% rename from boards/boards_legacy/arm/v2m_beetle/CMakeLists.txt rename to boards/arm/v2m_beetle/CMakeLists.txt diff --git a/boards/boards_legacy/arm/v2m_beetle/Kconfig.defconfig b/boards/arm/v2m_beetle/Kconfig.defconfig similarity index 86% rename from boards/boards_legacy/arm/v2m_beetle/Kconfig.defconfig rename to boards/arm/v2m_beetle/Kconfig.defconfig index 2c88eebef39..3e04387a233 100644 --- a/boards/boards_legacy/arm/v2m_beetle/Kconfig.defconfig +++ b/boards/arm/v2m_beetle/Kconfig.defconfig @@ -5,9 +5,6 @@ if BOARD_V2M_BEETLE -config BOARD - default "v2m_beetle" - if SERIAL config UART_INTERRUPT_DRIVEN diff --git a/boards/boards_legacy/arm/v2m_beetle/Kconfig.board b/boards/arm/v2m_beetle/Kconfig.v2m_beetle similarity index 77% rename from boards/boards_legacy/arm/v2m_beetle/Kconfig.board rename to boards/arm/v2m_beetle/Kconfig.v2m_beetle index 6c0d883865d..574be8a942b 100644 --- a/boards/boards_legacy/arm/v2m_beetle/Kconfig.board +++ b/boards/arm/v2m_beetle/Kconfig.v2m_beetle @@ -5,5 +5,4 @@ # V2M (V2 = Versatile Express, M = Motherboard) config BOARD_V2M_BEETLE - bool "ARM V2M Beetle Board" - depends on SOC_BEETLE_R0 + select SOC_BEETLE_R0 diff --git a/boards/boards_legacy/arm/v2m_beetle/board.cmake b/boards/arm/v2m_beetle/board.cmake similarity index 100% rename from boards/boards_legacy/arm/v2m_beetle/board.cmake rename to boards/arm/v2m_beetle/board.cmake diff --git a/boards/arm/v2m_beetle/board.yml b/boards/arm/v2m_beetle/board.yml new file mode 100644 index 00000000000..a2234d894d9 --- /dev/null +++ b/boards/arm/v2m_beetle/board.yml @@ -0,0 +1,5 @@ +board: + name: v2m_beetle + vendor: ARM + socs: + - name: beetle_r0 diff --git a/boards/boards_legacy/arm/v2m_beetle/doc/img/v2m_beetle.jpg b/boards/arm/v2m_beetle/doc/img/v2m_beetle.jpg similarity index 100% rename from boards/boards_legacy/arm/v2m_beetle/doc/img/v2m_beetle.jpg rename to boards/arm/v2m_beetle/doc/img/v2m_beetle.jpg diff --git a/boards/boards_legacy/arm/v2m_beetle/doc/index.rst b/boards/arm/v2m_beetle/doc/index.rst similarity index 100% rename from boards/boards_legacy/arm/v2m_beetle/doc/index.rst rename to boards/arm/v2m_beetle/doc/index.rst diff --git a/boards/boards_legacy/arm/v2m_beetle/pinmux.c b/boards/arm/v2m_beetle/pinmux.c similarity index 100% rename from boards/boards_legacy/arm/v2m_beetle/pinmux.c rename to boards/arm/v2m_beetle/pinmux.c diff --git a/boards/boards_legacy/arm/v2m_beetle/support/openocd.cfg b/boards/arm/v2m_beetle/support/openocd.cfg similarity index 100% rename from boards/boards_legacy/arm/v2m_beetle/support/openocd.cfg rename to boards/arm/v2m_beetle/support/openocd.cfg diff --git a/boards/boards_legacy/arm/v2m_beetle/v2m_beetle.dts b/boards/arm/v2m_beetle/v2m_beetle.dts similarity index 100% rename from boards/boards_legacy/arm/v2m_beetle/v2m_beetle.dts rename to boards/arm/v2m_beetle/v2m_beetle.dts diff --git a/boards/boards_legacy/arm/v2m_beetle/v2m_beetle.yaml b/boards/arm/v2m_beetle/v2m_beetle.yaml similarity index 100% rename from boards/boards_legacy/arm/v2m_beetle/v2m_beetle.yaml rename to boards/arm/v2m_beetle/v2m_beetle.yaml diff --git a/boards/boards_legacy/arm/v2m_beetle/v2m_beetle_defconfig b/boards/arm/v2m_beetle/v2m_beetle_defconfig similarity index 82% rename from boards/boards_legacy/arm/v2m_beetle/v2m_beetle_defconfig rename to boards/arm/v2m_beetle/v2m_beetle_defconfig index 7301a8a2732..175c3072e9f 100644 --- a/boards/boards_legacy/arm/v2m_beetle/v2m_beetle_defconfig +++ b/boards/arm/v2m_beetle/v2m_beetle_defconfig @@ -6,11 +6,9 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_BEETLE_R0=y -CONFIG_SOC_SERIES_BEETLE=y -CONFIG_BOARD_V2M_BEETLE=y CONFIG_RUNTIME_NMI=y CONFIG_CLOCK_CONTROL=y + # 24MHz system clock CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=24000000