Update to 0.9.0. Request from riz@. Upstream integrated two patches, so

remove those. From NEWS:

JTAG Layer:

    SWD support with FTDI, Versaloon, J-Link, sysfsgpio
    CMSIS-DAP massive speed and stability improvements
    Versaloon driver ported to libusb-1.0
    STLink can reestablish communication with a target that was disconnected or rebooted
    STLink FAULT and WAIT SWD handling improved
    New hla_serial command to distinguish between several HLA adapters attached to a single machine
    Serial number support for CMSIS-DAP and J-Link adapters
    Support for more J-Link adapters
    TAP autoprobing improvements
    Big speedup for SVF playback with USB Blaster

Boundary Scan:

Target Layer:

    Stability improvements for targets that get disconnected or rebooted during a debug session
    MIPS speed and reliability improvements
    MIPS 1.5/2.0 fixes
    ARMv7-R improvements
    Cortex-A improvements, A7, A15 MPCores support
    FPU support for ARMv7-M (Cortex-M4F)
    TPIU/ITM support (including SWO/SWV tracing), can be captured with external tools or STLink
    JTAG Serial Port (Advanced Debug System softcore) support
    Profiling support for OpenRISC
    ChibiOS/RT 3.0 support (with and without FPU)
    FreeRTOS current versions support
    Freescale MQX RTOS support
    GDB target description support for MIPS
    The last created target is auto-selected as the current

Flash Layer:

    nRF51 async loader to improve flashing performance and stability
    Cypress PSoC 41xx/42xx and CCG1 families flash driver
    Silabs SiM3 family flash driver
    Marvell Wireless Microcontroller SPI flash driver
    Kinetis mass erase (part unsecuring) implemented
    lpcspifi stability fixes
    STM32 family sync with reference manuals, L0 support, bugfixes
    LPC2000 driver automatically determines part and flash size
    NXP LPC11(x)xx, LPC13xx, LPC15xx, LPC8xx, LPC5410x, LPC407x support
    Atmel SAMD, SAMR, SAML21 devices support
    Atmel SAM4E16 support
    ZeroGecko family support
    TI Tiva C Blizzard and Snowflake families support
    Nuvoton NuMicro M051 support
    EZR32 support in EFM32 driver

Board, Target, and Interface Configuration Scripts:

    Normal target configs can work with HLA (STLink, ICDI) adapters
    STM32 discovery and Nucleo boards configs
    Gumstix AeroCore board config
    General Plus GP326XXXA target config
    Micrel KS869x target config
    ASUS RT-N66U board config
    Atmel SAM4E-EK board config
    Atmel AT91SAM4L proper reset handling implemented
    TI OMAP/AM 3505, 3517 target configs
    nRF51822-mKIT board config
    RC Module 1879-1 target config
    TI TMDX570LS20SUSB board config
    TI TMS570 USB Kit board config
    TI CC2538, CC26xx target configs
    TI AM437x major config improvements, DDR support
    TI AM437X IDK board config
    TI SimpleLink Wi-Fi CC3200 LaunchPad configs
    Silicon Labs EM357, EM358 target configs
    Infineon XMC1000, XMC4000 family targets and boards configs
    Atheros AR9331 target config
    TP-LINK TL-MR3020 board config
    Alphascale asm9260t target and eval kit configs
    Olimex SAM7-LA2 (AT91SAM7A2) board config
    EFM32 Gecko boards configs
    Spansion FM4 target and SK-FM4-176L-S6E2CC board configs
    LPC1xxx target configs were restructured
    IoT-LAB debug adapter config
    DP BusBlaster KT-Link compatible config

Server Layer:

    Polling period can be configured
    shutdown command has an immediate effect
    The program command doesn't lead to a shutdown by default, use optional exit parameter for the old behaviour
    Proper OS signal handling was implemented
    Async target notifications for the Tcl RPC

5 files changed, 80 insertions, 62 deletions

diff --git a/devel/openocd/Makefile b/devel/openocd/Makefile
index 71044612304..3e4f78a2507 100644
--- a/devel/openocd/Makefile
+++ b/devel/openocd/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2015/04/04 00:26:42 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2015/10/01 23:06:37 rodent Exp $
 
