From 8053c3a8df35323c97c5f5e25b6ffa46b744a6de Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Tue, 6 Feb 2024 15:12:43 +0000 Subject: [PATCH] boards: arm: scobc_module1: Convert to v2 Converts the board to hwmv2 Signed-off-by: Jamie McCrae --- boards/boards_legacy/arm/scobc_module1/board.cmake | 7 ------- .../scobc_module1/Kconfig.defconfig | 3 --- .../scobc_module1/Kconfig.scobc_module1} | 3 +-- boards/space_cubics/scobc_module1/board.cmake | 5 +++++ boards/space_cubics/scobc_module1/board.yml | 5 +++++ .../scobc_module1/doc/index.rst | 0 .../scobc_module1/doc/scobc.jpg | Bin .../scobc_module1/dts/bindings/sc,hrmem.yaml | 0 .../scobc_module1/scobc_module1.dts | 0 .../scobc_module1/scobc_module1.yaml | 0 .../scobc_module1/scobc_module1_defconfig | 3 --- .../scobc_module1/support/akizuki-m-02990.cfg | 0 .../scobc_module1/support/openocd-ft232r.cfg | 0 .../scobc_module1/support/openocd-ftdi.cfg | 0 .../scobc_module1/support/openocd.cfg | 0 .../scobc_module1/support/scobc-module1.cfg | 0 16 files changed, 11 insertions(+), 15 deletions(-) delete mode 100644 boards/boards_legacy/arm/scobc_module1/board.cmake rename boards/{boards_legacy/arm => space_cubics}/scobc_module1/Kconfig.defconfig (87%) rename boards/{boards_legacy/arm/scobc_module1/Kconfig.board => space_cubics/scobc_module1/Kconfig.scobc_module1} (70%) create mode 100644 boards/space_cubics/scobc_module1/board.cmake create mode 100644 boards/space_cubics/scobc_module1/board.yml rename boards/{boards_legacy/arm => space_cubics}/scobc_module1/doc/index.rst (100%) rename boards/{boards_legacy/arm => space_cubics}/scobc_module1/doc/scobc.jpg (100%) rename boards/{boards_legacy/arm => space_cubics}/scobc_module1/dts/bindings/sc,hrmem.yaml (100%) rename boards/{boards_legacy/arm => space_cubics}/scobc_module1/scobc_module1.dts (100%) rename boards/{boards_legacy/arm => space_cubics}/scobc_module1/scobc_module1.yaml (100%) rename boards/{boards_legacy/arm => space_cubics}/scobc_module1/scobc_module1_defconfig (69%) rename boards/{boards_legacy/arm => space_cubics}/scobc_module1/support/akizuki-m-02990.cfg (100%) rename boards/{boards_legacy/arm => space_cubics}/scobc_module1/support/openocd-ft232r.cfg (100%) rename boards/{boards_legacy/arm => space_cubics}/scobc_module1/support/openocd-ftdi.cfg (100%) rename boards/{boards_legacy/arm => space_cubics}/scobc_module1/support/openocd.cfg (100%) rename boards/{boards_legacy/arm => space_cubics}/scobc_module1/support/scobc-module1.cfg (100%) diff --git a/boards/boards_legacy/arm/scobc_module1/board.cmake b/boards/boards_legacy/arm/scobc_module1/board.cmake deleted file mode 100644 index 50979050e38..00000000000 --- a/boards/boards_legacy/arm/scobc_module1/board.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -if(CONFIG_BOARD_SCOBC_MODULE1) - board_runner_args(openocd "--use-elf" "--config=${BOARD_DIR}/support/openocd-ftdi.cfg") - - include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) -endif() diff --git a/boards/boards_legacy/arm/scobc_module1/Kconfig.defconfig b/boards/space_cubics/scobc_module1/Kconfig.defconfig similarity index 87% rename from boards/boards_legacy/arm/scobc_module1/Kconfig.defconfig rename to boards/space_cubics/scobc_module1/Kconfig.defconfig index e80eb2226c8..35aae169147 100644 --- a/boards/boards_legacy/arm/scobc_module1/Kconfig.defconfig +++ b/boards/space_cubics/scobc_module1/Kconfig.defconfig @@ -5,9 +5,6 @@ if BOARD_SCOBC_MODULE1 -config BOARD - default "scobc_module1" - config CPU_CORTEX_M_HAS_SYSTICK default y diff --git a/boards/boards_legacy/arm/scobc_module1/Kconfig.board b/boards/space_cubics/scobc_module1/Kconfig.scobc_module1 similarity index 70% rename from boards/boards_legacy/arm/scobc_module1/Kconfig.board rename to boards/space_cubics/scobc_module1/Kconfig.scobc_module1 index 4a74754fb18..31f3a41a246 100644 --- a/boards/boards_legacy/arm/scobc_module1/Kconfig.board +++ b/boards/space_cubics/scobc_module1/Kconfig.scobc_module1 @@ -4,5 +4,4 @@ # SPDX-License-Identifier: Apache-2.0 config BOARD_SCOBC_MODULE1 - bool "Space Cubics OBC Module 1" - depends on SOC_SERIES_ARM_DESIGNSTART + select SOC_ARM_DESIGNSTART_FPGA_CORTEX_M3 diff --git a/boards/space_cubics/scobc_module1/board.cmake b/boards/space_cubics/scobc_module1/board.cmake new file mode 100644 index 00000000000..a0f4d5f5fed --- /dev/null +++ b/boards/space_cubics/scobc_module1/board.cmake @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: Apache-2.0 + +board_runner_args(openocd "--use-elf" "--config=${BOARD_DIR}/support/openocd-ftdi.cfg") + +include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) diff --git a/boards/space_cubics/scobc_module1/board.yml b/boards/space_cubics/scobc_module1/board.yml new file mode 100644 index 00000000000..c35f591507c --- /dev/null +++ b/boards/space_cubics/scobc_module1/board.yml @@ -0,0 +1,5 @@ +board: + name: scobc_module1 + vendor: Space Cubics + socs: + - name: designstart_fpga_cortex_m3 diff --git a/boards/boards_legacy/arm/scobc_module1/doc/index.rst b/boards/space_cubics/scobc_module1/doc/index.rst similarity index 100% rename from boards/boards_legacy/arm/scobc_module1/doc/index.rst rename to boards/space_cubics/scobc_module1/doc/index.rst diff --git a/boards/boards_legacy/arm/scobc_module1/doc/scobc.jpg b/boards/space_cubics/scobc_module1/doc/scobc.jpg similarity index 100% rename from boards/boards_legacy/arm/scobc_module1/doc/scobc.jpg rename to boards/space_cubics/scobc_module1/doc/scobc.jpg diff --git a/boards/boards_legacy/arm/scobc_module1/dts/bindings/sc,hrmem.yaml b/boards/space_cubics/scobc_module1/dts/bindings/sc,hrmem.yaml similarity index 100% rename from boards/boards_legacy/arm/scobc_module1/dts/bindings/sc,hrmem.yaml rename to boards/space_cubics/scobc_module1/dts/bindings/sc,hrmem.yaml diff --git a/boards/boards_legacy/arm/scobc_module1/scobc_module1.dts b/boards/space_cubics/scobc_module1/scobc_module1.dts similarity index 100% rename from boards/boards_legacy/arm/scobc_module1/scobc_module1.dts rename to boards/space_cubics/scobc_module1/scobc_module1.dts diff --git a/boards/boards_legacy/arm/scobc_module1/scobc_module1.yaml b/boards/space_cubics/scobc_module1/scobc_module1.yaml similarity index 100% rename from boards/boards_legacy/arm/scobc_module1/scobc_module1.yaml rename to boards/space_cubics/scobc_module1/scobc_module1.yaml diff --git a/boards/boards_legacy/arm/scobc_module1/scobc_module1_defconfig b/boards/space_cubics/scobc_module1/scobc_module1_defconfig similarity index 69% rename from boards/boards_legacy/arm/scobc_module1/scobc_module1_defconfig rename to boards/space_cubics/scobc_module1/scobc_module1_defconfig index ecadcfc07bd..f06a7a1dee8 100644 --- a/boards/boards_legacy/arm/scobc_module1/scobc_module1_defconfig +++ b/boards/space_cubics/scobc_module1/scobc_module1_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_ARM_DESIGNSTART=y -CONFIG_SOC_ARM_DESIGNSTART_FPGA_CORTEX_M3=y -CONFIG_BOARD_SCOBC_MODULE1=y CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=48000000 CONFIG_ARM_MPU=n diff --git a/boards/boards_legacy/arm/scobc_module1/support/akizuki-m-02990.cfg b/boards/space_cubics/scobc_module1/support/akizuki-m-02990.cfg similarity index 100% rename from boards/boards_legacy/arm/scobc_module1/support/akizuki-m-02990.cfg rename to boards/space_cubics/scobc_module1/support/akizuki-m-02990.cfg diff --git a/boards/boards_legacy/arm/scobc_module1/support/openocd-ft232r.cfg b/boards/space_cubics/scobc_module1/support/openocd-ft232r.cfg similarity index 100% rename from boards/boards_legacy/arm/scobc_module1/support/openocd-ft232r.cfg rename to boards/space_cubics/scobc_module1/support/openocd-ft232r.cfg diff --git a/boards/boards_legacy/arm/scobc_module1/support/openocd-ftdi.cfg b/boards/space_cubics/scobc_module1/support/openocd-ftdi.cfg similarity index 100% rename from boards/boards_legacy/arm/scobc_module1/support/openocd-ftdi.cfg rename to boards/space_cubics/scobc_module1/support/openocd-ftdi.cfg diff --git a/boards/boards_legacy/arm/scobc_module1/support/openocd.cfg b/boards/space_cubics/scobc_module1/support/openocd.cfg similarity index 100% rename from boards/boards_legacy/arm/scobc_module1/support/openocd.cfg rename to boards/space_cubics/scobc_module1/support/openocd.cfg diff --git a/boards/boards_legacy/arm/scobc_module1/support/scobc-module1.cfg b/boards/space_cubics/scobc_module1/support/scobc-module1.cfg similarity index 100% rename from boards/boards_legacy/arm/scobc_module1/support/scobc-module1.cfg rename to boards/space_cubics/scobc_module1/support/scobc-module1.cfg