From 7b4428df971378bfc4d762595cdb0e205626eaa9 Mon Sep 17 00:00:00 2001 From: oharboe Date: Tue, 18 Aug 2009 10:27:24 +0000 Subject: [PATCH] David Brownell Cleanup the Stellaris target configs: - remove endianness options; these chips hard-wire "little" - $_TARGETNAME updates: * don't pass $_TARGETNAME where a TAP label is required * flash config uses $_TARGETNAME (it might not be target #0) * simplify one $_TARGETNAME construction - update work area setup: * remove VM spec; these chips have no VM! * fix some wrong sizes (0x4000 == 16K, not 4K) * simplify: take defaults - comment fixups git-svn-id: svn://svn.berlios.de/openocd/trunk@2589 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- tcl/target/lm3s1968.cfg | 15 ++++----------- tcl/target/lm3s3748.cfg | 12 ++---------- tcl/target/lm3s6965.cfg | 21 ++++++--------------- tcl/target/lm3s811.cfg | 15 ++++----------- tcl/target/lm3s9b9x.cfg | 17 +++++------------ 5 files changed, 21 insertions(+), 59 deletions(-) diff --git a/tcl/target/lm3s1968.cfg b/tcl/target/lm3s1968.cfg index eebdcdc4b5..3f0cdfcfd6 100644 --- a/tcl/target/lm3s1968.cfg +++ b/tcl/target/lm3s1968.cfg @@ -6,13 +6,6 @@ if { [info exists CHIPNAME] } { set _CHIPNAME lm3s1968 } -if { [info exists ENDIAN] } { - set _ENDIAN $ENDIAN -} else { - # this defaults to a little endian - set _ENDIAN little -} - if { [info exists CPUTAPID ] } { set _CPUTAPID $CPUTAPID } else { @@ -26,10 +19,10 @@ jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 1 -irmask 0xf -expected-id $_CPUT # this stops the debug registers from being cleared # this will be fixed in later revisions of silicon set _TARGETNAME $_CHIPNAME.cpu -target create $_TARGETNAME cortex_m3 -endian $_ENDIAN -chain-position $_TARGETNAME -variant lm3s +target create $_TARGETNAME cortex_m3 -chain-position $_CHIPNAME.cpu -variant lm3s -# 4k working area at base of ram -$_TARGETNAME configure -work-area-virt 0 -work-area-phys 0x20000000 -work-area-size 0x4000 -work-area-backup 0 +# 8k working area at base of ram, not backed up +$_TARGETNAME configure -work-area-phys 0x20000000 -work-area-size 0x2000 #flash configuration -flash bank stellaris 0 0 0 0 0 +flash bank stellaris 0 0 0 0 $_TARGETNAME diff --git a/tcl/target/lm3s3748.cfg b/tcl/target/lm3s3748.cfg index 47cf72ef05..3fdbd79876 100644 --- a/tcl/target/lm3s3748.cfg +++ b/tcl/target/lm3s3748.cfg @@ -6,13 +6,6 @@ if { [info exists CHIPNAME] } { set _CHIPNAME lm3s3748 } -if { [info exists ENDIAN] } { - set _ENDIAN $ENDIAN -} else { - # this defaults to a little endian - set _ENDIAN little -} - if { [info exists CPUTAPID ] } { set _CPUTAPID $CPUTAPID } else { @@ -26,11 +19,10 @@ jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 1 -irmask 0xf -expected-id $_CPUT # parts (third generation, includes LM3S3748). It keeps the debug registers # from being cleared, by using software reset not SRST; NOP on newer revs. set _TARGETNAME $_CHIPNAME.cpu -target create $_TARGETNAME cortex_m3 -endian $_ENDIAN \ - -chain-position $_TARGETNAME -variant lm3s +target create $_TARGETNAME cortex_m3 -chain-position $_CHIPNAME.cpu -variant lm3s # 8k working area at base of ram, not backed up $_TARGETNAME configure -work-area-phys 0x20000000 -work-area-size 0x2000 # flash configuration -- one bank of 128K -flash bank stellaris 0 0 0 0 0 +flash bank stellaris 0 0 0 0 $_TARGETNAME diff --git a/tcl/target/lm3s6965.cfg b/tcl/target/lm3s6965.cfg index 27b104ff78..c12b48d78a 100644 --- a/tcl/target/lm3s6965.cfg +++ b/tcl/target/lm3s6965.cfg @@ -1,5 +1,4 @@ -# script for luminary lm3s6965 - +# TI/Luminary Stellaris lm3s6965 if { [info exists CHIPNAME] } { set _CHIPNAME $CHIPNAME @@ -7,17 +6,9 @@ if { [info exists CHIPNAME] } { set _CHIPNAME lm3s6965 } -if { [info exists ENDIAN] } { - set _ENDIAN $ENDIAN -} else { - # this defaults to a little endian - set _ENDIAN little -} - if { [info exists CPUTAPID ] } { set _CPUTAPID $CPUTAPID } else { - # force an error till we get a good number set _CPUTAPID 0x3ba00477 } @@ -36,11 +27,11 @@ jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 1 -irmask 0xf -expected-id $_CPUT # the luminary variant causes a software reset rather than asserting SRST # this stops the debug registers from being cleared # this will be fixed in later revisions of silicon -set _TARGETNAME [format "%s.cpu" $_CHIPNAME] -target create $_TARGETNAME cortex_m3 -endian $_ENDIAN -chain-position $_TARGETNAME -variant lm3s +set _TARGETNAME $_CHIPNAME.cpu +target create $_TARGETNAME cortex_m3 -chain-position $_CHIPNAME.cpu -variant lm3s -# 4k working area at base of ram -$_TARGETNAME configure -work-area-virt 0 -work-area-phys 0x20000000 -work-area-size 0x4000 -work-area-backup 0 +# 8k working area at base of ram, not backed up +$_TARGETNAME configure -work-area-phys 0x20000000 -work-area-size 0x2000 #flash configuration -flash bank stellaris 0 0 0 0 0 +flash bank stellaris 0 0 0 0 $_TARGETNAME diff --git a/tcl/target/lm3s811.cfg b/tcl/target/lm3s811.cfg index 635e22e69c..f9e29832f0 100644 --- a/tcl/target/lm3s811.cfg +++ b/tcl/target/lm3s811.cfg @@ -6,13 +6,6 @@ if { [info exists CHIPNAME] } { set _CHIPNAME lm3s811 } -if { [info exists ENDIAN] } { - set _ENDIAN $ENDIAN -} else { - # this defaults to a little endian - set _ENDIAN little -} - if { [info exists CPUTAPID ] } { set _CPUTAPID $CPUTAPID } else { @@ -26,10 +19,10 @@ jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 1 -irmask 0xf -expected-id $_CPUT # this stops the debug registers from being cleared # this will be fixed in later revisions of silicon set _TARGETNAME $_CHIPNAME.cpu -target create $_TARGETNAME cortex_m3 -endian $_ENDIAN -chain-position $_TARGETNAME -variant lm3s +target create $_TARGETNAME cortex_m3 -chain-position $_CHIPNAME.cpu -variant lm3s -# 8k working area at base of ram -$_TARGETNAME configure -work-area-virt 0 -work-area-phys 0x20000000 -work-area-size 0x2000 -work-area-backup 0 +# 8k working area at base of ram, not backed up +$_TARGETNAME configure -work-area-phys 0x20000000 -work-area-size 0x2000 #flash configuration -flash bank stellaris 0 0 0 0 0 +flash bank stellaris 0 0 0 0 $_TARGETNAME diff --git a/tcl/target/lm3s9b9x.cfg b/tcl/target/lm3s9b9x.cfg index e5a5b504ac..56f492f617 100644 --- a/tcl/target/lm3s9b9x.cfg +++ b/tcl/target/lm3s9b9x.cfg @@ -11,17 +11,10 @@ if { [info exists CHIPNAME] } { set _CHIPNAME lm3s9b9x } -if { [info exists ENDIAN] } { - set _ENDIAN $ENDIAN -} else { - # this defaults to a little endian - set _ENDIAN little -} - if { [info exists CPUTAPID ] } { set _CPUTAPID $CPUTAPID } else { - # forth generation Tempest device + # Fourth generation "Tempest" device set _CPUTAPID 0x4ba00477 } @@ -30,10 +23,10 @@ jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 1 -irmask 0xf -expected-id $_CPUT #Cortex-M3 with Luminary lm3s variant set _TARGETNAME $_CHIPNAME.cpu -target create $_TARGETNAME cortex_m3 -endian $_ENDIAN -chain-position $_TARGETNAME -variant lm3s +target create $_TARGETNAME cortex_m3 -chain-position $_CHIPNAME.cpu -variant lm3s -# 16k working area at base of ram -$_TARGETNAME configure -work-area-virt 0 -work-area-phys 0x20000000 -work-area-size 0x4000 -work-area-backup 0 +# 16k working area at base of ram, not backed up +$_TARGETNAME configure -work-area-phys 0x20000000 -work-area-size 0x4000 #flash configuration -flash bank stellaris 0 0 0 0 0 +flash bank stellaris 0 0 0 0 $_TARGETNAME -- 2.30.2