From 5fe418e733df52f30fb9697c82e230671c1975ae Mon Sep 17 00:00:00 2001
From: Peter Dragun <peter.dragun@espressif.com>
Date: Tue, 6 Jun 2023 16:08:28 +0200
Subject: [PATCH] fix(tools/coredump-info): pass non-default partition table
 offset to esp-coredump

Closes https://github.com/espressif/esp-idf/issues/11564
---
 tools/idf_py_actions/debug_ext.py | 41 ++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/tools/idf_py_actions/debug_ext.py b/tools/idf_py_actions/debug_ext.py
index 33e8c16751a..7a1ddc8a399 100644
--- a/tools/idf_py_actions/debug_ext.py
+++ b/tools/idf_py_actions/debug_ext.py
@@ -146,20 +146,8 @@ def _get_espcoredump_instance(ctx: Context,
         coredump_to_flash = coredump_to_flash_config.rstrip().endswith('y') if coredump_to_flash_config else False
 
         prog = os.path.join(project_desc['build_dir'], project_desc['app_elf'])
-        args.port = args.port or get_default_serial_port()
-
-        espcoredump_kwargs = dict()
-
-        espcoredump_kwargs['port'] = args.port
-        espcoredump_kwargs['baud'] = args.baud
-        espcoredump_kwargs['gdb_timeout_sec'] = gdb_timeout_sec
-
-        # for reproducible builds
-        extra_gdbinit_file = project_desc.get('debug_prefix_map_gdbinit', None)
-
-        if extra_gdbinit_file:
-            espcoredump_kwargs['extra_gdbinit_file'] = extra_gdbinit_file
 
+        espcoredump_kwargs: Dict[str, Any] = dict()
         core_format = None
 
         if core:
@@ -169,12 +157,24 @@ def _get_espcoredump_instance(ctx: Context,
         elif coredump_to_flash:
             #  If the core dump is read from flash, we don't need to specify the --core-format argument at all.
             #  The format will be determined automatically
-            pass
+            args.port = args.port or get_default_serial_port()
         else:
             print('Path to core dump file is not provided. '
                   "Core dump can't be read from flash since this option is not enabled in menuconfig")
             sys.exit(1)
 
+        espcoredump_kwargs['port'] = args.port
+        espcoredump_kwargs['baud'] = args.baud
+        espcoredump_kwargs['gdb_timeout_sec'] = gdb_timeout_sec
+
+        # for reproducible builds
+        extra_gdbinit_file = project_desc.get('debug_prefix_map_gdbinit', None)
+
+        if extra_gdbinit_file:
+            espcoredump_kwargs['extra_gdbinit_file'] = extra_gdbinit_file
+
+        espcoredump_kwargs['parttable_off'] = get_sdkconfig_value(project_desc['config_file'], 'CONFIG_PARTITION_TABLE_OFFSET')
+
         if core_format:
             espcoredump_kwargs['core_format'] = core_format
 
@@ -183,7 +183,18 @@ def _get_espcoredump_instance(ctx: Context,
 
         espcoredump_kwargs['prog'] = prog
 
-        return CoreDump(**espcoredump_kwargs)
+        # compatibility check for esp-coredump < 1.5.2
+        try:
+            coredump = CoreDump(**espcoredump_kwargs)
+        except TypeError as e:
+            # 'parttable_off' was added in esp-coredump 1.5.2
+            # remove argument and retry without it
+            if 'parttable_off' in str(e):
+                espcoredump_kwargs.pop('parttable_off')
+                coredump = CoreDump(**espcoredump_kwargs)
+            else:
+                raise
+        return coredump
 
     def get_core_file_format(core_file: str) -> str:
         bin_v1 = 1