-DISTNAME=	openocd-0.8.0
+DISTNAME=	openocd-0.9.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=openocd/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/openocd/PLIST b/devel/openocd/PLIST
index 8b807ebf552..5e1b98e2d44 100644
--- a/devel/openocd/PLIST
+++ b/devel/openocd/PLIST
@@ -1,8 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2015/04/04 00:26:42 rodent Exp $
+@comment $NetBSD: PLIST,v 1.2 2015/10/01 23:06:37 rodent Exp $
 bin/openocd
 info/openocd.info
-info/openocd.info-1
-info/openocd.info-2
 man/man1/openocd.1
 ${PLIST.libusb1}share/openocd/OpenULINK/ulink_firmware.hex
 share/openocd/contrib/99-openocd.rules
@@ -12,10 +10,12 @@ share/openocd/contrib/libdcc/dcc_stdio.h
 share/openocd/contrib/libdcc/example.c
 share/openocd/scripts/bitsbytes.tcl
 share/openocd/scripts/board/actux3.cfg
+share/openocd/scripts/board/alphascale_asm9260_ek.cfg
 share/openocd/scripts/board/altera_sockit.cfg
 share/openocd/scripts/board/am3517evm.cfg
 share/openocd/scripts/board/arm_evaluator7t.cfg
 share/openocd/scripts/board/asus-rt-n16.cfg
+share/openocd/scripts/board/asus-rt-n66u.cfg
 share/openocd/scripts/board/at91cap7a-stk-sdram.cfg
 share/openocd/scripts/board/at91eb40a.cfg
 share/openocd/scripts/board/at91rm9200-dk.cfg
@@ -30,12 +30,15 @@ share/openocd/scripts/board/atmel_sam3n_ek.cfg
 share/openocd/scripts/board/atmel_sam3s_ek.cfg
 share/openocd/scripts/board/atmel_sam3u_ek.cfg
 share/openocd/scripts/board/atmel_sam3x_ek.cfg
+share/openocd/scripts/board/atmel_sam4e_ek.cfg
 share/openocd/scripts/board/atmel_sam4l8_xplained_pro.cfg
 share/openocd/scripts/board/atmel_sam4s_ek.cfg
 share/openocd/scripts/board/atmel_sam4s_xplained_pro.cfg
 share/openocd/scripts/board/atmel_samd20_xplained_pro.cfg
 share/openocd/scripts/board/atmel_samd21_xplained_pro.cfg
 share/openocd/scripts/board/atmel_samg53_xplained_pro.cfg
+share/openocd/scripts/board/atmel_saml21_xplained_pro.cfg
+share/openocd/scripts/board/atmel_samr21_xplained_pro.cfg
 share/openocd/scripts/board/balloon3-cpu.cfg
 share/openocd/scripts/board/bcm28155_ap.cfg
 share/openocd/scripts/board/bt-homehubv1.cfg
@@ -47,11 +50,13 @@ share/openocd/scripts/board/da850evm.cfg
 share/openocd/scripts/board/digi_connectcore_wi-9c.cfg
 share/openocd/scripts/board/digilent_zedboard.cfg
 share/openocd/scripts/board/diolan_lpc4350-db1.cfg
+share/openocd/scripts/board/dk-tm4c129.cfg
 share/openocd/scripts/board/dm355evm.cfg
 share/openocd/scripts/board/dm365evm.cfg
 share/openocd/scripts/board/dm6446evm.cfg
 share/openocd/scripts/board/dp_busblaster_v3.cfg
 share/openocd/scripts/board/efikamx.cfg
+share/openocd/scripts/board/efm32.cfg
 share/openocd/scripts/board/eir.cfg
 share/openocd/scripts/board/ek-lm3s1968.cfg
 share/openocd/scripts/board/ek-lm3s3748.cfg
@@ -64,11 +69,13 @@ share/openocd/scripts/board/ek-lm3s9d92.cfg
 share/openocd/scripts/board/ek-lm4f120xl.cfg
 share/openocd/scripts/board/ek-lm4f232.cfg
 share/openocd/scripts/board/ek-tm4c123gxl.cfg
