5 files changed, 138 insertions, 39 deletions

diff --git a/devel/openocd/Makefile b/devel/openocd/Makefile
index f278e8d910d6..1f40c021a5a4 100644
--- a/devel/openocd/Makefile
+++ b/devel/openocd/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	openocd
-PORTVERSION=	0.4.0
-PORTREVISION=	2
+PORTVERSION=	0.5.0
 CATEGORIES=	devel
-MASTER_SITES=	BERLIOS \
-		SF
+MASTER_SITES=	SF
 
 MAINTAINER=	tomek.cedro@gmail.com
 COMMENT=	Open On-Chip Debugger
@@ -36,6 +34,7 @@ OPTIONS=	VERBOSE "Enable verbose JTAG I/O messages" off \
 MAN1=		${PORTNAME}.1
 INFO=		${PORTNAME}
 USE_GMAKE=	yes
+MAKE_JOBS_SAFE=	yes
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 
 #Below are the interfaces that need source rewitre to work with FreeBSD
@@ -105,7 +104,7 @@ CONFIGURE_ARGS+=	--disable-parport
 
 .if defined(WITH_FT2232)
 CONFIGURE_ARGS+=	--enable-ft2232_libftdi
-USE_LIBFTDI=		yes
+WITH_LIBFTDI=		yes
 .else
 CONFIGURE_ARGS+=	--disable-ft2232_libftdi
 .endif
@@ -162,14 +161,14 @@ CONFIGURE_ARGS+=	--disable-gw16012
 
 .if defined(WITH_PRESTO)
 CONFIGURE_ARGS+=	--enable-presto_libftdi
-USE_LIBFTDI=		yes
+WITH_LIBFTDI=		yes
 .else
 CONFIGURE_ARGS+=	--disable-presto_libftdi
 .endif
 
 .if defined(WITH_USBPROG)
 CONFIGURE_ARGS+=	--enable-usbprog
-USE_LIBUSB=		yes
+WITH_LIBUSB=		yes
 .else
 CONFIGURE_ARGS+=	--disable-usbprog
 .endif
@@ -182,28 +181,28 @@ CONFIGURE_ARGS+=	--disable-oocd_trace
 
 .if defined(WITH_JLINK)
 CONFIGURE_ARGS+=	--enable-jlink
-USE_LIBUSB=		yes
+WITH_LIBUSB=		yes
 .else
 CONFIGURE_ARGS+=	--disable-jlink
 .endif
 
 .if defined(WITH_VSLLINK)
 CONFIGURE_ARGS+=	--enable-vsllink
-USE_LIBUSB=		yes
+WITH_LIBUSB=		yes
 .else
 CONFIGURE_ARGS+=	--disable-vsllink
 .endif
 
 .if defined(WITH_RLINK)
 CONFIGURE_ARGS+=	--enable-rlink
-USE_LIBUSB=		yes
+WITH_LIBUSB=		yes
 .else
 CONFIGURE_ARGS+=	--disable-rlink
 .endif
 
 .if defined(WITH_ARMJTAGEW)
 CONFIGURE_ARGS+=	--enable-arm-jtag-ew
-USE_LIBUSB=		yes
+WITH_LIBUSB=		yes
 .else
 CONFIGURE_ARGS+=	--disable-arm-jtag-ew
 .endif
@@ -216,11 +215,11 @@ CONFIGURE_ARGS+=	--disable-minidriver-dummy
 
 .include <bsd.port.pre.mk>
 
-.if defined(USE_LIBUSB) && ${OSVERSION} < 800069
+.if defined(WITH_LIBUSB) && ${OSVERSION} < 800069
 LIB_DEPENDS+=		usb:${PORTSDIR}/devel/libusb
 .endif
 
-.if defined(USE_LIBFTDI)
+.if defined(WITH_LIBFTDI)
 LIB_DEPENDS+=		ftdi:${PORTSDIR}/devel/libftdi
 .endif
 
