Explorar o código

Merge branch 'feature/esp32c3_eco4' into 'master'

esp32c3: Adds ECO4 revision

Closes IDF-4848

See merge request espressif/esp-idf!17514
Konstantin Kondrashov %!s(int64=3) %!d(string=hai) anos
pai
achega
44a0108d4c

+ 1 - 1
components/bootloader/Kconfig.projbuild

@@ -517,7 +517,7 @@ menu "Security features"
     config SECURE_BOOT
         bool "Enable hardware Secure Boot in bootloader (READ DOCS FIRST)"
         default n
-        depends on IDF_TARGET_ESP32 || IDF_TARGET_ESP32S2 || ESP32C3_REV_MIN_3 || IDF_TARGET_ESP32S3
+        depends on IDF_TARGET_ESP32 || IDF_TARGET_ESP32S2 || ESP32C3_REV_MIN >= 3 || IDF_TARGET_ESP32S3
         select ESPTOOLPY_NO_STUB if !IDF_TARGET_ESP32 && !IDF_TARGET_ESP32S2
         help
             Build a bootloader which enables Secure Boot on first boot.

+ 3 - 0
components/esp32c3/Kconfig

@@ -39,6 +39,8 @@ menu "ESP32C3-Specific"
             bool "Rev 2"
         config ESP32C3_REV_MIN_3
             bool "Rev 3"
+        config ESP32C3_REV_MIN_4
+            bool "Rev 4"
     endchoice
 
     config ESP32C3_REV_MIN
@@ -47,6 +49,7 @@ menu "ESP32C3-Specific"
         default 1 if ESP32C3_REV_MIN_1
         default 2 if ESP32C3_REV_MIN_2
         default 3 if ESP32C3_REV_MIN_3
+        default 4 if ESP32C3_REV_MIN_4
 
     choice ESP32C3_TIME_SYSCALL
         prompt "Timers used for gettimeofday function"

+ 1 - 1
components/esp_rom/CMakeLists.txt

@@ -171,7 +171,7 @@ else() # Regular app build
             endif()
         endif()
 
-        if(CONFIG_ESP32C3_REV_MIN_3)
+        if(CONFIG_ESP32C3_REV_MIN_3 OR CONFIG_ESP32C3_REV_MIN_4)
             rom_linker_script("eco3")
         endif()