[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-1018-g152becc46

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  152becc4607e97aa692e41cb281753121d9ee75d (commit)
      from  b06212b5a2fc5b9bff72327bc7d5a7ec1c7ef613 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 152becc4607e97aa692e41cb281753121d9ee75d
Author: Marc Schink <de...@za...>
Date:   Mon May 12 06:47:22 2025 +0200

    tcl/target: Move nordic configuration files
    
    Move target configuration files into a dedicated vendor directory as
    required by the new guideline for configuration files.
    
    Note that the moved files are still accessible via the old path to ensure
    backwards compatibility. This works because of the extended file search in
    vendor folders.
    
    Change-Id: If3935985769dc543e8c7d72cda590c9d79303abb
    Signed-off-by: Marc Schink <de...@za...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/8905
    Reviewed-by: Antonio Borneo <bor...@gm...>
    Tested-by: jenkins

diff --git a/tcl/target/nrf_common.cfg b/tcl/target/nordic/common.cfg
similarity index 100%
rename from tcl/target/nrf_common.cfg
rename to tcl/target/nordic/common.cfg
diff --git a/tcl/target/nrf51.cfg b/tcl/target/nordic/nrf51.cfg
similarity index 100%
rename from tcl/target/nrf51.cfg
rename to tcl/target/nordic/nrf51.cfg
diff --git a/tcl/target/nrf52.cfg b/tcl/target/nordic/nrf52.cfg
similarity index 100%
rename from tcl/target/nrf52.cfg
rename to tcl/target/nordic/nrf52.cfg
diff --git a/tcl/target/nrf53.cfg b/tcl/target/nordic/nrf53.cfg
similarity index 99%
rename from tcl/target/nrf53.cfg
rename to tcl/target/nordic/nrf53.cfg
index 307df902c..0dcfd55ec 100644
--- a/tcl/target/nrf53.cfg
+++ b/tcl/target/nordic/nrf53.cfg
@@ -60,7 +60,7 @@ if { ![using_hla] } {
 # Keep adapter speed less or equal 2000 kHz or flash programming fails!
 adapter speed 1000
 
-source [find target/nrf_common.cfg]
+source [find target/nordic/common.cfg]
 
 flash bank $_CHIPNAME.app.flash nrf5 0x00000000 0 0 0 $_TARGETNAME_APP
 flash bank $_CHIPNAME.app.uicr nrf5 0x00FF8000 0 0 0 $_TARGETNAME_APP
diff --git a/tcl/target/nrf91.cfg b/tcl/target/nordic/nrf91.cfg
similarity index 97%
rename from tcl/target/nrf91.cfg
rename to tcl/target/nordic/nrf91.cfg
index e0ff4e546..64ed864e7 100644
--- a/tcl/target/nrf91.cfg
+++ b/tcl/target/nordic/nrf91.cfg
@@ -45,7 +45,7 @@ adapter speed 1000
 
 $_TARGETNAME configure -work-area-phys 0x20000000 -work-area-size $_WORKAREASIZE -work-area-backup 0
 
-source [find target/nrf_common.cfg]
+source [find target/nordic/common.cfg]
 
 flash bank $_CHIPNAME.flash nrf5 0x00000000 0 0 0 $_TARGETNAME
 flash bank $_CHIPNAME.uicr nrf5 0x00FF8000 0 0 0 $_TARGETNAME

-----------------------------------------------------------------------

Summary of changes:
 tcl/target/{nrf_common.cfg => nordic/common.cfg} | 0
 tcl/target/{ => nordic}/nrf51.cfg                | 0
 tcl/target/{ => nordic}/nrf52.cfg                | 0
 tcl/target/{ => nordic}/nrf53.cfg                | 2 +-
 tcl/target/{ => nordic}/nrf91.cfg                | 2 +-
 5 files changed, 2 insertions(+), 2 deletions(-)
 rename tcl/target/{nrf_common.cfg => nordic/common.cfg} (100%)
 rename tcl/target/{ => nordic}/nrf51.cfg (100%)
 rename tcl/target/{ => nordic}/nrf52.cfg (100%)
 rename tcl/target/{ => nordic}/nrf53.cfg (99%)
 rename tcl/target/{ => nordic}/nrf91.cfg (97%)


hooks/post-receive
-- 
Main OpenOCD repository