diff --git a/devel/openocd/distinfo b/devel/openocd/distinfo
index 8df0ba341f84..08ccc06bcf62 100644
--- a/devel/openocd/distinfo
+++ b/devel/openocd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (openocd-0.4.0.tar.gz) = fc4b8b55c25920c0024e6e621c4127e92acbe9f6bafaf72b90fd60a5536e9194
-SIZE (openocd-0.4.0.tar.gz) = 1705028
+SHA256 (openocd-0.5.0.tar.gz) = efb99e0394249cbd518b51b052eea150d5f14557e9a2e0ddfae198792dca51c6
+SIZE (openocd-0.5.0.tar.gz) = 2813319
diff --git a/devel/openocd/pkg-descr b/devel/openocd/pkg-descr
index a74fa9131bdc..9b3cf883647c 100644
--- a/devel/openocd/pkg-descr
+++ b/devel/openocd/pkg-descr
@@ -12,4 +12,4 @@ NOR flashes (Intel and AMD/Spansion command set) and several internal flashes
 various NAND flash controllers (LPC3180, Orion, S3C24xx, more) controller is
 included. 
 
-WWW: http://openocd.berlios.de/
+WWW: http://openocd.sf.net/
diff --git a/devel/openocd/pkg-message b/devel/openocd/pkg-message
index 095a41a41f04..203260556c19 100644
--- a/devel/openocd/pkg-message
+++ b/devel/openocd/pkg-message
@@ -1,23 +1,28 @@
 ===============================================================================
 
-OpenOCD is now installed, enjoy!
-Handbook is at: http://openocd.berlios.de/doc/html/
+OpenOCD is now installed, this software can damage your hardware, enjoy!
 
-NOTE: To allow an ordinary user to acces any of the the hotplug USB interface
-add him/her to the operator group  (pw groupmod operator -m username), then
-setup the devfs subsystem by adding these lines to the following files:
+User's guide is at:
+ http://openocd.sourceforge.net/documentation/online-docs/
+Developer's guide is at:
+ http://openocd.sourceforge.net/documentation/openocd-reference-manual/
 
-***/etc/devfs.rules (FreeBSD 8.x):
-[localrules=10]
+FreeBSD USB NOTE:
+ To allow an ordinary user to acces any of the the hotplug USB interface
+ add him/her to the operator group  (pw groupmod operator -m username), then
+ setup the devfs subsystem by adding these lines to the following files:
+
+ ***/etc/devfs.rules (FreeBSD 8.x):
+ [localrules=10]
         add path 'ugen*' mode 0660 group operator
         add path 'usb/*'  mode 0660 group operator
         add path 'usb' mode 0770 group operator
 
-***/etc/devfs.rules (FreeBSD 7.x):
-[localrules=10]
+ ***/etc/devfs.rules (FreeBSD 7.x):
+ [localrules=10]
 	add path 'ugen*' mode 0660 group operator
 
-***/etc/rc.conf:
+ ***/etc/rc.conf:
 	devfs_system_ruleset="localrules"
 
 ===============================================================================
diff --git a/devel/openocd/pkg-plist b/devel/openocd/pkg-plist
index c1758857c968..cc7aeb8aab0c 100644
--- a/devel/openocd/pkg-plist
+++ b/devel/openocd/pkg-plist
@@ -8,32 +8,51 @@ share/openocd/contrib/libdcc/dcc_stdio.h
 share/openocd/contrib/libdcc/example.c
 share/openocd/contrib/openocd.udev
 share/openocd/scripts/bitsbytes.tcl
+share/openocd/scripts/board/actux3.cfg
+share/openocd/scripts/board/am3517evm.cfg
 share/openocd/scripts/board/arm_evaluator7t.cfg
+share/openocd/scripts/board/at91cap7a-stk-sdram.cfg
 share/openocd/scripts/board/at91eb40a.cfg
 share/openocd/scripts/board/at91rm9200-dk.cfg