+share/openocd/scripts/board/ek-tm4c1294xl.cfg
 share/openocd/scripts/board/embedded-artists_lpc2478-32.cfg
 share/openocd/scripts/board/ethernut3.cfg
 share/openocd/scripts/board/frdm-kl25z.cfg
 share/openocd/scripts/board/frdm-kl46z.cfg
 share/openocd/scripts/board/glyn_tonga2.cfg
+share/openocd/scripts/board/gumstix-aerocore.cfg
 share/openocd/scripts/board/hammer.cfg
 share/openocd/scripts/board/hilscher_nxdb500sys.cfg
 share/openocd/scripts/board/hilscher_nxeb500hmi.cfg
@@ -109,9 +116,11 @@ share/openocd/scripts/board/mini2440.cfg
 share/openocd/scripts/board/mini6410.cfg
 share/openocd/scripts/board/nds32_xc5.cfg
 share/openocd/scripts/board/netgear-dg834v3.cfg
+share/openocd/scripts/board/nordic_nrf51822_mkit.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_sam7_la2.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
@@ -131,15 +140,18 @@ share/openocd/scripts/board/redbee.cfg
 share/openocd/scripts/board/rsc-w910.cfg
 share/openocd/scripts/board/sheevaplug.cfg
 share/openocd/scripts/board/smdk6410.cfg
+share/openocd/scripts/board/spansion_sk-fm4-176l-s6e2cc.cfg
 share/openocd/scripts/board/spear300evb.cfg
 share/openocd/scripts/board/spear300evb_mod.cfg
 share/openocd/scripts/board/spear310evb20.cfg
 share/openocd/scripts/board/spear310evb20_mod.cfg
 share/openocd/scripts/board/spear320cpu.cfg
 share/openocd/scripts/board/spear320cpu_mod.cfg
-share/openocd/scripts/board/st_nucleo_f030r8.cfg
+share/openocd/scripts/board/st_nucleo_f0.cfg
 share/openocd/scripts/board/st_nucleo_f103rb.cfg
-share/openocd/scripts/board/st_nucleo_f401re.cfg
+share/openocd/scripts/board/st_nucleo_f3.cfg
+share/openocd/scripts/board/st_nucleo_f4.cfg
+share/openocd/scripts/board/st_nucleo_l1.cfg
 share/openocd/scripts/board/steval_pcc010.cfg
 share/openocd/scripts/board/stm320518_eval.cfg
 share/openocd/scripts/board/stm320518_eval_stlink.cfg
@@ -151,15 +163,23 @@ share/openocd/scripts/board/stm3220g_eval.cfg
 share/openocd/scripts/board/stm3220g_eval_stlink.cfg
 share/openocd/scripts/board/stm3241g_eval.cfg
 share/openocd/scripts/board/stm3241g_eval_stlink.cfg
+share/openocd/scripts/board/stm32429i_eval.cfg
+share/openocd/scripts/board/stm32429i_eval_stlink.cfg
+share/openocd/scripts/board/stm32439i_eval.cfg
+share/openocd/scripts/board/stm32439i_eval_stlink.cfg
 share/openocd/scripts/board/stm32f0discovery.cfg
+share/openocd/scripts/board/stm32f334discovery.cfg
 share/openocd/scripts/board/stm32f3discovery.cfg
 share/openocd/scripts/board/stm32f429discovery.cfg
 share/openocd/scripts/board/stm32f4discovery.cfg
+share/openocd/scripts/board/stm32l0discovery.cfg
 share/openocd/scripts/board/stm32ldiscovery.cfg
 share/openocd/scripts/board/stm32vldiscovery.cfg
 share/openocd/scripts/board/str910-eval.cfg
 share/openocd/scripts/board/telo.cfg
+share/openocd/scripts/board/ti-cc3200-launchxl.cfg
 share/openocd/scripts/board/ti_am335xevm.cfg
+share/openocd/scripts/board/ti_am437x_idk.cfg
 share/openocd/scripts/board/ti_am43xx_evm.cfg
 share/openocd/scripts/board/ti_beagleboard.cfg
 share/openocd/scripts/board/ti_beagleboard_xm.cfg
