tcl: replace '-ctibase' with '-baseaddr'
Replace the deprecated option '-ctibase' with the generic option '-baseaddr'. Change generated with command: sed -i 's/-ctibase/-baseaddr/g' $(find tcl/ -type f) Change-Id: If776934d2ac106532708768bb3a4ec6fcffb0368 Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com> Reviewed-on: http://openocd.zylin.com/5870 Tested-by: jenkins
This commit is contained in:
parent
ec0c23a3ab
commit
360b2c2701
|
@ -46,7 +46,7 @@ set _cores 16
|
|||
|
||||
# Create each core
|
||||
for { set _core $_core_start } { $_core < $_core_start + $_cores } { incr _core 1 } {
|
||||
cti create cti$_core -dap $_CHIPNAME.dap -ctibase [set $_TARGETNAME.cti($_core)] -ap-num 0
|
||||
cti create cti$_core -dap $_CHIPNAME.dap -baseaddr [set $_TARGETNAME.cti($_core)] -ap-num 0
|
||||
|
||||
set _command "target create ${_TARGETNAME}$_core aarch64 \
|
||||
-dap $_CHIPNAME.dap -coreid $_core -cti cti$_core"
|
||||
|
|
|
@ -30,7 +30,7 @@ set $_TARGETNAME.cti(3) 0x80320000
|
|||
set _cores 4
|
||||
for { set _core 0 } { $_core < $_cores } { incr _core 1 } {
|
||||
|
||||
cti create cti$_core -dap $_CHIPNAME.dap -ctibase [set $_TARGETNAME.cti($_core)] -ap-num 0
|
||||
cti create cti$_core -dap $_CHIPNAME.dap -baseaddr [set $_TARGETNAME.cti($_core)] -ap-num 0
|
||||
|
||||
set _command "target create ${_TARGETNAME}$_core aarch64 \
|
||||
-dap $_CHIPNAME.dap -coreid $_core -cti cti$_core"
|
||||
|
|
|
@ -37,7 +37,7 @@ set $_TARGETNAME.cti(7) 0x801DB000
|
|||
set _cores 8
|
||||
for { set _core 0 } { $_core < $_cores } { incr _core 1 } {
|
||||
|
||||
cti create cti$_core -dap $_CHIPNAME.dap -ctibase [set $_TARGETNAME.cti($_core)] -ap-num 0
|
||||
cti create cti$_core -dap $_CHIPNAME.dap -baseaddr [set $_TARGETNAME.cti($_core)] -ap-num 0
|
||||
|
||||
set _command "target create ${_TARGETNAME}$_core aarch64 \
|
||||
-dap $_CHIPNAME.dap -coreid $_core -cti cti$_core"
|
||||
|
@ -57,7 +57,7 @@ for { set _core 0 } { $_core < $_cores } { incr _core 1 } {
|
|||
|
||||
eval $_smp_command
|
||||
|
||||
cti create cti.sys -dap $_CHIPNAME.dap -ap-num 0 -ctibase 0x80003000
|
||||
cti create cti.sys -dap $_CHIPNAME.dap -ap-num 0 -baseaddr 0x80003000
|
||||
|
||||
# declare the auxiliary Cortex-M3 core on AP #2 (runs mcuimage.bin)
|
||||
target create ${_TARGETNAME}.m3 cortex_m -dap $_CHIPNAME.dap -ap-num 2 -defer-examine
|
||||
|
|
|
@ -35,7 +35,7 @@ set CTIBASE {0x80420000 0x80520000 0x80620000 0x80720000}
|
|||
for { set _core 0 } { $_core < $_cores } { incr _core } {
|
||||
|
||||
cti create $_CTINAME.$_core -dap $_CHIPNAME.dap -ap-num 1 \
|
||||
-ctibase [lindex $CTIBASE $_core]
|
||||
-baseaddr [lindex $CTIBASE $_core]
|
||||
|
||||
set _command "target create $_TARGETNAME.$_core aarch64 -dap $_CHIPNAME.dap \
|
||||
-dbgbase [lindex $DBGBASE $_core] -cti $_CTINAME.$_core"
|
||||
|
|
|
@ -25,7 +25,7 @@ jtag newtap $_CHIPNAME sap -irlen 8 -expected-id $_SAP_TAPID
|
|||
|
||||
dap create $_CHIPNAME.dap -chain-position $_CHIPNAME.dap
|
||||
|
||||
cti create $_CHIPNAME.cti -dap $_CHIPNAME.dap -ap-num 1 -ctibase 0x80420000
|
||||
cti create $_CHIPNAME.cti -dap $_CHIPNAME.dap -ap-num 1 -baseaddr 0x80420000
|
||||
|
||||
set _TARGETNAME $_CHIPNAME.cpu
|
||||
target create $_TARGETNAME aarch64 -dap $_CHIPNAME.dap -dbgbase 0x80410000 -cti $_CHIPNAME.cti
|
||||
|
|
|
@ -44,7 +44,7 @@ set _smp_command ""
|
|||
|
||||
for { set _core 0 } { $_core < $_cores } { incr _core 1 } {
|
||||
|
||||
cti create cti$_core -dap $_CHIPNAME.dap -ctibase [lindex $_ctis $_core] -ap-num 0
|
||||
cti create cti$_core -dap $_CHIPNAME.dap -baseaddr [lindex $_ctis $_core] -ap-num 0
|
||||
|
||||
set _command "target create ${_TARGETNAME}$_core aarch64 \
|
||||
-dap $_CHIPNAME.dap -coreid $_core \
|
||||
|
|
|
@ -122,7 +122,7 @@ proc setup_a5x {core_name dbgbase ctibase num boot} {
|
|||
set _TARGETNAME $_CHIPNAME.$core_name.$_core
|
||||
set _CTINAME $_TARGETNAME.cti
|
||||
cti create $_CTINAME -dap $_DAPNAME -ap-num 1 \
|
||||
-ctibase [lindex $ctibase $_core]
|
||||
-baseaddr [lindex $ctibase $_core]
|
||||
set _command "target create $_TARGETNAME aarch64 -dap $_DAPNAME \
|
||||
-ap-num 1 -dbgbase [lindex $dbgbase $_core] -cti $_CTINAME"
|
||||
if { $_core == 0 && $boot == 1 } {
|
||||
|
@ -140,7 +140,7 @@ proc setup_cr7 {dbgbase ctibase boot} {
|
|||
global _DAPNAME
|
||||
set _TARGETNAME $_CHIPNAME.r7
|
||||
set _CTINAME $_TARGETNAME.cti
|
||||
cti create $_CTINAME -dap $_DAPNAME -ap-num 1 -ctibase $ctibase
|
||||
cti create $_CTINAME -dap $_DAPNAME -ap-num 1 -baseaddr $ctibase
|
||||
set _command "target create $_TARGETNAME cortex_r4 -dap $_DAPNAME \
|
||||
-ap-num 1 -dbgbase $dbgbase"
|
||||
if { $boot == 1 } {
|
||||
|
|
|
@ -45,7 +45,7 @@ set $_TARGETNAME.cti(3) 0x8101b000
|
|||
set _cores 4
|
||||
for { set _core 0 } { $_core < $_cores } { incr _core 1 } {
|
||||
|
||||
cti create cti$_core -dap $_CHIPNAME.dap -ctibase [set $_TARGETNAME.cti($_core)] -ap-num 0
|
||||
cti create cti$_core -dap $_CHIPNAME.dap -baseaddr [set $_TARGETNAME.cti($_core)] -ap-num 0
|
||||
|
||||
set _command "target create ${_TARGETNAME}$_core aarch64 \
|
||||
-dap $_CHIPNAME.dap -coreid $_core -cti cti$_core \
|
||||
|
|
|
@ -228,8 +228,8 @@ proc stm32h7x_dbgmcu_mmw {reg_offset setbits clearbits} {
|
|||
|
||||
if {[set $_CHIPNAME.USE_CTI]} {
|
||||
# create CTI instances for both cores
|
||||
cti create $_CHIPNAME.cti0 -dap $_CHIPNAME.dap -ap-num 0 -ctibase 0xE0043000
|
||||
cti create $_CHIPNAME.cti1 -dap $_CHIPNAME.dap -ap-num 3 -ctibase 0xE0043000
|
||||
cti create $_CHIPNAME.cti0 -dap $_CHIPNAME.dap -ap-num 0 -baseaddr 0xE0043000
|
||||
cti create $_CHIPNAME.cti1 -dap $_CHIPNAME.dap -ap-num 3 -baseaddr 0xE0043000
|
||||
|
||||
$_CHIPNAME.cpu0 configure -event halted { stm32h7x_cti_prepare_restart_all }
|
||||
$_CHIPNAME.cpu1 configure -event halted { stm32h7x_cti_prepare_restart_all }
|
||||
|
|
|
@ -59,10 +59,10 @@ $_CHIPNAME.cpu1 cortex_a maskisr on
|
|||
$_CHIPNAME.cpu0 cortex_a dacrfixup on
|
||||
$_CHIPNAME.cpu1 cortex_a dacrfixup on
|
||||
|
||||
cti create $_CHIPNAME.cti.sys -dap $_CHIPNAME.dap -ap-num 1 -ctibase 0xE0094000
|
||||
cti create $_CHIPNAME.cti.cpu0 -dap $_CHIPNAME.dap -ap-num 1 -ctibase 0xE00D8000
|
||||
cti create $_CHIPNAME.cti.cpu1 -dap $_CHIPNAME.dap -ap-num 1 -ctibase 0xE00D9000
|
||||
cti create $_CHIPNAME.cti.cm4 -dap $_CHIPNAME.dap -ap-num 2 -ctibase 0xE0043000
|
||||
cti create $_CHIPNAME.cti.sys -dap $_CHIPNAME.dap -ap-num 1 -baseaddr 0xE0094000
|
||||
cti create $_CHIPNAME.cti.cpu0 -dap $_CHIPNAME.dap -ap-num 1 -baseaddr 0xE00D8000
|
||||
cti create $_CHIPNAME.cti.cpu1 -dap $_CHIPNAME.dap -ap-num 1 -baseaddr 0xE00D9000
|
||||
cti create $_CHIPNAME.cti.cm4 -dap $_CHIPNAME.dap -ap-num 2 -baseaddr 0xE0043000
|
||||
|
||||
# interface does not work while srst is asserted
|
||||
# this is target specific, valid for every board
|
||||
|
|
|
@ -74,7 +74,7 @@ set _cores 4
|
|||
for { set _core 0 } { $_core < $_cores } { incr _core } {
|
||||
|
||||
cti create $_CTINAME.$_core -dap $_CHIPNAME.dap -ap-num 1 \
|
||||
-ctibase [lindex $CTIBASE $_core]
|
||||
-baseaddr [lindex $CTIBASE $_core]
|
||||
|
||||
set _command "target create $_TARGETNAME.$_core aarch64 -dap $_CHIPNAME.dap \
|
||||
-dbgbase [lindex $DBGBASE $_core] -cti $_CTINAME.$_core"
|
||||
|
|
Loading…
Reference in New Issue