+share/openocd/scripts/board/at91rm9200-ek.cfg
+share/openocd/scripts/board/at91sam9261-ek.cfg
+share/openocd/scripts/board/at91sam9263-ek.cfg
 share/openocd/scripts/board/at91sam9g20-ek.cfg
 share/openocd/scripts/board/atmel_at91sam7s-ek.cfg
 share/openocd/scripts/board/atmel_at91sam9260-ek.cfg
 share/openocd/scripts/board/atmel_at91sam9rl-ek.cfg
+share/openocd/scripts/board/atmel_sam3s_ek.cfg
 share/openocd/scripts/board/atmel_sam3u_ek.cfg
 share/openocd/scripts/board/balloon3-cpu.cfg
+share/openocd/scripts/board/colibri.cfg
 share/openocd/scripts/board/crossbow_tech_imote2.cfg
 share/openocd/scripts/board/csb337.cfg
 share/openocd/scripts/board/csb732.cfg
+share/openocd/scripts/board/da850evm.cfg
 share/openocd/scripts/board/digi_connectcore_wi-9c.cfg
 share/openocd/scripts/board/dm355evm.cfg
 share/openocd/scripts/board/dm365evm.cfg
 share/openocd/scripts/board/dm6446evm.cfg
+share/openocd/scripts/board/efikamx.cfg
 share/openocd/scripts/board/eir.cfg
 share/openocd/scripts/board/ek-lm3s1968.cfg
 share/openocd/scripts/board/ek-lm3s3748.cfg
+share/openocd/scripts/board/ek-lm3s6965.cfg
 share/openocd/scripts/board/ek-lm3s811.cfg
 share/openocd/scripts/board/ek-lm3s9b9x.cfg
+share/openocd/scripts/board/embedded-artists_lpc2478-32.cfg
 share/openocd/scripts/board/ethernut3.cfg
 share/openocd/scripts/board/hammer.cfg
+share/openocd/scripts/board/hilscher_nxdb500sys.cfg
+share/openocd/scripts/board/hilscher_nxeb500hmi.cfg
+share/openocd/scripts/board/hilscher_nxhx10.cfg
+share/openocd/scripts/board/hilscher_nxhx50.cfg
+share/openocd/scripts/board/hilscher_nxhx500.cfg
+share/openocd/scripts/board/hilscher_nxsb100.cfg
 share/openocd/scripts/board/hitex_lpc2929.cfg
 share/openocd/scripts/board/hitex_stm32-performancestick.cfg
 share/openocd/scripts/board/hitex_str9-comstick.cfg
+share/openocd/scripts/board/iar_lpc1768.cfg
 share/openocd/scripts/board/iar_str912_sk.cfg
 share/openocd/scripts/board/imx27ads.cfg
 share/openocd/scripts/board/imx27lnst.cfg
@@ -42,14 +61,19 @@ share/openocd/scripts/board/imx35pdk.cfg
 share/openocd/scripts/board/keil_mcb1700.cfg
 share/openocd/scripts/board/keil_mcb2140.cfg
 share/openocd/scripts/board/linksys_nslu2.cfg
+share/openocd/scripts/board/lisa-l.cfg
 share/openocd/scripts/board/logicpd_imx27.cfg
 share/openocd/scripts/board/lubbock.cfg
+share/openocd/scripts/board/mcb1700.cfg
+share/openocd/scripts/board/microchip_explorer16.cfg
 share/openocd/scripts/board/mini2440.cfg
+share/openocd/scripts/board/mini6410.cfg
 share/openocd/scripts/board/olimex_LPC2378STK.cfg
 share/openocd/scripts/board/olimex_lpc_h2148.cfg
 share/openocd/scripts/board/olimex_sam7_ex256.cfg
 share/openocd/scripts/board/olimex_sam9_l9260.cfg
 share/openocd/scripts/board/olimex_stm32_h103.cfg