@@ -167,9 +187,11 @@ share/openocd/scripts/board/ti_beaglebone.cfg
 share/openocd/scripts/board/ti_blaze.cfg
 share/openocd/scripts/board/ti_pandaboard.cfg
 share/openocd/scripts/board/ti_pandaboard_es.cfg
+share/openocd/scripts/board/ti_tmdx570ls20susb.cfg
 share/openocd/scripts/board/ti_tmdx570ls31usb.cfg
 share/openocd/scripts/board/topas910.cfg
 share/openocd/scripts/board/topasa900.cfg
+share/openocd/scripts/board/tp-link_tl-mr3020.cfg
 share/openocd/scripts/board/twr-k60f120m.cfg
 share/openocd/scripts/board/twr-k60n512.cfg
 share/openocd/scripts/board/tx25_stk5.cfg
@@ -180,6 +202,12 @@ share/openocd/scripts/board/verdex.cfg
 share/openocd/scripts/board/voipac.cfg
 share/openocd/scripts/board/voltcraft_dso-3062c.cfg
 share/openocd/scripts/board/x300t.cfg
+share/openocd/scripts/board/xmc-2go.cfg
+share/openocd/scripts/board/xmc1100-boot-kit.cfg
+share/openocd/scripts/board/xmc4200-application-kit-actuator.cfg
+share/openocd/scripts/board/xmc4500-application-kit-general.cfg
+share/openocd/scripts/board/xmc4500-application-kit-sdram.cfg
+share/openocd/scripts/board/xmc4500-relax.cfg
 share/openocd/scripts/board/zy1000.cfg
 share/openocd/scripts/chip/atmel/at91/aic.tcl
 share/openocd/scripts/chip/atmel/at91/at91_pio.cfg
@@ -244,6 +272,7 @@ share/openocd/scripts/interface/ftdi/cortino.cfg
 share/openocd/scripts/interface/ftdi/digilent_jtag_smt2.cfg
 share/openocd/scripts/interface/ftdi/dlp-usb1232h.cfg
 share/openocd/scripts/interface/ftdi/dp_busblaster.cfg
+share/openocd/scripts/interface/ftdi/dp_busblaster_kt-link.cfg
 share/openocd/scripts/interface/ftdi/flossjtag-noeeprom.cfg
 share/openocd/scripts/interface/ftdi/flossjtag.cfg
 share/openocd/scripts/interface/ftdi/flyswatter.cfg
@@ -257,6 +286,7 @@ share/openocd/scripts/interface/ftdi/hilscher_nxhx50_re.cfg
 share/openocd/scripts/interface/ftdi/hitex_lpc1768stick.cfg
 share/openocd/scripts/interface/ftdi/hitex_str9-comstick.cfg
 share/openocd/scripts/interface/ftdi/icebear.cfg
+share/openocd/scripts/interface/ftdi/iotlab-usb.cfg
 share/openocd/scripts/interface/ftdi/jtag-lock-pick_tiny_2.cfg
 share/openocd/scripts/interface/ftdi/jtagkey.cfg
 share/openocd/scripts/interface/ftdi/jtagkey2.cfg
@@ -270,6 +300,7 @@ share/openocd/scripts/interface/ftdi/m53evk.cfg
 share/openocd/scripts/interface/ftdi/minimodule.cfg
 share/openocd/scripts/interface/ftdi/neodb.cfg
 share/openocd/scripts/interface/ftdi/ngxtech.cfg
+share/openocd/scripts/interface/ftdi/olimex-arm-jtag-swd.cfg
 share/openocd/scripts/interface/ftdi/olimex-arm-usb-ocd-h.cfg
 share/openocd/scripts/interface/ftdi/olimex-arm-usb-ocd.cfg
 share/openocd/scripts/interface/ftdi/olimex-arm-usb-tiny-h.cfg
@@ -281,10 +312,13 @@ share/openocd/scripts/interface/ftdi/openocd-usb.cfg
 share/openocd/scripts/interface/ftdi/openrd.cfg
 share/openocd/scripts/interface/ftdi/redbee-econotag.cfg
 share/openocd/scripts/interface/ftdi/redbee-usb.cfg
