interesting
/
riscv-openocd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tcl/target/ti_k3: Set _CHIPNAME in one place 

$_soc is set per platform, no point in duplicating _CHIPNAME to
explicitly set the information provided by $_CHIPNAME itself.

So move it out after the check for CHIP_NAME

Signed-off-by: Nishanth Menon <nm@ti.com>
Change-Id: I60d30d6a9a2ce352f66c5bc03075e4ba638e3062
Reviewed-on: https://review.openocd.org/c/openocd/+/7889
Tested-by: jenkins
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
This commit is contained in:
Nishanth Menon 2023-09-06 10:10:20 -05:00 committed by Antonio Borneo
parent c20cb28faf
commit db1bbbf6a4
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tcl/target/ti_k3.cfg
View File

@ -63,7 +63,6 @@ set _gp_mcu_ap_unlock_offsets {0xf0 0x60}
# Set configuration overrides for each SOC # Set configuration overrides for each SOC
switch $_soc { switch $_soc {
am654 { am654 {
set _CHIPNAME am654
set _K3_DAP_TAPID 0x0bb5a02f set _K3_DAP_TAPID 0x0bb5a02f
# AM654 has 2 clusters of 2 A53 cores each. # AM654 has 2 clusters of 2 A53 cores each.
@ -78,7 +77,6 @@ switch $_soc {
set _sysctrl_ap_unlock_offsets {0xf0 0x50} set _sysctrl_ap_unlock_offsets {0xf0 0x50}
} }
am642 { am642 {
set _CHIPNAME am642
set _K3_DAP_TAPID 0x0bb3802f set _K3_DAP_TAPID 0x0bb3802f
# AM642 has 1 clusters of 2 A53 cores each. # AM642 has 1 clusters of 2 A53 cores each.
@ -97,7 +95,6 @@ switch $_soc {
set _gp_mcu_cores 1 set _gp_mcu_cores 1
} }
am625 { am625 {
set _CHIPNAME am625
set _K3_DAP_TAPID 0x0bb7e02f set _K3_DAP_TAPID 0x0bb7e02f
# AM625 has 1 clusters of 4 A53 cores. # AM625 has 1 clusters of 4 A53 cores.
@ -132,7 +129,6 @@ switch $_soc {
set _dmem_emu_ap_list 1 set _dmem_emu_ap_list 1
} }
am62a7 { am62a7 {
set _CHIPNAME am62a7
set _K3_DAP_TAPID 0x0bb8d02f set _K3_DAP_TAPID 0x0bb8d02f
# AM62a7 has 1 clusters of 4 A53 cores. # AM62a7 has 1 clusters of 4 A53 cores.
@ -153,7 +149,6 @@ switch $_soc {
set _sysctrl_ap_unlock_offsets {0xf0 0x78} set _sysctrl_ap_unlock_offsets {0xf0 0x78}
} }
j721e { j721e {
set _CHIPNAME j721e
set _K3_DAP_TAPID 0x0bb6402f set _K3_DAP_TAPID 0x0bb6402f
# J721E has 1 cluster of 2 A72 cores. # J721E has 1 cluster of 2 A72 cores.
set _armv8_cpu_name a72 set _armv8_cpu_name a72
@ -173,7 +168,6 @@ switch $_soc {
set _dmem_emu_ap_list 1 set _dmem_emu_ap_list 1
} }
j7200 { j7200 {
set _CHIPNAME j7200
set _K3_DAP_TAPID 0x0bb6d02f set _K3_DAP_TAPID 0x0bb6d02f
# J7200 has 1 cluster of 2 A72 cores. # J7200 has 1 cluster of 2 A72 cores.
@ -189,7 +183,6 @@ switch $_soc {
set CM3_CTIBASE {0x20001000} set CM3_CTIBASE {0x20001000}
} }
j721s2 { j721s2 {
set _CHIPNAME j721s2
set _K3_DAP_TAPID 0x0bb7502f set _K3_DAP_TAPID 0x0bb7502f
# J721s2 has 1 cluster of 2 A72 cores. # J721s2 has 1 cluster of 2 A72 cores.
@ -213,6 +206,8 @@ switch $_soc {
} }
} }
set _CHIPNAME $_soc
swj_newdap $_CHIPNAME cpu -irlen 4 -expected-id $_K3_DAP_TAPID -ignore-version swj_newdap $_CHIPNAME cpu -irlen 4 -expected-id $_K3_DAP_TAPID -ignore-version
dap create $_CHIPNAME.dap -chain-position $_CHIPNAME.cpu dap create $_CHIPNAME.dap -chain-position $_CHIPNAME.cpu