+share/openocd/scripts/board/olimex_stm32_h107.cfg
 share/openocd/scripts/board/omap2420_h4.cfg
 share/openocd/scripts/board/open-bldc.cfg
 share/openocd/scripts/board/openrd.cfg
@@ -58,23 +82,54 @@ share/openocd/scripts/board/phytec_lpc3250.cfg
 share/openocd/scripts/board/pic-p32mx.cfg
 share/openocd/scripts/board/propox_mmnet1001.cfg
 share/openocd/scripts/board/pxa255_sst.cfg
+share/openocd/scripts/board/redbee-econotag.cfg
+share/openocd/scripts/board/redbee-usb.cfg
+share/openocd/scripts/board/rsc-w910.cfg
 share/openocd/scripts/board/sheevaplug.cfg
+share/openocd/scripts/board/smdk6410.cfg
+share/openocd/scripts/board/spear310evb20.cfg
+share/openocd/scripts/board/spear310evb20_mod.cfg
+share/openocd/scripts/board/stm32100b_eval.cfg
+share/openocd/scripts/board/stm3210b_eval.cfg
+share/openocd/scripts/board/stm3210c_eval.cfg
 share/openocd/scripts/board/stm3210e_eval.cfg
-share/openocd/scripts/board/stm32f10x_128k_eval.cfg
+share/openocd/scripts/board/stm3220g_eval.cfg
 share/openocd/scripts/board/str910-eval.cfg
 share/openocd/scripts/board/telo.cfg
 share/openocd/scripts/board/ti_beagleboard.cfg
+share/openocd/scripts/board/ti_beagleboard_xm.cfg
+share/openocd/scripts/board/ti_blaze.cfg
+share/openocd/scripts/board/ti_pandaboard.cfg
 share/openocd/scripts/board/topas910.cfg
 share/openocd/scripts/board/topasa900.cfg
 share/openocd/scripts/board/unknown_at91sam9260.cfg
+share/openocd/scripts/board/uptech_2410.cfg
+share/openocd/scripts/board/voipac.cfg
 share/openocd/scripts/board/x300t.cfg
 share/openocd/scripts/board/zy1000.cfg
 share/openocd/scripts/chip/atmel/at91/aic.tcl
+share/openocd/scripts/chip/atmel/at91/at91_pio.cfg
+share/openocd/scripts/chip/atmel/at91/at91_pmc.cfg
+share/openocd/scripts/chip/atmel/at91/at91_rstc.cfg
+share/openocd/scripts/chip/atmel/at91/at91_wdt.cfg
 share/openocd/scripts/chip/atmel/at91/at91sam7x128.tcl
 share/openocd/scripts/chip/atmel/at91/at91sam7x256.tcl
+share/openocd/scripts/chip/atmel/at91/at91sam9261.cfg
+share/openocd/scripts/chip/atmel/at91/at91sam9261_matrix.cfg
+share/openocd/scripts/chip/atmel/at91/at91sam9263.cfg
+share/openocd/scripts/chip/atmel/at91/at91sam9263_matrix.cfg
+share/openocd/scripts/chip/atmel/at91/at91sam9_init.cfg
+share/openocd/scripts/chip/atmel/at91/at91sam9_sdramc.cfg
+share/openocd/scripts/chip/atmel/at91/at91sam9_smc.cfg
+share/openocd/scripts/chip/atmel/at91/hardware.cfg
 share/openocd/scripts/chip/atmel/at91/pmc.tcl
 share/openocd/scripts/chip/atmel/at91/rtt.tcl
+share/openocd/scripts/chip/atmel/at91/sam9_smc.cfg
 share/openocd/scripts/chip/atmel/at91/usarts.tcl