+share/openocd/scripts/interface/ftdi/rowley-cc-arm-swd.cfg
 share/openocd/scripts/interface/ftdi/sheevaplug.cfg
 share/openocd/scripts/interface/ftdi/signalyzer-lite.cfg
 share/openocd/scripts/interface/ftdi/signalyzer.cfg
 share/openocd/scripts/interface/ftdi/stm32-stick.cfg
+share/openocd/scripts/interface/ftdi/swd-resistor-hack.cfg
+share/openocd/scripts/interface/ftdi/ti-icdi.cfg
 share/openocd/scripts/interface/ftdi/tumpa-lite.cfg
 share/openocd/scripts/interface/ftdi/tumpa.cfg
 share/openocd/scripts/interface/ftdi/turtelizer2-revB.cfg
@@ -355,6 +389,7 @@ share/openocd/scripts/memory.tcl
 share/openocd/scripts/mmr_helpers.tcl
 share/openocd/scripts/target/1986ве1т.cfg
 share/openocd/scripts/target/aduc702x.cfg
+share/openocd/scripts/target/alphascale_asm9260t.cfg
 share/openocd/scripts/target/altera_fpgasoc.cfg
 share/openocd/scripts/target/am335x.cfg
 share/openocd/scripts/target/am437x.cfg
@@ -381,6 +416,7 @@ share/openocd/scripts/target/at91sam4XXX.cfg
 share/openocd/scripts/target/at91sam4lXX.cfg
 share/openocd/scripts/target/at91sam4sXX.cfg
 share/openocd/scripts/target/at91sam4sd32x.cfg
+share/openocd/scripts/target/at91sam7a2.cfg
 share/openocd/scripts/target/at91sam7se512.cfg
 share/openocd/scripts/target/at91sam7sx.cfg
 share/openocd/scripts/target/at91sam7x256.cfg
@@ -396,9 +432,11 @@ share/openocd/scripts/target/at91sam9g45.cfg
 share/openocd/scripts/target/at91sam9rl.cfg
 share/openocd/scripts/target/at91samdXX.cfg
 share/openocd/scripts/target/at91samg5x.cfg
+share/openocd/scripts/target/atheros_ar9331.cfg
 share/openocd/scripts/target/atmega128.cfg
 share/openocd/scripts/target/avr32.cfg
 share/openocd/scripts/target/bcm281xx.cfg
+share/openocd/scripts/target/bcm4706.cfg
 share/openocd/scripts/target/bcm4718.cfg
 share/openocd/scripts/target/bcm47xx.cfg
 share/openocd/scripts/target/bcm5352e.cfg
@@ -407,17 +445,25 @@ share/openocd/scripts/target/c100.cfg
 share/openocd/scripts/target/c100config.tcl
 share/openocd/scripts/target/c100helper.tcl
 share/openocd/scripts/target/c100regs.tcl
+share/openocd/scripts/target/cc2538.cfg
+share/openocd/scripts/target/cc26xx.cfg
+share/openocd/scripts/target/cc32xx.cfg
 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/efm32.cfg
 share/openocd/scripts/target/efm32_stlink.cfg
+share/openocd/scripts/target/em357.cfg
+share/openocd/scripts/target/em358.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/fm4.cfg
+share/openocd/scripts/target/gp326xxxa.cfg
 share/openocd/scripts/target/hilscher_netx10.cfg
 share/openocd/scripts/target/hilscher_netx50.cfg
 share/openocd/scripts/target/hilscher_netx500.cfg
@@ -439,23 +485,15 @@ share/openocd/scripts/target/k60.cfg
 share/openocd/scripts/target/kl25.cfg
 share/openocd/scripts/target/kl25z_hla.cfg
 share/openocd/scripts/target/kl46.cfg
