From 48317d86d3c45a855edfd4e7a86c8c6a8a5ac798 Mon Sep 17 00:00:00 2001 From: Erhan Kurubas Date: Tue, 4 Oct 2022 23:22:34 +0200 Subject: [PATCH] tcl/xtensa: some fixes at xtensa-core-esp32s2.cfg Some config changes required to run ESP32-S2 with full feature set Signed-off-by: Erhan Kurubas Change-Id: Ie0a742442254ec6e95d4e05be40213b079a94dab Reviewed-on: https://review.openocd.org/c/openocd/+/7253 Tested-by: jenkins Reviewed-by: Ian Thompson Reviewed-by: Antonio Borneo --- tcl/target/xtensa-core-esp32s2.cfg | 74 +++++++++++++++--------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/tcl/target/xtensa-core-esp32s2.cfg b/tcl/target/xtensa-core-esp32s2.cfg index e590e510d..b38cb1dbb 100644 --- a/tcl/target/xtensa-core-esp32s2.cfg +++ b/tcl/target/xtensa-core-esp32s2.cfg @@ -23,6 +23,7 @@ xtensa xtmem iram 0x40020000 0x50000 xtensa xtmem iram 0x40070000 0x2000 xtensa xtmem drom 0x3F000000 0x400000 xtensa xtmem drom 0x3F4D3FFC 0xAAC004 +xtensa xtmem drom 0x3FFA0000 0x10000 xtensa xtmem dram 0x3FFB0000 0x50000 xtensa xtmem dram 0x3FF9E000 0x2000 xtensa xtmem dram 0x50000000 0x2000 @@ -36,8 +37,8 @@ xtensa xtmem dram 0x60000000 0x20000000 xtensa xtopt debuglevel 6 xtensa xtopt ibreaknum 2 xtensa xtopt dbreaknum 2 -xtensa xtopt tracemem 8192 -xtensa xtopt tracememrev 1 +xtensa xtopt tracemem 0x4000 +xtensa xtopt tracememrev 0 xtensa xtopt perfcount 2 # Core Registers @@ -48,7 +49,7 @@ xtensa xtopt perfcount 2 # NOTE: For contiguous format, registers listed in GDB order. # xtregs: Total number of Xtensa registers in the system xtensa xtregs 171 -xtensa xtregfmt contiguous 72 +xtensa xtregfmt contiguous 73 xtensa xtreg pc 0x0020 xtensa xtreg ar0 0x0100 xtensa xtreg ar1 0x0101 @@ -121,8 +122,7 @@ xtensa xtreg configid0 0x02b0 xtensa xtreg configid1 0x02d0 xtensa xtreg ps 0x02e6 xtensa xtreg threadptr 0x03e7 -# gpio_out should be 0x0300? Hits an exception on wrover -xtensa xtreg gpio_out 0x0268 +xtensa xtreg gpio_out 0x0300 xtensa xtreg mmid 0x0259 xtensa xtreg ibreakenable 0x0260 xtensa xtreg ddr 0x0268 @@ -173,6 +173,38 @@ xtensa xtreg misc0 0x02f4 xtensa xtreg misc1 0x02f5 xtensa xtreg misc2 0x02f6 xtensa xtreg misc3 0x02f7 +xtensa xtreg pwrctl 0x2014 +xtensa xtreg pwrstat 0x2015 +xtensa xtreg eristat 0x2016 +xtensa xtreg cs_itctrl 0x2017 +xtensa xtreg cs_claimset 0x2018 +xtensa xtreg cs_claimclr 0x2019 +xtensa xtreg cs_lockaccess 0x201a +xtensa xtreg cs_lockstatus 0x201b +xtensa xtreg cs_authstatus 0x201c +xtensa xtreg fault_info 0x202b +xtensa xtreg trax_id 0x202c +xtensa xtreg trax_control 0x202d +xtensa xtreg trax_status 0x202e +xtensa xtreg trax_data 0x202f +xtensa xtreg trax_address 0x2030 +xtensa xtreg trax_pctrigger 0x2031 +xtensa xtreg trax_pcmatch 0x2032 +xtensa xtreg trax_delay 0x2033 +xtensa xtreg trax_memstart 0x2034 +xtensa xtreg trax_memend 0x2035 +xtensa xtreg pmg 0x2043 +xtensa xtreg pmpc 0x2044 +xtensa xtreg pm0 0x2045 +xtensa xtreg pm1 0x2046 +xtensa xtreg pmctrl0 0x2047 +xtensa xtreg pmctrl1 0x2048 +xtensa xtreg pmstat0 0x2049 +xtensa xtreg pmstat1 0x204a +xtensa xtreg ocdid 0x204b +xtensa xtreg ocd_dcrclr 0x204c +xtensa xtreg ocd_dcrset 0x204d +xtensa xtreg ocd_dsr 0x204e xtensa xtreg a0 0x0000 xtensa xtreg a1 0x0001 xtensa xtreg a2 0x0002 @@ -189,35 +221,3 @@ xtensa xtreg a12 0x000c xtensa xtreg a13 0x000d xtensa xtreg a14 0x000e xtensa xtreg a15 0x000f -xtensa xtreg pwrctl 0x2028 -xtensa xtreg pwrstat 0x2029 -xtensa xtreg eristat 0x202a -xtensa xtreg cs_itctrl 0x202b -xtensa xtreg cs_claimset 0x202c -xtensa xtreg cs_claimclr 0x202d -xtensa xtreg cs_lockaccess 0x202e -xtensa xtreg cs_lockstatus 0x202f -xtensa xtreg cs_authstatus 0x2030 -xtensa xtreg fault_info 0x203f -xtensa xtreg trax_id 0x2040 -xtensa xtreg trax_control 0x2041 -xtensa xtreg trax_status 0x2042 -xtensa xtreg trax_data 0x2043 -xtensa xtreg trax_address 0x2044 -xtensa xtreg trax_pctrigger 0x2045 -xtensa xtreg trax_pcmatch 0x2046 -xtensa xtreg trax_delay 0x2047 -xtensa xtreg trax_memstart 0x2048 -xtensa xtreg trax_memend 0x2049 -xtensa xtreg pmg 0x2057 -xtensa xtreg pmpc 0x2058 -xtensa xtreg pm0 0x2059 -xtensa xtreg pm1 0x205a -xtensa xtreg pmctrl0 0x2061 -xtensa xtreg pmctrl1 0x2062 -xtensa xtreg pmstat0 0x2069 -xtensa xtreg pmstat1 0x206a -xtensa xtreg ocdid 0x2071 -xtensa xtreg ocd_dcrclr 0x2072 -xtensa xtreg ocd_dcrset 0x2073 -xtensa xtreg ocd_dsr 0x2074