+share/openocd/scripts/chip/st/spear/quirk_no_srst.tcl
+share/openocd/scripts/chip/st/spear/spear310.tcl
+share/openocd/scripts/chip/st/spear/spear3xx.tcl
+share/openocd/scripts/chip/st/spear/spear3xx_ddr.tcl
 share/openocd/scripts/chip/st/stm32/stm32.tcl
 share/openocd/scripts/chip/st/stm32/stm32_rcc.tcl
 share/openocd/scripts/chip/st/stm32/stm32_regs.tcl
@@ -89,6 +144,7 @@ share/openocd/scripts/interface/arm-jtag-ew.cfg
 share/openocd/scripts/interface/arm-usb-ocd.cfg
 share/openocd/scripts/interface/at91rm9200.cfg
 share/openocd/scripts/interface/axm0432.cfg
+share/openocd/scripts/interface/buspirate.cfg
 share/openocd/scripts/interface/calao-usb-a9260-c01.cfg
 share/openocd/scripts/interface/calao-usb-a9260-c02.cfg
 share/openocd/scripts/interface/calao-usb-a9260.cfg
@@ -96,19 +152,29 @@ share/openocd/scripts/interface/chameleon.cfg
 share/openocd/scripts/interface/cortino.cfg
 share/openocd/scripts/interface/dummy.cfg
 share/openocd/scripts/interface/flashlink.cfg
+share/openocd/scripts/interface/flossjtag-noeeprom.cfg
 share/openocd/scripts/interface/flossjtag.cfg
 share/openocd/scripts/interface/flyswatter.cfg
+share/openocd/scripts/interface/hilscher_nxhx10_etm.cfg
+share/openocd/scripts/interface/hilscher_nxhx500_etm.cfg
+share/openocd/scripts/interface/hilscher_nxhx500_re.cfg
+share/openocd/scripts/interface/hilscher_nxhx50_etm.cfg
+share/openocd/scripts/interface/hilscher_nxhx50_re.cfg
 share/openocd/scripts/interface/hitex_str9-comstick.cfg
 share/openocd/scripts/interface/icebear.cfg
 share/openocd/scripts/interface/jlink.cfg
 share/openocd/scripts/interface/jtagkey-tiny.cfg
 share/openocd/scripts/interface/jtagkey.cfg
 share/openocd/scripts/interface/jtagkey2.cfg
+share/openocd/scripts/interface/jtagkey2p.cfg
 share/openocd/scripts/interface/kt-link.cfg
+share/openocd/scripts/interface/lisa-l.cfg
 share/openocd/scripts/interface/luminary-icdi.cfg
 share/openocd/scripts/interface/luminary-lm3s811.cfg
 share/openocd/scripts/interface/luminary.cfg
+share/openocd/scripts/interface/minimodule.cfg
 share/openocd/scripts/interface/neodb.cfg
+share/openocd/scripts/interface/ngxtech.cfg
 share/openocd/scripts/interface/olimex-arm-usb-ocd-h.cfg
 share/openocd/scripts/interface/olimex-arm-usb-ocd.cfg
 share/openocd/scripts/interface/olimex-arm-usb-tiny-h.cfg
@@ -126,16 +192,23 @@ share/openocd/scripts/interface/signalyzer-lite.cfg
 share/openocd/scripts/interface/signalyzer.cfg
 share/openocd/scripts/interface/stm32-stick.cfg
 share/openocd/scripts/interface/turtelizer2.cfg
+share/openocd/scripts/interface/ulink.cfg
 share/openocd/scripts/interface/usb-jtag.cfg
 share/openocd/scripts/interface/usbprog.cfg
+share/openocd/scripts/interface/vpaclink.cfg
 share/openocd/scripts/interface/vsllink.cfg
+share/openocd/scripts/interface/xds100v2.cfg
+share/openocd/scripts/mem_helper.tcl
 share/openocd/scripts/memory.tcl
 share/openocd/scripts/mmr_helpers.tcl
-share/openocd/scripts/readable.tcl
 share/openocd/scripts/target/aduc702x.cfg
