mirror of
https://github.com/espressif/esp-idf.git
synced 2024-10-05 20:47:46 -04:00
coredump: added the chip_rev field into the coredump header
This commit is contained in:
parent
ba51b09cb2
commit
6532076ad6
@ -163,7 +163,6 @@ def action_extensions(base_actions: Dict, project_path: str) -> Dict:
|
|||||||
|
|
||||||
espcoredump_kwargs = dict()
|
espcoredump_kwargs = dict()
|
||||||
|
|
||||||
espcoredump_kwargs['port'] = args.port
|
|
||||||
espcoredump_kwargs['baud'] = args.baud
|
espcoredump_kwargs['baud'] = args.baud
|
||||||
espcoredump_kwargs['gdb_timeout_sec'] = gdb_timeout_sec
|
espcoredump_kwargs['gdb_timeout_sec'] = gdb_timeout_sec
|
||||||
espcoredump_kwargs['chip_rev'] = chip_rev_to_int(chip_rev)
|
espcoredump_kwargs['chip_rev'] = chip_rev_to_int(chip_rev)
|
||||||
@ -174,7 +173,6 @@ def action_extensions(base_actions: Dict, project_path: str) -> Dict:
|
|||||||
if extra_gdbinit_file:
|
if extra_gdbinit_file:
|
||||||
espcoredump_kwargs['extra_gdbinit_file'] = extra_gdbinit_file
|
espcoredump_kwargs['extra_gdbinit_file'] = extra_gdbinit_file
|
||||||
|
|
||||||
espcoredump_kwargs: Dict[str, Any] = dict()
|
|
||||||
core_format = None
|
core_format = None
|
||||||
|
|
||||||
if core:
|
if core:
|
||||||
@ -191,16 +189,8 @@ def action_extensions(base_actions: Dict, project_path: str) -> Dict:
|
|||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
espcoredump_kwargs['port'] = args.port
|
espcoredump_kwargs['port'] = args.port
|
||||||
espcoredump_kwargs['baud'] = args.baud
|
espcoredump_kwargs['parttable_off'] = get_sdkconfig_value(project_desc['config_file'],
|
||||||
espcoredump_kwargs['gdb_timeout_sec'] = gdb_timeout_sec
|
'CONFIG_PARTITION_TABLE_OFFSET')
|
||||||
|
|
||||||
# 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:
|
if core_format:
|
||||||
espcoredump_kwargs['core_format'] = core_format
|
espcoredump_kwargs['core_format'] = core_format
|
||||||
@ -272,7 +262,8 @@ def action_extensions(base_actions: Dict, project_path: str) -> Dict:
|
|||||||
base_ident = ' '
|
base_ident = ' '
|
||||||
rom_elfs_dir = os.getenv('ESP_ROM_ELF_DIR')
|
rom_elfs_dir = os.getenv('ESP_ROM_ELF_DIR')
|
||||||
if not rom_elfs_dir:
|
if not rom_elfs_dir:
|
||||||
raise FatalError('ESP_ROM_ELF_DIR environment variable is not defined. Please try to run IDF "install" and "export" scripts.')
|
raise FatalError(
|
||||||
|
'ESP_ROM_ELF_DIR environment variable is not defined. Please try to run IDF "install" and "export" scripts.')
|
||||||
with open(os.path.join(os.path.dirname(os.path.realpath(__file__)), ESP_ROM_INFO_FILE), 'r') as f:
|
with open(os.path.join(os.path.dirname(os.path.realpath(__file__)), ESP_ROM_INFO_FILE), 'r') as f:
|
||||||
roms = json.load(f)
|
roms = json.load(f)
|
||||||
if target not in roms:
|
if target not in roms:
|
||||||
@ -409,7 +400,8 @@ def action_extensions(base_actions: Dict, project_path: str) -> Dict:
|
|||||||
# use default value if commands not defined in the environment nor command line
|
# use default value if commands not defined in the environment nor command line
|
||||||
target = project_desc['target']
|
target = project_desc['target']
|
||||||
openocd_arguments = get_openocd_arguments(target)
|
openocd_arguments = get_openocd_arguments(target)
|
||||||
print('Note: OpenOCD cfg not found (via env variable OPENOCD_COMMANDS nor as a --openocd-commands argument)\n'
|
print(
|
||||||
|
'Note: OpenOCD cfg not found (via env variable OPENOCD_COMMANDS nor as a --openocd-commands argument)\n'
|
||||||
'OpenOCD arguments default to: "{}"'.format(openocd_arguments))
|
'OpenOCD arguments default to: "{}"'.format(openocd_arguments))
|
||||||
# script directory is taken from the environment by OpenOCD, update only if command line arguments to override
|
# script directory is taken from the environment by OpenOCD, update only if command line arguments to override
|
||||||
if openocd_scripts is not None:
|
if openocd_scripts is not None:
|
||||||
@ -517,7 +509,8 @@ def action_extensions(base_actions: Dict, project_path: str) -> Dict:
|
|||||||
"""
|
"""
|
||||||
gdb(action, ctx, args, False, 1, gdbinit, require_openocd)
|
gdb(action, ctx, args, False, 1, gdbinit, require_openocd)
|
||||||
|
|
||||||
def gdb(action: str, ctx: Context, args: PropertyDict, batch: bool, gdb_tui: Optional[int], gdbinit: Optional[str], require_openocd: bool) -> None:
|
def gdb(action: str, ctx: Context, args: PropertyDict, batch: bool, gdb_tui: Optional[int], gdbinit: Optional[str],
|
||||||
|
require_openocd: bool) -> None:
|
||||||
"""
|
"""
|
||||||
Synchronous GDB target
|
Synchronous GDB target
|
||||||
"""
|
"""
|
||||||
|
Loading…
x
Reference in New Issue
Block a user