From ff555afc02d50ca57fc6e71787d34a8e985cf115 Mon Sep 17 00:00:00 2001 From: Tomas Vanek Date: Mon, 12 Nov 2018 12:18:31 +0100 Subject: [PATCH] tcl/target, board: remove useless gdb-attach event definitions Since commit bae76053dc515252dc5c8235b9a848e461080c66 gdb-attach event is defined as halt by default. Remove useless and in case of bcm281xx wrong definitions of the event. Change-Id: I8e69780a93722eb9392673303f54d502e71eceb6 Signed-off-by: Tomas Vanek Reviewed-on: http://openocd.zylin.com/4763 Tested-by: jenkins Reviewed-by: Steven Stallion --- tcl/board/atmel_sam3s_ek.cfg | 2 -- tcl/board/atmel_sam4s_ek.cfg | 2 -- tcl/board/fsl_imx6q_sabresd.cfg | 2 -- tcl/board/lemaker_hikey.cfg | 3 --- tcl/board/tocoding_poplar.cfg | 3 --- tcl/target/altera_fpgasoc.cfg | 2 -- tcl/target/bcm281xx.cfg | 7 ------- tcl/target/imx6.cfg | 1 - tcl/target/quark_d20xx.cfg | 2 -- tcl/target/ti_tms570.cfg | 5 ----- tcl/target/u8500.cfg | 8 -------- 11 files changed, 37 deletions(-) diff --git a/tcl/board/atmel_sam3s_ek.cfg b/tcl/board/atmel_sam3s_ek.cfg index 38b54b7b0..6e8ffe417 100644 --- a/tcl/board/atmel_sam3s_ek.cfg +++ b/tcl/board/atmel_sam3s_ek.cfg @@ -1,3 +1 @@ source [find target/at91sam3sXX.cfg] - -$_TARGETNAME configure -event gdb-attach { reset init } diff --git a/tcl/board/atmel_sam4s_ek.cfg b/tcl/board/atmel_sam4s_ek.cfg index dcfa900dc..ca11e5487 100644 --- a/tcl/board/atmel_sam4s_ek.cfg +++ b/tcl/board/atmel_sam4s_ek.cfg @@ -1,3 +1 @@ source [find target/at91sam4sXX.cfg] - -$_TARGETNAME configure -event gdb-attach { reset init } diff --git a/tcl/board/fsl_imx6q_sabresd.cfg b/tcl/board/fsl_imx6q_sabresd.cfg index 797e2de5f..e1f0892f0 100644 --- a/tcl/board/fsl_imx6q_sabresd.cfg +++ b/tcl/board/fsl_imx6q_sabresd.cfg @@ -143,7 +143,5 @@ proc imx6q_sabresd_init { } { $_TARGETNAME.0 configure -event reset-assert { } # hook the init function into the reset-init event $_TARGETNAME.0 configure -event reset-init { imx6q_sabresd_init } -# make sure target is halted when gdb attaches -$_TARGETNAME.0 configure -event gdb-attach { halt } # set a slow default JTAG clock, can be overridden later adapter_khz 1000 diff --git a/tcl/board/lemaker_hikey.cfg b/tcl/board/lemaker_hikey.cfg index d72444048..ee677c34b 100644 --- a/tcl/board/lemaker_hikey.cfg +++ b/tcl/board/lemaker_hikey.cfg @@ -10,9 +10,6 @@ reset_config srst_only srst_push_pull source [find target/hi6220.cfg] -# halt the cores when gdb attaches -${_TARGETNAME}0 configure -event gdb-attach "halt" - # make sure the default target is the boot core targets ${_TARGETNAME}0 diff --git a/tcl/board/tocoding_poplar.cfg b/tcl/board/tocoding_poplar.cfg index fd6615605..d8b833004 100644 --- a/tcl/board/tocoding_poplar.cfg +++ b/tcl/board/tocoding_poplar.cfg @@ -12,9 +12,6 @@ reset_config srst_only srst_push_pull source [find tcl/target/hi3798.cfg] -# halt the cores when gdb attaches -${_TARGETNAME}0 configure -event gdb-attach "halt" - # make sure the default target is the boot core targets ${_TARGETNAME}0 diff --git a/tcl/target/altera_fpgasoc.cfg b/tcl/target/altera_fpgasoc.cfg index 1fbc5a375..9a83b5ccb 100644 --- a/tcl/target/altera_fpgasoc.cfg +++ b/tcl/target/altera_fpgasoc.cfg @@ -48,7 +48,6 @@ target create $_TARGETNAME1 cortex_a -dap $_CHIPNAME.dap \ $_TARGETNAME1 configure -event reset-start { adapter_khz 1000 } $_TARGETNAME1 configure -event reset-assert-post "cycv_dbginit $_TARGETNAME1" -$_TARGETNAME1 configure -event gdb-attach { halt } # A9 core 1 @@ -57,7 +56,6 @@ $_TARGETNAME1 configure -event gdb-attach { halt } #$_TARGETNAME2 configure -event reset-start { adapter_khz 1000 } #$_TARGETNAME2 configure -event reset-assert-post "cycv_dbginit $_TARGETNAME2" -#$_TARGETNAME2 configure -event gdb-attach { halt } proc cycv_dbginit {target} { # General Cortex-A8/A9 debug initialisation diff --git a/tcl/target/bcm281xx.cfg b/tcl/target/bcm281xx.cfg index 6432a2092..0715d82d8 100644 --- a/tcl/target/bcm281xx.cfg +++ b/tcl/target/bcm281xx.cfg @@ -26,10 +26,3 @@ dap create $_CHIPNAME.dap -chain-position $_CHIPNAME.cpu target create $_TARGETNAME0 cortex_a -dap $_CHIPNAME.dap -coreid 0 -dbgbase 0x3fe10000 target create $_TARGETNAME1 cortex_a -dap $_CHIPNAME.dap -coreid 1 -dbgbase 0x3fe12000 target smp $_TARGETNAME0 $_TARGETNAME1 - -$_TARGETNAME0 configure -event gdb-attach { - cortex_a dbginit -} -$_TARGETNAME1 configure -event gdb-attach { - cortex_a dbginit -} diff --git a/tcl/target/imx6.cfg b/tcl/target/imx6.cfg index 5b59ecf86..8a32517f3 100644 --- a/tcl/target/imx6.cfg +++ b/tcl/target/imx6.cfg @@ -57,4 +57,3 @@ adapter_khz 1000 $_TARGETNAME configure -event reset-start { adapter_khz 1000 } $_TARGETNAME configure -event reset-assert-post "imx6_dbginit $_TARGETNAME" -$_TARGETNAME configure -event gdb-attach { halt } diff --git a/tcl/target/quark_d20xx.cfg b/tcl/target/quark_d20xx.cfg index 419f9dc4d..7d718c26d 100644 --- a/tcl/target/quark_d20xx.cfg +++ b/tcl/target/quark_d20xx.cfg @@ -33,8 +33,6 @@ jtag configure quark_d20xx.quark -event tap-disable \ target create quark_d20xx.quark quark_d20xx -endian little -chain-position quark_d20xx.quark -quark_d20xx.quark configure -event gdb-attach { halt } - quark_d20xx.quark configure -event reset-start { # need to halt the target to write to memory if {[quark_d20xx.quark curstate] ne "halted"} { halt } diff --git a/tcl/target/ti_tms570.cfg b/tcl/target/ti_tms570.cfg index 1c89b8ce5..ce3a17696 100644 --- a/tcl/target/ti_tms570.cfg +++ b/tcl/target/ti_tms570.cfg @@ -63,11 +63,6 @@ target create $_TARGETNAME cortex_r4 -endian $_ENDIAN \ # TMS570 uses quirky BE-32 mode $_CHIPNAME.dap ti_be_32_quirks 1 -$_TARGETNAME configure -event gdb-attach { - cortex_r4 dbginit - halt -} - $_TARGETNAME configure -event "reset-assert" { global _CHIPNAME diff --git a/tcl/target/u8500.cfg b/tcl/target/u8500.cfg index 7d8bfe375..1313efd3a 100644 --- a/tcl/target/u8500.cfg +++ b/tcl/target/u8500.cfg @@ -206,10 +206,6 @@ dap create $_CHIPNAME.dap -chain-position $_CHIPNAME.cpu target create $_TARGETNAME_1 cortex_a -dap $_CHIPNAME.dap -dbgbase $_DAP_DBG1 -coreid 0 -rtos linux -$_TARGETNAME_1 configure -event gdb-attach { - halt -} - if { ![info exists TARGETNAME_2] } { global _TARGETNAME_2 @@ -221,10 +217,6 @@ set _TARGETNAME_2 $TARGETNAME_2 target create $_TARGETNAME_2 cortex_a -dap $_CHIPNAME.dap -dbgbase $_DAP_DBG2 -coreid 1 -rtos linux -$_TARGETNAME_2 configure -event gdb-attach { - halt -} - if {![info exists SMP]} { global _SMP