+share/openocd/scripts/target/amdm37x.cfg
 share/openocd/scripts/target/ar71xx.cfg
+share/openocd/scripts/target/at32ap7000.cfg
 share/openocd/scripts/target/at91r40008.cfg
 share/openocd/scripts/target/at91rm9200.cfg
+share/openocd/scripts/target/at91sam3XXX.cfg
+share/openocd/scripts/target/at91sam3sXX.cfg
 share/openocd/scripts/target/at91sam3u1c.cfg
 share/openocd/scripts/target/at91sam3u1e.cfg
 share/openocd/scripts/target/at91sam3u2c.cfg
@@ -143,10 +216,20 @@ share/openocd/scripts/target/at91sam3u2e.cfg
 share/openocd/scripts/target/at91sam3u4c.cfg
 share/openocd/scripts/target/at91sam3u4e.cfg
 share/openocd/scripts/target/at91sam3uXX.cfg
+share/openocd/scripts/target/at91sam7se512.cfg
 share/openocd/scripts/target/at91sam7sx.cfg
+share/openocd/scripts/target/at91sam7x256.cfg
+share/openocd/scripts/target/at91sam9.cfg
 share/openocd/scripts/target/at91sam9260.cfg
 share/openocd/scripts/target/at91sam9260_ext_RAM_ext_flash.cfg
+share/openocd/scripts/target/at91sam9261.cfg
+share/openocd/scripts/target/at91sam9263.cfg
+share/openocd/scripts/target/at91sam9g10.cfg
+share/openocd/scripts/target/at91sam9g20.cfg
+share/openocd/scripts/target/at91sam9g45.cfg
 share/openocd/scripts/target/at91sam9rl.cfg
+share/openocd/scripts/target/atmega128.cfg
+share/openocd/scripts/target/avr32.cfg
 share/openocd/scripts/target/c100.cfg
 share/openocd/scripts/target/c100config.tcl
 share/openocd/scripts/target/c100helper.tcl
@@ -155,9 +238,15 @@ share/openocd/scripts/target/cs351x.cfg
 share/openocd/scripts/target/davinci.cfg
 share/openocd/scripts/target/dragonite.cfg
 share/openocd/scripts/target/dsp56321.cfg
+share/openocd/scripts/target/dsp568013.cfg
+share/openocd/scripts/target/dsp568037.cfg
 share/openocd/scripts/target/epc9301.cfg
 share/openocd/scripts/target/faux.cfg
 share/openocd/scripts/target/feroceon.cfg
+share/openocd/scripts/target/fm3.cfg
+share/openocd/scripts/target/hilscher_netx10.cfg
+share/openocd/scripts/target/hilscher_netx50.cfg
+share/openocd/scripts/target/hilscher_netx500.cfg
 share/openocd/scripts/target/icepick.cfg
 share/openocd/scripts/target/imx.cfg
 share/openocd/scripts/target/imx21.cfg
@@ -165,12 +254,10 @@ share/openocd/scripts/target/imx25.cfg
 share/openocd/scripts/target/imx27.cfg
 share/openocd/scripts/target/imx31.cfg
 share/openocd/scripts/target/imx35.cfg
+share/openocd/scripts/target/imx51.cfg
+share/openocd/scripts/target/imx53.cfg
 share/openocd/scripts/target/is5114.cfg
 share/openocd/scripts/target/ixp42x.cfg
-share/openocd/scripts/target/lm3s1968.cfg
-share/openocd/scripts/target/lm3s6965.cfg
-share/openocd/scripts/target/lm3s811.cfg
-share/openocd/scripts/target/lm3s9b9x.cfg
 share/openocd/scripts/target/lpc1768.cfg
 share/openocd/scripts/target/lpc2103.cfg
 share/openocd/scripts/target/lpc2124.cfg
