From 65b886812bc0ea4d6d31b58a5786159e1f48c323 Mon Sep 17 00:00:00 2001 From: Marc Schink Date: Thu, 14 Aug 2025 15:01:27 +0200 Subject: [PATCH] tcl/board: Move SiFive configs into vendor directory Move the configuration files into a dedicated vendor folder as required by the developer guidelines. Change-Id: I5bf048f2d8d0fccbcfe40e0a0e7b30dfbab192d1 Signed-off-by: Marc Schink Reviewed-on: https://review.openocd.org/c/openocd/+/9082 Reviewed-by: Antonio Borneo Tested-by: jenkins --- src/helper/startup.tcl | 2 +- tcl/board/{sifive-e31arty.cfg => sifive/e31-arty.cfg} | 2 +- tcl/board/{sifive-e51arty.cfg => sifive/e51-arty.cfg} | 2 +- tcl/board/{sifive-hifive1-revb.cfg => sifive/hifive1-rev-b.cfg} | 0 tcl/board/{sifive-hifive1.cfg => sifive/hifive1.cfg} | 0 tcl/file_renaming.cfg | 1 + 6 files changed, 4 insertions(+), 3 deletions(-) rename tcl/board/{sifive-e31arty.cfg => sifive/e31-arty.cfg} (94%) rename tcl/board/{sifive-e51arty.cfg => sifive/e51-arty.cfg} (94%) rename tcl/board/{sifive-hifive1-revb.cfg => sifive/hifive1-rev-b.cfg} (100%) rename tcl/board/{sifive-hifive1.cfg => sifive/hifive1.cfg} (100%) diff --git a/src/helper/startup.tcl b/src/helper/startup.tcl index e328cbe07..89ed71b90 100644 --- a/src/helper/startup.tcl +++ b/src/helper/startup.tcl @@ -39,7 +39,7 @@ proc find {filename} { return $t } - foreach vendor {nordic ti st} { + foreach vendor {nordic ti sifive st} { # - path/to/a/certain/config_file # replaced with # - path/to/a/certain/${vendor}/config_file diff --git a/tcl/board/sifive-e31arty.cfg b/tcl/board/sifive/e31-arty.cfg similarity index 94% rename from tcl/board/sifive-e31arty.cfg rename to tcl/board/sifive/e31-arty.cfg index b3e980f40..bdf79dae6 100644 --- a/tcl/board/sifive-e31arty.cfg +++ b/tcl/board/sifive/e31-arty.cfg @@ -3,7 +3,7 @@ # # Be sure you include the speed and interface before this file # Example: -# -c "adapter speed 5000" -f "interface/ftdi/olimex-arm-usb-tiny-h.cfg" -f "board/sifive-e31arty.cfg" +# -c "adapter speed 5000" -f "interface/ftdi/olimex-arm-usb-tiny-h.cfg" -f "board/sifive/e31-arty.cfg" set _CHIPNAME riscv jtag newtap $_CHIPNAME cpu -irlen 5 -expected-id 0x20000001 diff --git a/tcl/board/sifive-e51arty.cfg b/tcl/board/sifive/e51-arty.cfg similarity index 94% rename from tcl/board/sifive-e51arty.cfg rename to tcl/board/sifive/e51-arty.cfg index 3133c3902..1476d503e 100644 --- a/tcl/board/sifive-e51arty.cfg +++ b/tcl/board/sifive/e51-arty.cfg @@ -3,7 +3,7 @@ # # Be sure you include the speed and interface before this file # Example: -# -c "adapter speed 5000" -f "interface/ftdi/olimex-arm-usb-tiny-h.cfg" -f "board/sifive-e51arty.cfg" +# -c "adapter speed 5000" -f "interface/ftdi/olimex-arm-usb-tiny-h.cfg" -f "board/sifive/e51-arty.cfg" set _CHIPNAME riscv jtag newtap $_CHIPNAME cpu -irlen 5 -expected-id 0x20000001 diff --git a/tcl/board/sifive-hifive1-revb.cfg b/tcl/board/sifive/hifive1-rev-b.cfg similarity index 100% rename from tcl/board/sifive-hifive1-revb.cfg rename to tcl/board/sifive/hifive1-rev-b.cfg diff --git a/tcl/board/sifive-hifive1.cfg b/tcl/board/sifive/hifive1.cfg similarity index 100% rename from tcl/board/sifive-hifive1.cfg rename to tcl/board/sifive/hifive1.cfg diff --git a/tcl/file_renaming.cfg b/tcl/file_renaming.cfg index 20679b6ab..6f88ddd90 100644 --- a/tcl/file_renaming.cfg +++ b/tcl/file_renaming.cfg @@ -19,6 +19,7 @@ set _file_renaming { board/nordic_nrf52_dk.cfg board/nordic/nrf52-dk.cfg board/stm32mp13x_dk.cfg board/st/stm32mp135f-dk.cfg board/stm32mp15x_dk2.cfg board/st/stm32mp157f-dk2.cfg + board/sifive-hifive1-revb.cfg board/sifive/hifive1-rev-b.cfg target/nrf51.cfg target/nordic/nrf51.cfg target/nrf52.cfg target/nordic/nrf52.cfg target/nrf53.cfg target/nordic/nrf53.cfg