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

diff --git a/tcl/target/bluefield.cfg b/tcl/target/bluefield.cfg
index b31dfe8d677799490d2cf74dbd1ceb9bca4bba90..62b1e31650d105c97573a4e496f9ef520c579c98 100644 (file)
--- a/tcl/target/bluefield.cfg
+++ b/tcl/target/bluefield.cfg
@@ -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"

diff --git a/tcl/target/hi3798.cfg b/tcl/target/hi3798.cfg
index aa811d44def9d024c971b3cfd5187d25ca7112c4..7b1921895e24431acaef70cdd0c67d8750b35b5c 100644 (file)
--- a/tcl/target/hi3798.cfg
+++ b/tcl/target/hi3798.cfg
@@ -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"

diff --git a/tcl/target/hi6220.cfg b/tcl/target/hi6220.cfg
index c2feb0b36b72b5ab152a0b5bc5de1688687cae08..ddeeaad7cda97374c812c19436ebe7f13dac257b 100644 (file)
--- a/tcl/target/hi6220.cfg
+++ b/tcl/target/hi6220.cfg
@@ -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

diff --git a/tcl/target/imx8m.cfg b/tcl/target/imx8m.cfg
index e3b7d24e1e69c66c5b4e81306dffc764441a48b7..9a8bfecb1c667be20c4e156567aa9bc0b43dc517 100644 (file)
--- a/tcl/target/imx8m.cfg
+++ b/tcl/target/imx8m.cfg
@@ -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"

diff --git a/tcl/target/ls1012a.cfg b/tcl/target/ls1012a.cfg
index 19d3e58389837a46bd963d20944a85cc9da90a08..e1bd168445bb3cbdc5455652073a9b050dfb31fa 100644 (file)
--- a/tcl/target/ls1012a.cfg
+++ b/tcl/target/ls1012a.cfg
@@ -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

diff --git a/tcl/target/marvell/88f37x0.cfg b/tcl/target/marvell/88f37x0.cfg
index 5e75135885f4ee57161ec262570a22c2c3238bea..5c3dd737e30fa8ab195a1c60d5b6d9fc64661964 100644 (file)
--- a/tcl/target/marvell/88f37x0.cfg
+++ b/tcl/target/marvell/88f37x0.cfg
@@ -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 \

diff --git a/tcl/target/renesas_rcar_gen3.cfg b/tcl/target/renesas_rcar_gen3.cfg
index 72f185d61bf1af43fbfff6f48a1b9a9f5312e0dd..5738d371c6eeb2267ef88a2cf061fd52bf7a3b88 100644 (file)
--- a/tcl/target/renesas_rcar_gen3.cfg
+++ b/tcl/target/renesas_rcar_gen3.cfg
@@ -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 } {

diff --git a/tcl/target/rk3308.cfg b/tcl/target/rk3308.cfg
index d3d409eaf19844011069b870593d1d1378597155..b55109312c8aa59f6fa197e326ae6f4a67dcdb67 100644 (file)
--- a/tcl/target/rk3308.cfg
+++ b/tcl/target/rk3308.cfg
@@ -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 \

diff --git a/tcl/target/stm32h7x.cfg b/tcl/target/stm32h7x.cfg
index 5220af3b1c4b3d94b740a45ed6de872e9b2d63d9..4a04929aa580830d200169ff0e081e85038ef0d9 100644 (file)
--- a/tcl/target/stm32h7x.cfg
+++ b/tcl/target/stm32h7x.cfg
@@ -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 }

diff --git a/tcl/target/stm32mp15x.cfg b/tcl/target/stm32mp15x.cfg
index f2ba94eec3797d1e8e7a01e899364f3868e2d299..4a8bc866c767ae341552ba580ebf60a0de6ac5a5 100644 (file)
--- a/tcl/target/stm32mp15x.cfg
+++ b/tcl/target/stm32mp15x.cfg
@@ -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

diff --git a/tcl/target/xilinx_zynqmp.cfg b/tcl/target/xilinx_zynqmp.cfg
index 9be781cd8f72e9dd0caad666a55df3d46c93fed0..b21603f6200ebe234269834d0402594825d559eb 100644 (file)
--- a/tcl/target/xilinx_zynqmp.cfg
+++ b/tcl/target/xilinx_zynqmp.cfg
@@ -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"