tcl/target: update esp32s2.cfg to reference shared functions in the esp_common.cfg 46/7746/2
authorErhan Kurubas <erhan.kurubas@espressif.com>
Sun, 18 Jun 2023 09:18:31 +0000 (11:18 +0200)
committerAntonio Borneo <borneo.antonio@gmail.com>
Fri, 14 Jul 2023 16:43:13 +0000 (16:43 +0000)
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.

Signed-off-by: Erhan Kurubas <erhan.kurubas@espressif.com>
Change-Id: I36c86fe4ebc99928ce48a5bff8cb9580a0fa3ac0
Reviewed-on: https://review.openocd.org/c/openocd/+/7746
Tested-by: jenkins
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
tcl/target/esp32s2.cfg

index e478a6d39d52950442ef3af76ca0bf62ccb61b03..4c1362a346dae6ed33dc0ab01bcb3c33da67ef5e 100644 (file)
@@ -1,32 +1,17 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 #
-# The ESP32-S2 only supports JTAG.
-transport select jtag
 
-set CPU_MAX_ADDRESS 0xFFFFFFFF
-source [find bitsbytes.tcl]
-source [find memory.tcl]
-source [find mmr_helpers.tcl]
-# Source the ESP common configuration file
+# Source the ESP common configuration file.
 source [find target/esp_common.cfg]
 
-if { [info exists CHIPNAME] } {
-       set _CHIPNAME $CHIPNAME
-} else {
-       set _CHIPNAME esp32s2
-}
-
-if { [info exists CPUTAPID] } {
-       set _CPUTAPID $CPUTAPID
-} else {
-       set _CPUTAPID 0x120034e5
-}
-
-set _TARGETNAME $_CHIPNAME
-set _CPUNAME cpu
-set _TAPNAME $_CHIPNAME.$_CPUNAME
-
-jtag newtap $_CHIPNAME $_CPUNAME -irlen 5 -expected-id $_CPUTAPID
+# Target specific global variables
+set _CHIPNAME                                  "esp32s2"
+set _CPUTAPID                                  0x120034e5
+set _ESP_ARCH                                  "xtensa"
+set _ONLYCPU                                   1
+set _ESP_SMP_TARGET                            0
+set _ESP_SMP_BREAK                             1
+set _ESP_EFUSE_MAC_ADDR_REG    0x3f41A004
 
 proc esp32s2_memprot_is_enabled { } {
        # IRAM0, DPORT_PMS_PRO_IRAM0_0_REG
@@ -48,33 +33,10 @@ proc esp32s2_memprot_is_enabled { } {
        return 0
 }
 
-target create $_TARGETNAME esp32s2 -endian little -chain-position $_TAPNAME
-
-$_TARGETNAME configure -event gdb-attach {
-       # necessary to auto-probe flash bank when GDB is connected and generate proper memory map
-       halt 1000
-       if { [esp32s2_memprot_is_enabled] } {
-               # 'reset halt' to disable memory protection and allow flasher to work correctly
-               echo "Memory protection is enabled. Reset target to disable it..."
-               reset halt
-       }
-}
-
-xtensa maskisr on
-
-$_TARGETNAME configure -event examine-end {
-       # Need to enable to set 'semihosting_basedir'
-       arm semihosting enable
-       arm semihosting_resexit enable
-       if { [info exists _SEMIHOST_BASEDIR] } {
-               if { $_SEMIHOST_BASEDIR != "" } {
-                       arm semihosting_basedir $_SEMIHOST_BASEDIR
-               }
-       }
+proc esp32s2_soc_reset { } {
+       soft_reset_halt
 }
 
-$_TARGETNAME configure -event reset-assert-post { soft_reset_halt }
-
-gdb_breakpoint_override hard
+create_esp_target $_ESP_ARCH
 
 source [find target/xtensa-core-esp32s2.cfg]

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)