@@ -178,35 +265,42 @@ share/openocd/scripts/target/lpc2129.cfg
 share/openocd/scripts/target/lpc2148.cfg
 share/openocd/scripts/target/lpc2294.cfg
 share/openocd/scripts/target/lpc2378.cfg
+share/openocd/scripts/target/lpc2460.cfg
 share/openocd/scripts/target/lpc2478.cfg
 share/openocd/scripts/target/lpc2900.cfg
+share/openocd/scripts/target/lpc2xxx.cfg
+share/openocd/scripts/target/lpc3131.cfg
 share/openocd/scripts/target/lpc3250.cfg
-share/openocd/scripts/target/mega128.cfg
-share/openocd/scripts/target/netx500.cfg
+share/openocd/scripts/target/mc13224v.cfg
+share/openocd/scripts/target/nuc910.cfg
 share/openocd/scripts/target/omap2420.cfg
 share/openocd/scripts/target/omap3530.cfg
+share/openocd/scripts/target/omap4430.cfg
 share/openocd/scripts/target/omap5912.cfg
+share/openocd/scripts/target/omapl138.cfg
 share/openocd/scripts/target/pic32mx.cfg
 share/openocd/scripts/target/pxa255.cfg
 share/openocd/scripts/target/pxa270.cfg
 share/openocd/scripts/target/pxa3xx.cfg
-share/openocd/scripts/target/sam7se512.cfg
-share/openocd/scripts/target/sam7x256.cfg
 share/openocd/scripts/target/samsung_s3c2410.cfg
 share/openocd/scripts/target/samsung_s3c2440.cfg
 share/openocd/scripts/target/samsung_s3c2450.cfg
 share/openocd/scripts/target/samsung_s3c4510.cfg
 share/openocd/scripts/target/samsung_s3c6410.cfg
 share/openocd/scripts/target/sharp_lh79532.cfg
-share/openocd/scripts/target/smdk6410.cfg
 share/openocd/scripts/target/smp8634.cfg
+share/openocd/scripts/target/spear3xx.cfg
 share/openocd/scripts/target/stellaris.cfg
 share/openocd/scripts/target/stm32.cfg
+share/openocd/scripts/target/stm32f1x.cfg
+share/openocd/scripts/target/stm32f2x.cfg
+share/openocd/scripts/target/stm32f2xxx.cfg
+share/openocd/scripts/target/stm32xl.cfg
 share/openocd/scripts/target/str710.cfg
 share/openocd/scripts/target/str730.cfg
 share/openocd/scripts/target/str750.cfg
 share/openocd/scripts/target/str912.cfg
-share/openocd/scripts/target/telo.cfg
+share/openocd/scripts/target/swj-dp.tcl
 share/openocd/scripts/target/test_reset_syntax_error.cfg
 share/openocd/scripts/target/test_syntax_error.cfg
 share/openocd/scripts/target/ti_dm355.cfg
@@ -214,7 +308,7 @@ share/openocd/scripts/target/ti_dm365.cfg
 share/openocd/scripts/target/ti_dm6446.cfg
 share/openocd/scripts/target/tmpa900.cfg
 share/openocd/scripts/target/tmpa910.cfg
-share/openocd/scripts/target/xba_revA3.cfg
+share/openocd/scripts/target/u8500.cfg
 share/openocd/scripts/test/selftest.cfg
 share/openocd/scripts/test/syntax1.cfg
 @dirrm share/openocd/scripts/test
@@ -224,6 +318,7 @@ share/openocd/scripts/test/syntax1.cfg
 @dirrm share/openocd/scripts/cpu
 @dirrm share/openocd/scripts/cpld
 @dirrm share/openocd/scripts/chip/st/stm32
+@dirrm share/openocd/scripts/chip/st/spear
 @dirrm share/openocd/scripts/chip/st
 @dirrm share/openocd/scripts/chip/atmel/at91
 @dirrm share/openocd/scripts/chip/atmel