-share/openocd/scripts/target/lpc11uxx.cfg
-share/openocd/scripts/target/lpc1751.cfg
-share/openocd/scripts/target/lpc1752.cfg
-share/openocd/scripts/target/lpc1754.cfg
-share/openocd/scripts/target/lpc1756.cfg
-share/openocd/scripts/target/lpc1758.cfg
-share/openocd/scripts/target/lpc1759.cfg
-share/openocd/scripts/target/lpc1763.cfg
-share/openocd/scripts/target/lpc1764.cfg
-share/openocd/scripts/target/lpc1765.cfg
-share/openocd/scripts/target/lpc1766.cfg
-share/openocd/scripts/target/lpc1767.cfg
-share/openocd/scripts/target/lpc1768.cfg
-share/openocd/scripts/target/lpc1769.cfg
-share/openocd/scripts/target/lpc1788.cfg
+share/openocd/scripts/target/klx.cfg
+share/openocd/scripts/target/ks869x.cfg
+share/openocd/scripts/target/kx.cfg
+share/openocd/scripts/target/lpc11xx.cfg
+share/openocd/scripts/target/lpc12xx.cfg
+share/openocd/scripts/target/lpc13xx.cfg
 share/openocd/scripts/target/lpc17xx.cfg
 share/openocd/scripts/target/lpc1850.cfg
+share/openocd/scripts/target/lpc1xxx.cfg
 share/openocd/scripts/target/lpc2103.cfg
 share/openocd/scripts/target/lpc2124.cfg
 share/openocd/scripts/target/lpc2129.cfg
@@ -468,12 +506,16 @@ 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/lpc40xx.cfg
 share/openocd/scripts/target/lpc4350.cfg
+share/openocd/scripts/target/lpc8xx.cfg
+share/openocd/scripts/target/m051.cfg
 share/openocd/scripts/target/mc13224v.cfg
 share/openocd/scripts/target/mdr32f9q2i.cfg
 share/openocd/scripts/target/nds32v2.cfg
 share/openocd/scripts/target/nds32v3.cfg
 share/openocd/scripts/target/nds32v3m.cfg
+share/openocd/scripts/target/nrf51.cfg
 share/openocd/scripts/target/nrf51_stlink.tcl
 share/openocd/scripts/target/nuc910.cfg
 share/openocd/scripts/target/omap2420.cfg
@@ -484,6 +526,7 @@ share/openocd/scripts/target/omap5912.cfg
 share/openocd/scripts/target/omapl138.cfg
 share/openocd/scripts/target/or1k.cfg
 share/openocd/scripts/target/pic32mx.cfg
+share/openocd/scripts/target/psoc4.cfg
 share/openocd/scripts/target/pxa255.cfg
 share/openocd/scripts/target/pxa270.cfg
 share/openocd/scripts/target/pxa3xx.cfg
@@ -495,6 +538,7 @@ 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/sim3x.cfg
 share/openocd/scripts/target/smp8634.cfg
 share/openocd/scripts/target/spear3xx.cfg
 share/openocd/scripts/target/stellaris.cfg
@@ -510,8 +554,9 @@ share/openocd/scripts/target/stm32f3x.cfg
 share/openocd/scripts/target/stm32f3x_stlink.cfg
 share/openocd/scripts/target/stm32f4x.cfg
 share/openocd/scripts/target/stm32f4x_stlink.cfg
-share/openocd/scripts/target/stm32l.cfg
-share/openocd/scripts/target/stm32lx_dual_bank.cfg
+share/openocd/scripts/target/stm32l0.cfg
+share/openocd/scripts/target/stm32l1.cfg
+share/openocd/scripts/target/stm32l1x_dual_bank.cfg
 share/openocd/scripts/target/stm32lx_stlink.cfg
 share/openocd/scripts/target/stm32w108_stlink.cfg
 share/openocd/scripts/target/stm32w108xx.cfg
@@ -524,15 +569,22 @@ 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-ar7.cfg
+share/openocd/scripts/target/ti-cjtag.cfg
 share/openocd/scripts/target/ti_calypso.cfg
 share/openocd/scripts/target/ti_dm355.cfg
 share/openocd/scripts/target/ti_dm365.cfg
 share/openocd/scripts/target/ti_dm6446.cfg
+share/openocd/scripts/target/ti_rm4x.cfg
 share/openocd/scripts/target/ti_tms570.cfg
+share/openocd/scripts/target/ti_tms570ls20xxx.cfg
+share/openocd/scripts/target/ti_tms570ls3137.cfg
 share/openocd/scripts/target/tmpa900.cfg
 share/openocd/scripts/target/tmpa910.cfg
 share/openocd/scripts/target/u8500.cfg
