From abfd4b19a6b1c1e257aed343af5ab71709f41bcb Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Sat, 29 Oct 2011 22:58:12 +0200 Subject: [PATCH] config files: Drop incorrect comments. There are many "force an error till we get a good number" comments in target/board files. This refers to the use-case where a config script sets _CPUTAPID to 0xffffffff (which presumely gets overridden later): if { [info exists CPUTAPID ] } { set _CPUTAPID $CPUTAPID } else { # Force an error until we get a good number. set _CPUTAPID 0xffffffff } However, the same comment was also copy-pasted in many files which do _not_ set _CPUTAPID to 0xffffffff, where the comment doesn't make any sense at all. Drop those comments. Also, add one missing comment, and fix small whitespace and grammar issues. Change-Id: Ic4ba3b5ccba87ed40cea0d6a7d66609fbdfa3c71 Signed-off-by: Uwe Hermann Reviewed-on: http://openocd.zylin.com/136 Tested-by: jenkins Reviewed-by: Peter Stuge --- tcl/board/at91eb40a.cfg | 1 - tcl/board/mini2440.cfg | 1 - tcl/target/at91sam7se512.cfg | 2 +- tcl/target/at91sam9.cfg | 2 -- tcl/target/avr32.cfg | 1 - tcl/target/dsp56321.cfg | 1 - tcl/target/dsp568013.cfg | 1 - tcl/target/dsp568037.cfg | 1 - tcl/target/epc9301.cfg | 2 +- tcl/target/is5114.cfg | 2 +- tcl/target/pic32mx.cfg | 1 - tcl/target/samsung_s3c2410.cfg | 1 + tcl/target/samsung_s3c2440.cfg | 1 - tcl/target/samsung_s3c2450.cfg | 1 - tcl/target/samsung_s3c6410.cfg | 2 -- tcl/target/smp8634.cfg | 1 - tcl/target/tmpa900.cfg | 1 - tcl/target/tmpa910.cfg | 1 - 18 files changed, 4 insertions(+), 19 deletions(-) diff --git a/tcl/board/at91eb40a.cfg b/tcl/board/at91eb40a.cfg index dc5aacbf..b43dee3d 100644 --- a/tcl/board/at91eb40a.cfg +++ b/tcl/board/at91eb40a.cfg @@ -19,7 +19,6 @@ if { [info exists ENDIAN] } { if { [info exists CPUTAPID ] } { set _CPUTAPID $CPUTAPID } else { - # force an error till we get a good number set _CPUTAPID 0x1f0f0f0f } diff --git a/tcl/board/mini2440.cfg b/tcl/board/mini2440.cfg index c5adac36..a0345387 100644 --- a/tcl/board/mini2440.cfg +++ b/tcl/board/mini2440.cfg @@ -100,7 +100,6 @@ if { [info exists ENDIAN] } { if { [info exists CPUTAPID ] } { set _CPUTAPID $CPUTAPID } else { - # force an error till we get a good number set _CPUTAPID 0x0032409d } diff --git a/tcl/target/at91sam7se512.cfg b/tcl/target/at91sam7se512.cfg index c48afeff..7273a069 100644 --- a/tcl/target/at91sam7se512.cfg +++ b/tcl/target/at91sam7se512.cfg @@ -18,7 +18,7 @@ if { [info exists ENDIAN] } { if { [info exists CPUTAPID ] } { set _CPUTAPID $CPUTAPID } else { - # force an error till we get a good number + # Force an error until we get a good number. set _CPUTAPID 0xffffffff } diff --git a/tcl/target/at91sam9.cfg b/tcl/target/at91sam9.cfg index ba0197d9..08154cea 100644 --- a/tcl/target/at91sam9.cfg +++ b/tcl/target/at91sam9.cfg @@ -17,13 +17,11 @@ if { [info exists ENDIAN] } { if { [info exists CPUTAPID ] } { set _CPUTAPID $CPUTAPID } else { - # force an error till we get a good number set _CPUTAPID 0x0792603f } reset_config trst_and_srst separate trst_push_pull srst_open_drain -# jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID adapter_nsrst_delay 300 diff --git a/tcl/target/avr32.cfg b/tcl/target/avr32.cfg index 7fe98b2c..1a2ea330 100644 --- a/tcl/target/avr32.cfg +++ b/tcl/target/avr32.cfg @@ -1,7 +1,6 @@ set _CHIPNAME avr32 set _ENDIAN big -# force an error till we get a good number set _CPUTAPID 0x21e8203f jtag_nsrst_delay 100 diff --git a/tcl/target/dsp56321.cfg b/tcl/target/dsp56321.cfg index 281c4ddd..74279d99 100644 --- a/tcl/target/dsp56321.cfg +++ b/tcl/target/dsp56321.cfg @@ -17,7 +17,6 @@ if { [info exists ENDIAN] } { if { [info exists CPUTAPID ] } { set _CPUTAPID $CPUTAPID } else { - # force an error till we get a good number set _CPUTAPID 0x1181501d } diff --git a/tcl/target/dsp568013.cfg b/tcl/target/dsp568013.cfg index 80adc763..2b25ed7e 100644 --- a/tcl/target/dsp568013.cfg +++ b/tcl/target/dsp568013.cfg @@ -16,7 +16,6 @@ if { [info exists ENDIAN] } { if { [info exists CPUTAPID ] } { set _CPUTAPID $CPUTAPID } else { - # force an error till we get a good number set _CPUTAPID 0x01f2401d } diff --git a/tcl/target/dsp568037.cfg b/tcl/target/dsp568037.cfg index 6089e9d2..21eb0b70 100644 --- a/tcl/target/dsp568037.cfg +++ b/tcl/target/dsp568037.cfg @@ -16,7 +16,6 @@ if { [info exists ENDIAN] } { if { [info exists CPUTAPID ] } { set _CPUTAPID $CPUTAPID } else { - # force an error till we get a good number set _CPUTAPID 0x01f2801d } diff --git a/tcl/target/epc9301.cfg b/tcl/target/epc9301.cfg index d2dc7ecb..6b67b9dc 100644 --- a/tcl/target/epc9301.cfg +++ b/tcl/target/epc9301.cfg @@ -15,7 +15,7 @@ if { [info exists ENDIAN] } { if { [info exists CPUTAPID ] } { set _CPUTAPID $CPUTAPID } else { - # force an error till we get a good number + # Force an error until we get a good number. set _CPUTAPID 0xffffffff } diff --git a/tcl/target/is5114.cfg b/tcl/target/is5114.cfg index 64c0c8ef..56b9b652 100644 --- a/tcl/target/is5114.cfg +++ b/tcl/target/is5114.cfg @@ -18,7 +18,7 @@ if { [info exists ENDIAN] } { if { [info exists CPUTAPID ] } { set _CPUTAPID $CPUTAPID } else { - # force an error till we get a good number + # Force an error until we get a good number. set _CPUTAPID 0xffffffff } diff --git a/tcl/target/pic32mx.cfg b/tcl/target/pic32mx.cfg index efffd040..0b3522ee 100644 --- a/tcl/target/pic32mx.cfg +++ b/tcl/target/pic32mx.cfg @@ -14,7 +14,6 @@ if { [info exists ENDIAN] } { if { [info exists CPUTAPID ] } { set _CPUTAPID $CPUTAPID } else { - # force an error till we get a good number set _CPUTAPID 0x30938053 } diff --git a/tcl/target/samsung_s3c2410.cfg b/tcl/target/samsung_s3c2410.cfg index 9682c4c1..73d3b500 100644 --- a/tcl/target/samsung_s3c2410.cfg +++ b/tcl/target/samsung_s3c2410.cfg @@ -16,6 +16,7 @@ if { [info exists ENDIAN] } { if { [info exists CPUTAPID] } { set _CPUTAPID $CPUTAPID } else { + # Force an error until we get a good number. set _CPUTAPID 0xffffffff } diff --git a/tcl/target/samsung_s3c2440.cfg b/tcl/target/samsung_s3c2440.cfg index d3b665ff..9cd27d1e 100644 --- a/tcl/target/samsung_s3c2440.cfg +++ b/tcl/target/samsung_s3c2440.cfg @@ -19,7 +19,6 @@ if { [info exists ENDIAN] } { if { [info exists CPUTAPID ] } { set _CPUTAPID $CPUTAPID } else { - # force an error till we get a good number set _CPUTAPID 0x0032409d } diff --git a/tcl/target/samsung_s3c2450.cfg b/tcl/target/samsung_s3c2450.cfg index 00754260..164fe169 100644 --- a/tcl/target/samsung_s3c2450.cfg +++ b/tcl/target/samsung_s3c2450.cfg @@ -29,7 +29,6 @@ if { [info exists ENDIAN] } { if { [info exists CPUTAPID ] } { set _CPUTAPID $CPUTAPID } else { - # force an error till we get a good number set _CPUTAPID 0x07926f0f } diff --git a/tcl/target/samsung_s3c6410.cfg b/tcl/target/samsung_s3c6410.cfg index f9738c23..eb952428 100644 --- a/tcl/target/samsung_s3c6410.cfg +++ b/tcl/target/samsung_s3c6410.cfg @@ -23,14 +23,12 @@ if { [info exists ENDIAN] } { if { [info exists ETBTAPID ] } { set _ETBTAPID $ETBTAPID } else { - # force an error till we get a good number set _ETBTAPID 0x2b900f0f } if { [info exists CPUTAPID ] } { set _CPUTAPID $CPUTAPID } else { - # force an error till we get a good number set _CPUTAPID 0x07b76f0f } diff --git a/tcl/target/smp8634.cfg b/tcl/target/smp8634.cfg index 4f3959d5..dc9bf0bd 100644 --- a/tcl/target/smp8634.cfg +++ b/tcl/target/smp8634.cfg @@ -15,7 +15,6 @@ if { [info exists ENDIAN] } { if { [info exists CPUTAPID ] } { set _CPUTAPID $CPUTAPID } else { - # force an error till we get a good number set _CPUTAPID 0x08630001 } diff --git a/tcl/target/tmpa900.cfg b/tcl/target/tmpa900.cfg index cfb445e6..dd5d177d 100644 --- a/tcl/target/tmpa900.cfg +++ b/tcl/target/tmpa900.cfg @@ -14,7 +14,6 @@ set _ENDIAN little if { [info exists CPUTAPID ] } { set _CPUTAPID $CPUTAPID } else { - # force an error till we get a good number set _CPUTAPID 0x07926031 } diff --git a/tcl/target/tmpa910.cfg b/tcl/target/tmpa910.cfg index 4d4d3fc2..271ca57d 100644 --- a/tcl/target/tmpa910.cfg +++ b/tcl/target/tmpa910.cfg @@ -14,7 +14,6 @@ set _ENDIAN little if { [info exists CPUTAPID ] } { set _CPUTAPID $CPUTAPID } else { - # force an error till we get a good number set _CPUTAPID 0x07926031 } -- 2.39.5