From 31b47688ca5015bc91fb3480135a9e4efd53586a Mon Sep 17 00:00:00 2001 From: Spencer Oliver Date: Tue, 24 Aug 2010 20:50:20 +0100 Subject: cfg: update Luminary config files - Update all Luminary config's to use a common target/stellaris.cfg. - Add Luminary ek-lm3s6965 config. - Increase working area for boards with more ram. Signed-off-by: Spencer Oliver --- tcl/board/ek-lm3s1968.cfg | 3 ++- tcl/board/ek-lm3s3748.cfg | 3 +++ tcl/board/ek-lm3s6965.cfg | 19 +++++++++++++++++++ tcl/board/ek-lm3s811.cfg | 3 +-- tcl/board/ek-lm3s9b9x.cfg | 5 ++++- tcl/target/lm3s1968.cfg | 29 ----------------------------- tcl/target/lm3s6965.cfg | 38 -------------------------------------- tcl/target/lm3s9b9x.cfg | 33 --------------------------------- tcl/target/stellaris.cfg | 8 +++++++- 9 files changed, 36 insertions(+), 105 deletions(-) create mode 100644 tcl/board/ek-lm3s6965.cfg delete mode 100644 tcl/target/lm3s1968.cfg delete mode 100644 tcl/target/lm3s6965.cfg delete mode 100644 tcl/target/lm3s9b9x.cfg diff --git a/tcl/board/ek-lm3s1968.cfg b/tcl/board/ek-lm3s1968.cfg index cb83a3aa..184d368e 100644 --- a/tcl/board/ek-lm3s1968.cfg +++ b/tcl/board/ek-lm3s1968.cfg @@ -13,7 +13,8 @@ source [find interface/luminary.cfg] # include the target config -source [find target/lm3s1968.cfg] +set CHIPNAME lm3s1968 +source [find target/stellaris.cfg] # jtag speed adapter_khz 3000 diff --git a/tcl/board/ek-lm3s3748.cfg b/tcl/board/ek-lm3s3748.cfg index 4695c89e..acc62f63 100644 --- a/tcl/board/ek-lm3s3748.cfg +++ b/tcl/board/ek-lm3s3748.cfg @@ -5,6 +5,9 @@ # so is using it in JTAG mode, as done here. source [find interface/luminary.cfg] +# 20k working area +set WORKAREASIZE 0x4000 +set CHIPNAME lm3s3748 source [find target/stellaris.cfg] # Board has only srst diff --git a/tcl/board/ek-lm3s6965.cfg b/tcl/board/ek-lm3s6965.cfg new file mode 100644 index 00000000..e2cd1e2c --- /dev/null +++ b/tcl/board/ek-lm3s6965.cfg @@ -0,0 +1,19 @@ +# +# TI/Luminary Stellaris LM3S6965 Evaluation Kits +# +# http://www.luminarymicro.com/products/lm3s6965_ethernet_evaluation_kit.html + +# NOTE: using the on-board FT2232 JTAG/SWD/SWO interface is optional! +# so is using it in JTAG mode, as done here. +source [find interface/luminary.cfg] + +# 20k working area +set WORKAREASIZE 0x5000 +set CHIPNAME lm3s6965 +# include the target config +source [find target/stellaris.cfg] + +adapter_nsrst_delay 100 + +# LM3S6965 Evaluation Board has only srst +reset_config srst_only diff --git a/tcl/board/ek-lm3s811.cfg b/tcl/board/ek-lm3s811.cfg index f036bc5e..0dcc70c2 100644 --- a/tcl/board/ek-lm3s811.cfg +++ b/tcl/board/ek-lm3s811.cfg @@ -8,9 +8,8 @@ # NOTE: older '811-EK boards (before rev C) shouldn't use this. source [find interface/luminary.cfg] - set CHIPNAME lm3s811 - # include the target config +set CHIPNAME lm3s811 source [find target/stellaris.cfg] diff --git a/tcl/board/ek-lm3s9b9x.cfg b/tcl/board/ek-lm3s9b9x.cfg index 099e40d5..83f67319 100644 --- a/tcl/board/ek-lm3s9b9x.cfg +++ b/tcl/board/ek-lm3s9b9x.cfg @@ -8,7 +8,10 @@ # NOTE: using the bundled FT2232 JTAG/SWD/SWO interface is optional! # so is using in JTAG mode, as done here. source [find interface/luminary-icdi.cfg] -source [find target/lm3s9b9x.cfg] + +set WORKAREASIZE 0x4000 +set CHIPNAME lm3s9b9x +source [find target/stellaris.cfg] # jtag speed adapter_khz 500 diff --git a/tcl/target/lm3s1968.cfg b/tcl/target/lm3s1968.cfg deleted file mode 100644 index 330bb56a..00000000 --- a/tcl/target/lm3s1968.cfg +++ /dev/null @@ -1,29 +0,0 @@ -# Script for TI/Luminary Stellaris LM3S1968 - -if { [info exists CHIPNAME] } { - set _CHIPNAME $CHIPNAME -} else { - set _CHIPNAME lm3s1968 -} - -if { [info exists CPUTAPID ] } { - set _CPUTAPID $CPUTAPID -} else { - set _CPUTAPID 0x3ba00477 -} - -#jtag scan chain -jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 1 -irmask 0xf -expected-id $_CPUTAPID - -# 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 $_CHIPNAME.cpu -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 -set _FLASHNAME $_CHIPNAME.flash -flash bank $_FLASHNAME stellaris 0 0 0 0 $_TARGETNAME diff --git a/tcl/target/lm3s6965.cfg b/tcl/target/lm3s6965.cfg deleted file mode 100644 index 137cba9d..00000000 --- a/tcl/target/lm3s6965.cfg +++ /dev/null @@ -1,38 +0,0 @@ -# TI/Luminary Stellaris lm3s6965 - -if { [info exists CHIPNAME] } { - set _CHIPNAME $CHIPNAME -} else { - set _CHIPNAME lm3s6965 -} - -if { [info exists CPUTAPID ] } { - set _CPUTAPID $CPUTAPID -} else { - set _CPUTAPID 0x3ba00477 -} - -# jtag speed -adapter_khz 500 - -adapter_nsrst_delay 100 -jtag_ntrst_delay 100 - -#LM3S6965 Evaluation Board has only srst -reset_config srst_only - -#jtag scan chain -jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 1 -irmask 0xf -expected-id $_CPUTAPID - -# 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 $_CHIPNAME.cpu -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 -set _FLASHNAME $_CHIPNAME.flash -flash bank $_FLASHNAME stellaris 0 0 0 0 $_TARGETNAME diff --git a/tcl/target/lm3s9b9x.cfg b/tcl/target/lm3s9b9x.cfg deleted file mode 100644 index a727251f..00000000 --- a/tcl/target/lm3s9b9x.cfg +++ /dev/null @@ -1,33 +0,0 @@ -# -# Luminary Micro Stellaris LM3S9B9x Microcontroller -# -# http://www.luminarymicro.com/products/lm3s9b90.html -# http://www.luminarymicro.com/products/lm3s9b92.htm -# - -if { [info exists CHIPNAME] } { - set _CHIPNAME $CHIPNAME -} else { - set _CHIPNAME lm3s9b9x -} - -if { [info exists CPUTAPID ] } { - set _CPUTAPID $CPUTAPID -} else { - # Fourth generation "Tempest" device - set _CPUTAPID 0x4ba00477 -} - -#jtag scan chain -jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 1 -irmask 0xf -expected-id $_CPUTAPID - -#Cortex-M3 with Luminary lm3s variant -set _TARGETNAME $_CHIPNAME.cpu -target create $_TARGETNAME cortex_m3 -chain-position $_CHIPNAME.cpu -variant lm3s - -# 16k working area at base of ram, not backed up -$_TARGETNAME configure -work-area-phys 0x20000000 -work-area-size 0x4000 - -#flash configuration -set _FLASHNAME $_CHIPNAME.flash -flash bank $_FLASHNAME stellaris 0 0 0 0 $_TARGETNAME diff --git a/tcl/target/stellaris.cfg b/tcl/target/stellaris.cfg index 5f4428f5..4235f910 100644 --- a/tcl/target/stellaris.cfg +++ b/tcl/target/stellaris.cfg @@ -18,6 +18,12 @@ if { [info exists CPUTAPID ] } { set _CPUTAPID 0x0ba00477 } +if { [info exists WORKAREASIZE ] } { + set _WORKAREASIZE $WORKAREASIZE +} else { + set _WORKAREASIZE 0x2000 +} + jtag newtap $_CHIPNAME cpu -irlen 4 -irmask 0xf \ -expected-id $_CPUTAPID -ignore-version @@ -33,7 +39,7 @@ target create $_TARGETNAME cortex_m3 -chain-position $_CHIPNAME.cpu \ # NOTE: you may need or want to reconfigure the work area; # some parts have just 6K, and you may want to use other # addresses (at end of mem not beginning) or back it up. -$_TARGETNAME configure -work-area-phys 0x20000000 -work-area-size 0x2000 +$_TARGETNAME configure -work-area-phys 0x20000000 -work-area-size $_WORKAREASIZE # JTAG speed ... slow enough to work with a 12 MHz RC oscillator; # LM3S parts don't support RTCK -- cgit v1.2.3