From e21e5aac649032e17623bdc970ea693123dc66ef Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Mon, 13 Sep 2021 15:16:45 +0200 Subject: [PATCH] esp_hw_support: update esp32s3 chip ID to the MP version - Update 7.2.5 chip ID (4) to 7.2.8 chip ID (9). - Remove TODO in espcoredump regarding this mismatch. --- components/esp_hw_support/include/esp_chip_info.h | 2 +- components/espcoredump/corefile/loader.py | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/components/esp_hw_support/include/esp_chip_info.h b/components/esp_hw_support/include/esp_chip_info.h index afaa12638a..69d23c08d3 100644 --- a/components/esp_hw_support/include/esp_chip_info.h +++ b/components/esp_hw_support/include/esp_chip_info.h @@ -22,7 +22,7 @@ extern "C" { typedef enum { CHIP_ESP32 = 1, //!< ESP32 CHIP_ESP32S2 = 2, //!< ESP32-S2 - CHIP_ESP32S3 = 4, //!< ESP32-S3 + CHIP_ESP32S3 = 9, //!< ESP32-S3 CHIP_ESP32C3 = 5, //!< ESP32-C3 CHIP_ESP32H2 = 6, //!< ESP32-H2 } esp_chip_model_t; diff --git a/components/espcoredump/corefile/loader.py b/components/espcoredump/corefile/loader.py index 223c3b78fd..144a350826 100644 --- a/components/espcoredump/corefile/loader.py +++ b/components/espcoredump/corefile/loader.py @@ -75,13 +75,11 @@ MemSegmentHeader = Struct( 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 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 XTENSA_CHIPS = [ESP32, ESP32S2, ESP32S3]