interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

tcl/target: update esp32c2.cfg to reference shared functions in the esp_common.cfg 

This commit enhances code reusability, simplifies maintenance, and ensures
consistency across all chip configurations by consolidating commonly used
commands and variables into the common config file.

Change-Id: I825dd4fddb88e5514429d49ab13869ee6b9a28fc
Signed-off-by: Erhan Kurubas <erhan.kurubas@espressif.com>
This commit is contained in:
Erhan Kurubas 2023-07-18 00:44:06 +02:00
parent cd36a25865
commit c7500f9161
1 changed files with 69 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
tcl/target/esp32c2.cfg
View File

@ -1,30 +1,20 @@
# SPDX-License-Identifier: GPL-2.0-or-later # SPDX-License-Identifier: GPL-2.0-or-later
# #
# The ESP32-C2 only supports JTAG.
transport select jtag
# Source the ESP common configuration file # Source the ESP common configuration file.
source [find target/esp_common.cfg] source [find target/esp_common.cfg]
if { [info exists CHIPNAME] } { # Target specific global variables
set _CHIPNAME $CHIPNAME set _CHIPNAME "riscv"
} else { set _CPUTAPID 0x0000cc25
set _CHIPNAME esp32c2 set _ESP_ARCH "riscv"
} set _ONLYCPU 1
set _ESP_SMP_TARGET 0
set _ESP_SMP_BREAK 0
set _ESP_EFUSE_MAC_ADDR_REG 0x60008840
if { [info exists CPUTAPID] } { # Target specific functions should be implemented for each riscv chips.
set _CPUTAPID $CPUTAPID proc riscv_wdt_disable { } {
} else {
set _CPUTAPID 0x0000cc25
}
set _TARGETNAME $_CHIPNAME
set _CPUNAME cpu
set _TAPNAME $_CHIPNAME.$_CPUNAME
jtag newtap $_CHIPNAME $_CPUNAME -irlen 5 -expected-id $_CPUTAPID
proc esp32c2_wdt_disable { } {
# Halt event can occur during config phase (before "init" is done). # Halt event can occur during config phase (before "init" is done).
# Ignore it since mww commands don't work at that time. # Ignore it since mww commands don't work at that time.
if { [string compare [command mode] config] == 0 } { if { [string compare [command mode] config] == 0 } {
@ -42,9 +32,9 @@ proc esp32c2_wdt_disable { } {
mww 0x600080A0 0x84B00000 mww 0x600080A0 0x84B00000
} }
# This is almost identical with the esp32c3_soc_reset. proc riscv_soc_reset { } {
# Will be refactored with the other common settings. global _RISCV_DMCONTROL
proc esp32c2_soc_reset { } {
# This procedure does "digital system reset", i.e. resets # This procedure does "digital system reset", i.e. resets
# all the peripherals except for the RTC block. # all the peripherals except for the RTC block.
# It is called from reset-assert-post target event callback, # It is called from reset-assert-post target event callback,
@ -52,7 +42,7 @@ proc esp32c2_soc_reset { } {
# Since we need the hart to to execute a write to RTC_CNTL_SW_SYS_RST, # Since we need the hart to to execute a write to RTC_CNTL_SW_SYS_RST,
# temporarily take it out of reset. Save the dmcontrol state before # temporarily take it out of reset. Save the dmcontrol state before
# doing so. # doing so.
riscv dmi_write 0x10 0x80000001 riscv dmi_write $_RISCV_DMCONTROL 0x80000001
# Trigger the reset # Trigger the reset
mww 0x60008000 0x9c00a000 mww 0x60008000 0x9c00a000
# Workaround for stuck in cpu start during calibration. # Workaround for stuck in cpu start during calibration.
@ -62,50 +52,66 @@ proc esp32c2_soc_reset { } {
sleep 10 sleep 10
poll poll
# Disable the watchdogs again # Disable the watchdogs again
esp32c2_wdt_disable riscv_wdt_disable
# Here debugger reads allresumeack and allhalted bits as set (0x330a2) # Here debugger reads allresumeack and allhalted bits as set (0x330a2)
# We will clean allhalted state by resuming the core. # We will clean allhalted state by resuming the core.
riscv dmi_write 0x10 0x40000001 riscv dmi_write $_RISCV_DMCONTROL 0x40000001
# Put the hart back into reset state. Note that we need to keep haltreq set. # Put the hart back into reset state. Note that we need to keep haltreq set.
riscv dmi_write 0x10 0x80000003 riscv dmi_write $_RISCV_DMCONTROL 0x80000003
} }
if { $_RTOS == "none" } { proc riscv_memprot_is_enabled { } {
target create $_TARGETNAME riscv -chain-position $_TAPNAME global _RISCV_ABS_CMD _RISCV_ABS_DATA0
} else {
target create $_TARGETNAME riscv -chain-position $_TAPNAME -rtos $_RTOS
}
$_TARGETNAME configure -event reset-assert-post { esp32c2_soc_reset } # PMPADDR 0-1 covers entire valid IRAM range and PMPADDR 2-3 covers entire DRAM region
$_TARGETNAME configure -event halted { # pmpcfg0 holds the configuration for the PMP 0-3 address registers
esp32c2_wdt_disable
} # read pmpcfg0 and extract into 8-bit variables.
$_TARGETNAME configure -event examine-end { riscv dmi_write $_RISCV_ABS_CMD 0x2203a0
# Need this to handle 'apptrace init' syscall correctly because semihosting is not enabled by default set pmpcfg0 [riscv dmi_read $_RISCV_ABS_DATA0]
arm semihosting enable
arm semihosting_resexit enable set pmp0cfg [expr {($pmpcfg0 >> (8 * 0)) & 0xFF}]
if { [info exists _SEMIHOST_BASEDIR] } { set pmp1cfg [expr {($pmpcfg0 >> (8 * 1)) & 0xFF}]
if { $_SEMIHOST_BASEDIR != "" } { set pmp2cfg [expr {($pmpcfg0 >> (8 * 2)) & 0xFF}]
# TODO: cherry-pick from upstream set pmp3cfg [expr {($pmpcfg0 >> (8 * 3)) & 0xFF}]
# https://review.openocd.org/c/openocd/+/6888
# https://review.openocd.org/c/openocd/+/7005 # read PMPADDR 0-3
# arm semihosting_basedir $_SEMIHOST_BASEDIR riscv dmi_write $_RISCV_ABS_CMD 0x2203b0
set pmpaddr0 [expr {[riscv dmi_read $_RISCV_ABS_DATA0] << 2}]
riscv dmi_write $_RISCV_ABS_CMD 0x2203b1
set pmpaddr1 [expr {[riscv dmi_read $_RISCV_ABS_DATA0] << 2}]
riscv dmi_write $_RISCV_ABS_CMD 0x2203b2
set pmpaddr2 [expr {[riscv dmi_read $_RISCV_ABS_DATA0] << 2}]
riscv dmi_write $_RISCV_ABS_CMD 0x2203b3
set pmpaddr3 [expr {[riscv dmi_read $_RISCV_ABS_DATA0] << 2}]
set IRAM_LOW 0x40380000
set IRAM_HIGH 0x403C0000
set DRAM_LOW 0x3FCA0000
set DRAM_HIGH 0x3FCE0000
set PMP_RWX 0x07
set PMP_RW 0x03
# The lock bit remains unset during the execution of the 2nd stage bootloader.
# Thus we do not perform a lock bit check for IRAM and DRAM regions.
# Check OpenOCD can write and execute from IRAM.
if {$pmpaddr0 >= $IRAM_LOW && $pmpaddr1 <= $IRAM_HIGH} {
if {($pmp0cfg & $PMP_RWX) != 0 || ($pmp1cfg & $PMP_RWX) != $PMP_RWX} {
return 1
} }
} }
}
$_TARGETNAME configure -event gdb-attach { # Check OpenOCD can read/write entire DRAM region.
halt 1000 if {$pmpaddr2 >= $DRAM_LOW && $pmpaddr3 <= $DRAM_HIGH} {
# by default mask interrupts while stepping if {($pmp2cfg & $PMP_RW) != 0 && ($pmp3cfg & $PMP_RW) != $PMP_RW} {
riscv set_maskisr steponly return 1
}
}
return 0
} }
gdb_breakpoint_override hard create_esp_target $_ESP_ARCH
riscv set_reset_timeout_sec 2
riscv set_command_timeout_sec 5
riscv set_mem_access sysbus progbuf abstract
riscv set_ebreakm on
riscv set_ebreaks on
riscv set_ebreaku on