alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'fix/fix_incorrectly_defined_coredump_chip_ver' into 'release/v5.0'

Browse Source 
espcoredump: fix incorrectly defined coredump chip version (v5.0)

See merge request espressif/esp-idf!21967
This commit is contained in:
Ivan Grokhotkov 2023-02-17 19:41:07 +08:00
commit 66f5a4a497
3 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
components/espcoredump/include_core_dump/esp_core_dump_types.h
View File

@ -50,8 +50,6 @@ extern "C" {
/**
* @brief The following macros defined below are used to create a version
* numbering. This number is then used in the core dump header.
*
* @note COREDUMP_VERSION_CHIP is defined in ports header.
*/
#define COREDUMP_VERSION_MAKE(_maj_, _min_) ( \
(((COREDUMP_VERSION_CHIP)&0xFFFF) << 16) | \
@ -83,6 +81,11 @@ extern "C" {
#error "Coredump cache size must be a multiple of 16"
#endif
/**
* @brief Chip ID associated to this implementation.
*/
#define COREDUMP_VERSION_CHIP CONFIG_IDF_FIRMWARE_CHIP_ID
typedef struct _core_dump_write_data_t
{

5
components/espcoredump/include_core_dump/port/riscv/esp_core_dump_port_impl.h
View File

@ -14,11 +14,6 @@
#include "esp_core_dump_types.h"
#include "esp_app_format.h"
/**
* @brief Chip ID associated to this implementation.
*/
#define COREDUMP_VERSION_CHIP ESP_CHIP_ID_ESP32C3
#ifdef __cplusplus
extern "C" {
#endif

11
components/espcoredump/include_core_dump/port/xtensa/esp_core_dump_port_impl.h
View File

@ -18,17 +18,6 @@
#include <xtensa/xtruntime.h>
#include <xt_instr_macros.h>
/**
* @brief Chip ID associated to this implementation.
*/
#if CONFIG_IDF_TARGET_ESP32
#define COREDUMP_VERSION_CHIP ESP_CHIP_ID_ESP32
#elif CONFIG_IDF_TARGET_ESP32S2
#define COREDUMP_VERSION_CHIP ESP_CHIP_ID_ESP32S2
#elif CONFIG_IDF_TARGET_ESP32S3
#define COREDUMP_VERSION_CHIP ESP_CHIP_ID_ESP32S3
#endif
#ifdef __cplusplus
extern "C" {
#endif