espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-04 21:24:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/esp32s3_chip_id' into 'master'

Browse Source 
esp_hw_support: update esp32s3 chip ID to the MP version

See merge request espressif/esp-idf!15183
This commit is contained in:
Anton Maklakov
2021-09-14 09:09:38 +00:00
parent 13b63cd9d2 e21e5aac64
commit c94b913ced
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_hw_support/include/esp_chip_info.h
View File

@@ -22,7 +22,7 @@ extern "C" {
typedef enum { typedef enum {
CHIP_ESP32 = 1, //!< ESP32 CHIP_ESP32 = 1, //!< ESP32
CHIP_ESP32S2 = 2, //!< ESP32-S2 CHIP_ESP32S2 = 2, //!< ESP32-S2
CHIP_ESP32S3 = 4, //!< ESP32-S3 CHIP_ESP32S3 = 9, //!< ESP32-S3
CHIP_ESP32C3 = 5, //!< ESP32-C3 CHIP_ESP32C3 = 5, //!< ESP32-C3
CHIP_ESP32H2 = 6, //!< ESP32-H2 CHIP_ESP32H2 = 6, //!< ESP32-H2
} esp_chip_model_t; } esp_chip_model_t;

6
components/espcoredump/corefile/loader.py
View File

@@ -75,13 +75,11 @@ MemSegmentHeader = Struct(
class EspCoreDumpVersion(object): class EspCoreDumpVersion(object):
"""Core dump version class """Core dump version class, it contains all version-dependent params
""" """
# This class contains all version-dependent params # Chip IDs should be in sync with components/esp_hw_support/include/esp_chip_info.h
ESP32 = 0 ESP32 = 0
ESP32S2 = 2 ESP32S2 = 2
# TODO: The value for chip is different from components/esp_hw_support/include/esp_chip_info.h
# and this value comes from the hardware.
ESP32S3 = 9 ESP32S3 = 9
XTENSA_CHIPS = [ESP32, ESP32S2, ESP32S3] XTENSA_CHIPS = [ESP32, ESP32S2, ESP32S3]