From f0a8d12745cfd86d663afa094782e858b305f4ca Mon Sep 17 00:00:00 2001 From: Dmitrii Golovanov Date: Tue, 13 Feb 2024 01:32:26 +0100 Subject: [PATCH] boards: arm: cyclonev_socdk: Move to HWMv2 Move and convert to HWMv2 `cyclonev_socdk` board configuration. Signed-off-by: Dmitrii Golovanov --- .../boards_legacy/arm/cyclonev_socdk/Kconfig.board | 8 -------- boards/intel/cyclonev_socdk/Kconfig.cyclonev_socdk | 7 +++++++ .../arm => intel}/cyclonev_socdk/Kconfig.defconfig | 12 +----------- .../arm => intel}/cyclonev_socdk/board.cmake | 3 --- boards/intel/cyclonev_socdk/board.yml | 4 ++++ .../arm => intel}/cyclonev_socdk/cyclonev_socdk.dts | 0 .../cyclonev_socdk/cyclonev_socdk.yaml | 0 .../cyclonev_socdk/cyclonev_socdk_defconfig | 7 +------ .../cyclonev_socdk/doc/img/cv_soc_board.jpg | Bin .../cyclonev_socdk/doc/img/cyclonev_blinky.jpg | Bin .../cyclonev_socdk/doc/img/cyclonev_westflash.jpg | Bin .../arm => intel}/cyclonev_socdk/doc/index.rst | 6 +++--- .../support/altera-usb-blaster2-cyclonev.cfg | 0 .../cyclonev_socdk/support/appli_debug_cmd.gdb | 0 .../cyclonev_socdk/support/appli_dl_cmd.gdb | 0 .../cyclonev_socdk/support/blaster_6810.hex | 0 .../cyclonev_socdk/support/download_all.gdb | 4 ++-- .../cyclonev_socdk/support/openocd.cfg | 0 .../cyclonev_socdk/support/preloader_dl_cmd.txt | 6 +++--- 19 files changed, 21 insertions(+), 36 deletions(-) delete mode 100644 boards/boards_legacy/arm/cyclonev_socdk/Kconfig.board create mode 100644 boards/intel/cyclonev_socdk/Kconfig.cyclonev_socdk rename boards/{boards_legacy/arm => intel}/cyclonev_socdk/Kconfig.defconfig (60%) rename boards/{boards_legacy/arm => intel}/cyclonev_socdk/board.cmake (87%) create mode 100644 boards/intel/cyclonev_socdk/board.yml rename boards/{boards_legacy/arm => intel}/cyclonev_socdk/cyclonev_socdk.dts (100%) rename boards/{boards_legacy/arm => intel}/cyclonev_socdk/cyclonev_socdk.yaml (100%) rename boards/{boards_legacy/arm => intel}/cyclonev_socdk/cyclonev_socdk_defconfig (61%) rename boards/{boards_legacy/arm => intel}/cyclonev_socdk/doc/img/cv_soc_board.jpg (100%) rename boards/{boards_legacy/arm => intel}/cyclonev_socdk/doc/img/cyclonev_blinky.jpg (100%) rename boards/{boards_legacy/arm => intel}/cyclonev_socdk/doc/img/cyclonev_westflash.jpg (100%) rename boards/{boards_legacy/arm => intel}/cyclonev_socdk/doc/index.rst (98%) rename boards/{boards_legacy/arm => intel}/cyclonev_socdk/support/altera-usb-blaster2-cyclonev.cfg (100%) rename boards/{boards_legacy/arm => intel}/cyclonev_socdk/support/appli_debug_cmd.gdb (100%) rename boards/{boards_legacy/arm => intel}/cyclonev_socdk/support/appli_dl_cmd.gdb (100%) rename boards/{boards_legacy/arm => intel}/cyclonev_socdk/support/blaster_6810.hex (100%) rename boards/{boards_legacy/arm => intel}/cyclonev_socdk/support/download_all.gdb (76%) rename boards/{boards_legacy/arm => intel}/cyclonev_socdk/support/openocd.cfg (100%) rename boards/{boards_legacy/arm => intel}/cyclonev_socdk/support/preloader_dl_cmd.txt (50%) diff --git a/boards/boards_legacy/arm/cyclonev_socdk/Kconfig.board b/boards/boards_legacy/arm/cyclonev_socdk/Kconfig.board deleted file mode 100644 index 9743baf1cc5..00000000000 --- a/boards/boards_legacy/arm/cyclonev_socdk/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (c) 2022 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 -# Description: -# Cyclone V SoC development kit configuration option - -config BOARD_CVSXDEVKIT - bool "Intel Cyclone V Development Kit" - depends on SOC_CYCLONE5 diff --git a/boards/intel/cyclonev_socdk/Kconfig.cyclonev_socdk b/boards/intel/cyclonev_socdk/Kconfig.cyclonev_socdk new file mode 100644 index 00000000000..967f8f12c19 --- /dev/null +++ b/boards/intel/cyclonev_socdk/Kconfig.cyclonev_socdk @@ -0,0 +1,7 @@ +# Copyright (c) 2022-2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_CYCLONEV_SOCDK + select SOC_CYCLONE5 + help + Intel Cyclone V Development Kit diff --git a/boards/boards_legacy/arm/cyclonev_socdk/Kconfig.defconfig b/boards/intel/cyclonev_socdk/Kconfig.defconfig similarity index 60% rename from boards/boards_legacy/arm/cyclonev_socdk/Kconfig.defconfig rename to boards/intel/cyclonev_socdk/Kconfig.defconfig index 240a8575380..8afe506078b 100644 --- a/boards/boards_legacy/arm/cyclonev_socdk/Kconfig.defconfig +++ b/boards/intel/cyclonev_socdk/Kconfig.defconfig @@ -1,13 +1,5 @@ -# Copyright (c) 2022 Intel Corporation +# Copyright (c) 2022-2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -# Description: -# Adding support for Cyclone V SoC DevKit - -if BOARD_CVSXDEVKIT - -config BOARD - default "cyclonev_socdk" -depends on BOARD_CVSXDEVKIT if I2C_DW config I2C_DW_CLOCK_SPEED @@ -29,5 +21,3 @@ config TEST_RANDOM_GENERATOR default y endif # NETWORKING - -endif # BOARD_CVSXDEVKIT diff --git a/boards/boards_legacy/arm/cyclonev_socdk/board.cmake b/boards/intel/cyclonev_socdk/board.cmake similarity index 87% rename from boards/boards_legacy/arm/cyclonev_socdk/board.cmake rename to boards/intel/cyclonev_socdk/board.cmake index fe4c06d5484..adc44a8125a 100644 --- a/boards/boards_legacy/arm/cyclonev_socdk/board.cmake +++ b/boards/intel/cyclonev_socdk/board.cmake @@ -1,7 +1,5 @@ # Copyright (c) 2022 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -# Description: -# Cmake file for the OpenOCD runner for Cyclone V SoC DevKit board_set_flasher_ifnset(intel_cyclonev) board_set_debugger_ifnset(intel_cyclonev) @@ -19,4 +17,3 @@ board_finalize_runner_args(intel_cyclonev --cmd-load "${OPENOCD_CMD_LOAD_DEFAULT}" --cmd-verify "${OPENOCD_CMD_VERIFY_DEFAULT}" ) - diff --git a/boards/intel/cyclonev_socdk/board.yml b/boards/intel/cyclonev_socdk/board.yml new file mode 100644 index 00000000000..f2cd07c58fd --- /dev/null +++ b/boards/intel/cyclonev_socdk/board.yml @@ -0,0 +1,4 @@ +board: + name: cyclonev_socdk + socs: + - name: intel_socfpga_std_cyclonev diff --git a/boards/boards_legacy/arm/cyclonev_socdk/cyclonev_socdk.dts b/boards/intel/cyclonev_socdk/cyclonev_socdk.dts similarity index 100% rename from boards/boards_legacy/arm/cyclonev_socdk/cyclonev_socdk.dts rename to boards/intel/cyclonev_socdk/cyclonev_socdk.dts diff --git a/boards/boards_legacy/arm/cyclonev_socdk/cyclonev_socdk.yaml b/boards/intel/cyclonev_socdk/cyclonev_socdk.yaml similarity index 100% rename from boards/boards_legacy/arm/cyclonev_socdk/cyclonev_socdk.yaml rename to boards/intel/cyclonev_socdk/cyclonev_socdk.yaml diff --git a/boards/boards_legacy/arm/cyclonev_socdk/cyclonev_socdk_defconfig b/boards/intel/cyclonev_socdk/cyclonev_socdk_defconfig similarity index 61% rename from boards/boards_legacy/arm/cyclonev_socdk/cyclonev_socdk_defconfig rename to boards/intel/cyclonev_socdk/cyclonev_socdk_defconfig index 110a703d4a1..32f784e44c8 100644 --- a/boards/boards_legacy/arm/cyclonev_socdk/cyclonev_socdk_defconfig +++ b/boards/intel/cyclonev_socdk/cyclonev_socdk_defconfig @@ -1,11 +1,6 @@ -# Copyright (c) 2022 Intel Corporation +# Copyright (c) 2022-2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -# Description: -# Cyclone V SoC Development Kit Board configuration file -CONFIG_SOC_SERIES_CYCLONE5=y -CONFIG_SOC_CYCLONE5=y -CONFIG_BOARD_CVSXDEVKIT=y CONFIG_ARM_ARCH_TIMER=y CONFIG_SYSCON=y diff --git a/boards/boards_legacy/arm/cyclonev_socdk/doc/img/cv_soc_board.jpg b/boards/intel/cyclonev_socdk/doc/img/cv_soc_board.jpg similarity index 100% rename from boards/boards_legacy/arm/cyclonev_socdk/doc/img/cv_soc_board.jpg rename to boards/intel/cyclonev_socdk/doc/img/cv_soc_board.jpg diff --git a/boards/boards_legacy/arm/cyclonev_socdk/doc/img/cyclonev_blinky.jpg b/boards/intel/cyclonev_socdk/doc/img/cyclonev_blinky.jpg similarity index 100% rename from boards/boards_legacy/arm/cyclonev_socdk/doc/img/cyclonev_blinky.jpg rename to boards/intel/cyclonev_socdk/doc/img/cyclonev_blinky.jpg diff --git a/boards/boards_legacy/arm/cyclonev_socdk/doc/img/cyclonev_westflash.jpg b/boards/intel/cyclonev_socdk/doc/img/cyclonev_westflash.jpg similarity index 100% rename from boards/boards_legacy/arm/cyclonev_socdk/doc/img/cyclonev_westflash.jpg rename to boards/intel/cyclonev_socdk/doc/img/cyclonev_westflash.jpg diff --git a/boards/boards_legacy/arm/cyclonev_socdk/doc/index.rst b/boards/intel/cyclonev_socdk/doc/index.rst similarity index 98% rename from boards/boards_legacy/arm/cyclonev_socdk/doc/index.rst rename to boards/intel/cyclonev_socdk/doc/index.rst index 1f51e20650c..a3ea292ad93 100644 --- a/boards/boards_legacy/arm/cyclonev_socdk/doc/index.rst +++ b/boards/intel/cyclonev_socdk/doc/index.rst @@ -169,7 +169,7 @@ application. ``Important!!!`` : Before flashing the board a ``preloader`` is required, you can download `cv_soc_devkit_ghrd.tar.gz `_, extract the file and copy ``cv_soc_devkit_ghrd/software/preloader/uboot-socfpga/spl/u-boot-spl`` -to ``boards/arm/cyclonev_socdk/support/`` +to ``boards/intel/cyclonev_socdk/support/`` .. zephyr-app-commands:: :zephyr-app: samples/hello_world @@ -184,7 +184,7 @@ using the customized OpenOCD runner script :zephyr_file:`scripts/west_commands/r After it completes the kernel will immediately boot using the GSRD preloader. Notice that there a lot of helper files to ``flash`` the application with OpenOCD and GDB Debbuger (Zephyr SDK must be installed in your machine). -This files should be located in :zephyr_file:`boards/arm/cyclonev_socdk/support/` including: +This files should be located in :zephyr_file:`boards/intel/cyclonev_socdk/support/` including: * blaster_6810.hex : USB-BlasterII firmware * tmp_preloader_dl_cmd.txt : GDB helper file to load the preloader @@ -294,7 +294,7 @@ You will see output similar to the following: warning: No executable has been specified and target does not support determining executable automatically. Try using the "file" command. 0xffff147c in ?? () - warning: /home/demo/zephyrproject/zephyr/boards/arm/cvsxdevkit/support/tmp_appli_debug_cmd.gdb: No such file or directory + warning: /home/demo/zephyrproject/zephyr/boards/intel/cyclonev_socdk/support/tmp_appli_debug_cmd.gdb: No such file or directory [Inferior 1 (Remote target) detached] Info : dropped 'gdb' connection shutdown command invoked diff --git a/boards/boards_legacy/arm/cyclonev_socdk/support/altera-usb-blaster2-cyclonev.cfg b/boards/intel/cyclonev_socdk/support/altera-usb-blaster2-cyclonev.cfg similarity index 100% rename from boards/boards_legacy/arm/cyclonev_socdk/support/altera-usb-blaster2-cyclonev.cfg rename to boards/intel/cyclonev_socdk/support/altera-usb-blaster2-cyclonev.cfg diff --git a/boards/boards_legacy/arm/cyclonev_socdk/support/appli_debug_cmd.gdb b/boards/intel/cyclonev_socdk/support/appli_debug_cmd.gdb similarity index 100% rename from boards/boards_legacy/arm/cyclonev_socdk/support/appli_debug_cmd.gdb rename to boards/intel/cyclonev_socdk/support/appli_debug_cmd.gdb diff --git a/boards/boards_legacy/arm/cyclonev_socdk/support/appli_dl_cmd.gdb b/boards/intel/cyclonev_socdk/support/appli_dl_cmd.gdb similarity index 100% rename from boards/boards_legacy/arm/cyclonev_socdk/support/appli_dl_cmd.gdb rename to boards/intel/cyclonev_socdk/support/appli_dl_cmd.gdb diff --git a/boards/boards_legacy/arm/cyclonev_socdk/support/blaster_6810.hex b/boards/intel/cyclonev_socdk/support/blaster_6810.hex similarity index 100% rename from boards/boards_legacy/arm/cyclonev_socdk/support/blaster_6810.hex rename to boards/intel/cyclonev_socdk/support/blaster_6810.hex diff --git a/boards/boards_legacy/arm/cyclonev_socdk/support/download_all.gdb b/boards/intel/cyclonev_socdk/support/download_all.gdb similarity index 76% rename from boards/boards_legacy/arm/cyclonev_socdk/support/download_all.gdb rename to boards/intel/cyclonev_socdk/support/download_all.gdb index a1c7a9a4760..8e7f3a3d0cc 100644 --- a/boards/boards_legacy/arm/cyclonev_socdk/support/download_all.gdb +++ b/boards/intel/cyclonev_socdk/support/download_all.gdb @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Intel Corporation +# Copyright (c) 2022-2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 # Description: # Download preloader and .elf using GDB commands @@ -7,7 +7,7 @@ set confirm off set pagination off #Download and Run preloader -source boards/arm/cyclonev_socdk/support/preloader_dl_cmd.txt +source boards/intel/cyclonev_socdk/support/preloader_dl_cmd.txt #Stop watchdog timer #permodrst Reg , reset watch dog timer diff --git a/boards/boards_legacy/arm/cyclonev_socdk/support/openocd.cfg b/boards/intel/cyclonev_socdk/support/openocd.cfg similarity index 100% rename from boards/boards_legacy/arm/cyclonev_socdk/support/openocd.cfg rename to boards/intel/cyclonev_socdk/support/openocd.cfg diff --git a/boards/boards_legacy/arm/cyclonev_socdk/support/preloader_dl_cmd.txt b/boards/intel/cyclonev_socdk/support/preloader_dl_cmd.txt similarity index 50% rename from boards/boards_legacy/arm/cyclonev_socdk/support/preloader_dl_cmd.txt rename to boards/intel/cyclonev_socdk/support/preloader_dl_cmd.txt index 3a10f686902..9f6007a2ac7 100644 --- a/boards/boards_legacy/arm/cyclonev_socdk/support/preloader_dl_cmd.txt +++ b/boards/intel/cyclonev_socdk/support/preloader_dl_cmd.txt @@ -1,9 +1,9 @@ -# Copyright (c) 2022 Intel Corporation +# Copyright (c) 2022-2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 # Description: # Helper file to download the GSRD preloader to the board before the application -restore boards/arm/cyclonev_socdk/support/u-boot-spl -symbol-file -readnow boards/arm/cyclonev_socdk/support/u-boot-spl +restore boards/intel/cyclonev_socdk/support/u-boot-spl +symbol-file -readnow boards/intel/cyclonev_socdk/support/u-boot-spl thbreak spl_boot_device jump _start