[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-1744-g20620c907

[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  20620c907ba1da4dec91d2247550ab9a7beb9a1b (commit)
       via  7a95bf8cca3390a737ee5077fa903a17d9c1e6c1 (commit)
      from  b20f0fb10b4352618c7de707390a3346d93aad2e (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 20620c907ba1da4dec91d2247550ab9a7beb9a1b
Author: Marc Schink <de...@za...>
Date:   Mon Sep 28 22:54:18 2026 +0200

    tcl/cpld: Move Lattice config files into vendor folder
    
    Move the configuration files into a dedicated vendor folder as required
    by the developer guidelines.
    
    Change-Id: I7fa6e6bc4ca70e5272b3fbe3beca4106fd975d17
    Signed-off-by: Marc Schink <de...@za...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/10068
    Reviewed-by: Antonio Borneo <bor...@gm...>
    Tested-by: jenkins

diff --git a/src/helper/startup.tcl b/src/helper/startup.tcl
index 25ba56f06..4d16c4c88 100644
--- a/src/helper/startup.tcl
+++ b/src/helper/startup.tcl
@@ -47,7 +47,7 @@ proc find {filename} {
 		return $t
 	}
 
-	foreach vendor {altera gigadevice nordic sifive st ti} {
+	foreach vendor {altera gigadevice lattice nordic sifive st ti} {
 		# - path/to/a/certain/config_file
 		# replaced either with
 		# - path/to/a/certain/${vendor}/config_file
diff --git a/tcl/cpld/lattice-lc4032ze.cfg b/tcl/cpld/lattice/lc4032ze.cfg
similarity index 100%
rename from tcl/cpld/lattice-lc4032ze.cfg
rename to tcl/cpld/lattice/lc4032ze.cfg

commit 7a95bf8cca3390a737ee5077fa903a17d9c1e6c1
Author: Marc Schink <de...@za...>
Date:   Mon Sep 28 22:54:14 2026 +0200

    tcl/cpld: Move Altera config files into vendor folder
    
    Move the configuration files into a dedicated vendor folder as required
    by the developer guidelines.
    
    Change-Id: Ibf6c7221310b7d9e676b13816d00655c091e3d16
    Signed-off-by: Marc Schink <de...@za...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/10067
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/tcl/cpld/altera-5m570z-cpld.cfg b/tcl/cpld/altera-5m570z-cpld.cfg
index 4504a8064..a1e7cbb08 100644
--- a/tcl/cpld/altera-5m570z-cpld.cfg
+++ b/tcl/cpld/altera-5m570z-cpld.cfg
@@ -1,9 +1,9 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 # file altera-5m570z-cpld.cfg replaced by altera-maxv.cfg
-echo "DEPRECATED: use altera-maxv.cfg instead of deprecated altera-5m570z-cpld.cfg"
+echo "DEPRECATED: use cpld/altera/max-v.cfg instead of deprecated altera-5m570z-cpld.cfg"
 
 #just to be backward compatible:
 #tap will be 5m570z.tap instead of maxv.tap:
 set CHIPNAME 5m570z
-source [find cpld/altera-maxv.cfg]
+source [find cpld/altera/max-v.cfg]
diff --git a/tcl/cpld/altera-epm240.cfg b/tcl/cpld/altera-epm240.cfg
index 185925a16..d645dfbd8 100644
--- a/tcl/cpld/altera-epm240.cfg
+++ b/tcl/cpld/altera-epm240.cfg
@@ -1,12 +1,12 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 # file altera-epm240.cfg replaced by altera-maxii.cfg
-echo "DEPRECATED: use altera-maxii.cfg instead of deprecated altera-epm240.cfg"
+echo "DEPRECATED: use cpld/altera/max-ii.cfg instead of deprecated altera-epm240.cfg"
 
 #just to be backward compatible:
 #tap will be epm240.tap instead of maxii.tap:
 set CHIPNAME epm240
-source [find cpld/altera-maxii.cfg]
+source [find cpld/altera/max-ii.cfg]
 
 # 200ns seems like a good speed
 # c.f. Table 5-34: MAX II JTAG Timing Parameters
diff --git a/tcl/cpld/altera-maxii.cfg b/tcl/cpld/altera/max-ii.cfg
similarity index 100%
rename from tcl/cpld/altera-maxii.cfg
rename to tcl/cpld/altera/max-ii.cfg
diff --git a/tcl/cpld/altera-maxv.cfg b/tcl/cpld/altera/max-v.cfg
similarity index 100%
rename from tcl/cpld/altera-maxv.cfg
rename to tcl/cpld/altera/max-v.cfg
diff --git a/tcl/file_renaming.cfg b/tcl/file_renaming.cfg
index bb8d881c7..ca0be0330 100644
--- a/tcl/file_renaming.cfg
+++ b/tcl/file_renaming.cfg
@@ -45,6 +45,8 @@ set _file_renaming {
 	board/ti_beaglebone-base.cfg	board/beagle/beaglebone-base.cfg
 	board/ti_beaglebone_black.cfg	board/beagle/beaglebone-black.cfg
 	board/ti_beaglebone.cfg			board/beagle/beaglebone.cfg
+	cpld/altera-maxii.cfg			cpld/altera/max-ii.cfg
+	cpld/altera-maxv.cfg			cpld/altera/max-v.cfg
 	cpld/altera-max10.cfg			fpga/altera/max-10.cfg
 	cpld/xilinx-xc3s.cfg			fpga/xlnx/xc3s.cfg
 	cpld/xilinx-xc4v.cfg			fpga/xlnx/xc4v.cfg

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

Summary of changes:
 src/helper/startup.tcl                                  | 2 +-
 tcl/cpld/altera-5m570z-cpld.cfg                         | 4 ++--
 tcl/cpld/altera-epm240.cfg                              | 4 ++--
 tcl/cpld/{altera-maxii.cfg => altera/max-ii.cfg}        | 0
 tcl/cpld/{altera-maxv.cfg => altera/max-v.cfg}          | 0
 tcl/cpld/{lattice-lc4032ze.cfg => lattice/lc4032ze.cfg} | 0
 tcl/file_renaming.cfg                                   | 2 ++
 7 files changed, 7 insertions(+), 5 deletions(-)
 rename tcl/cpld/{altera-maxii.cfg => altera/max-ii.cfg} (100%)
 rename tcl/cpld/{altera-maxv.cfg => altera/max-v.cfg} (100%)
 rename tcl/cpld/{lattice-lc4032ze.cfg => lattice/lc4032ze.cfg} (100%)


hooks/post-receive
-- 
Main OpenOCD repository