+share/openocd/scripts/target/xmc1xxx.cfg
+share/openocd/scripts/target/xmc4xxx.cfg
 share/openocd/scripts/target/zynq_7000.cfg
+share/openocd/scripts/target/к1879xб1я.cfg
 share/openocd/scripts/test/selftest.cfg
 share/openocd/scripts/test/syntax1.cfg
 share/openocd/scripts/tools/firmware-recovery.tcl
diff --git a/devel/openocd/distinfo b/devel/openocd/distinfo
index 243dc23f415..2454581903c 100644
--- a/devel/openocd/distinfo
+++ b/devel/openocd/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.2 2015/04/23 12:21:19 rodent Exp $
+$NetBSD: distinfo,v 1.3 2015/10/01 23:06:37 rodent Exp $
 
-SHA1 (openocd-0.8.0.tar.bz2) = 10bf9eeb54e03083cb1a101785b2d69fbdf18f31
-RMD160 (openocd-0.8.0.tar.bz2) = 812755bb51ccf6bb11e4b6aac6dd1c0c674c43b7
-Size (openocd-0.8.0.tar.bz2) = 3768447 bytes
-SHA1 (patch-src_jtag_drivers_ulink.c) = 373960ff40b4cd2b7a74e526595bf4ab9468beb3
-SHA1 (patch-src_jtag_drivers_usb__blaster_ublast2__access__libusb.c) = 5baff71502a7fc1121efd3d8d6de0bd72eae3832
+SHA1 (openocd-0.9.0.tar.bz2) = bcf99bb21f09513065b2c9ece148ace7d16cdd0c
+RMD160 (openocd-0.9.0.tar.bz2) = 21b3c2d80fbf8707644f37e61142d7cccaa8fed0
+Size (openocd-0.9.0.tar.bz2) = 3873090 bytes
diff --git a/devel/openocd/patches/patch-src_jtag_drivers_ulink.c b/devel/openocd/patches/patch-src_jtag_drivers_ulink.c
deleted file mode 100644
index 03df5ccefd9..00000000000
--- a/devel/openocd/patches/patch-src_jtag_drivers_ulink.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_jtag_drivers_ulink.c,v 1.1 2015/04/23 12:21:19 rodent Exp $
-
-"Remove useless checks causing build failure with clang". --upstream
-
---- src/jtag/drivers/ulink.c.orig	2014-03-29 16:55:12.000000000 +0000
-+++ src/jtag/drivers/ulink.c
-@@ -461,9 +461,6 @@ int ulink_write_firmware_section(struct 
- 	LOG_DEBUG("section %02i at addr 0x%04x (size 0x%04x)", section_index, addr,
- 		size);
- 
--	if (data == NULL)
--		return ERROR_FAIL;
--
- 	/* Copy section contents to local buffer */
- 	ret = image_read_section(firmware_image, section_index, 0, size, data,
- 			&size_read);
diff --git a/devel/openocd/patches/patch-src_jtag_drivers_usb__blaster_ublast2__access__libusb.c b/devel/openocd/patches/patch-src_jtag_drivers_usb__blaster_ublast2__access__libusb.c
deleted file mode 100644
index aa3e8326025..00000000000
--- a/devel/openocd/patches/patch-src_jtag_drivers_usb__blaster_ublast2__access__libusb.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_jtag_drivers_usb__blaster_ublast2__access__libusb.c,v 1.1 2015/04/23 12:21:19 rodent Exp $
-
-"Remove useless checks causing build failure with clang". --upstream
-
---- src/jtag/drivers/usb_blaster/ublast2_access_libusb.c.orig	2014-03-29 16:55:12.000000000 +0000
-+++ src/jtag/drivers/usb_blaster/ublast2_access_libusb.c
-@@ -74,9 +74,6 @@ static int ublast2_write_firmware_sectio
- 	LOG_DEBUG("section %02i at addr 0x%04x (size 0x%04x)", section_index, addr,
- 		size);
- 
--	if (data == NULL)
--		return ERROR_FAIL;
--
- 	/* Copy section contents to local buffer */
- 	int ret = image_read_section(firmware_image, section_index, 0, size, data,
- 			&size_read);