Merge branch 'feature/add_new_caps_for_rom_has_regi2c_bug' into 'master'

esp_rom: add ESP_ROM_HAS_REGI2C_BUG in rom caps See merge request espressif/esp-idf!21418
espressif · Dec 6, 2022 · 454aeb3 · 454aeb3
2 parents 505a78f + 66a0ced
commit 454aeb3
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git a/components/esp_rom/CMakeLists.txt b/components/esp_rom/CMakeLists.txt
@@ -21,10 +21,10 @@ else()
                         "patches/esp_rom_efuse.c")
 
 
-# Override regi2c implementation in ROM
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/patches/esp_rom_regi2c_${target}.c")
-    list(APPEND sources "patches/esp_rom_regi2c_${target}.c")
-endif()
+    # Override regi2c implementation in ROM
+    if(CONFIG_ESP_ROM_HAS_REGI2C_BUG)
+        list(APPEND sources "patches/esp_rom_regi2c_${target}.c")
+    endif()
 
     if(CONFIG_HEAP_TLSF_USE_ROM_IMPL AND CONFIG_ESP_ROM_TLSF_CHECK_PATCH)
         # This file shall be included in the build if TLSF in ROM is activated

diff --git a/components/esp_rom/esp32c6/Kconfig.soc_caps.in b/components/esp_rom/esp32c6/Kconfig.soc_caps.in
@@ -54,3 +54,7 @@ config ESP_ROM_HAS_LAYOUT_TABLE
 config ESP_ROM_HAS_SPI_FLASH
     bool
     default y
+
+config ESP_ROM_HAS_REGI2C_BUG
+    bool
+    default y
diff --git a/components/esp_rom/esp32c6/esp_rom_caps.h b/components/esp_rom/esp32c6/esp_rom_caps.h
@@ -19,3 +19,4 @@
 #define ESP_ROM_HAS_HEAP_TLSF               (1) // ROM has the implementation of the tlsf and multi-heap library
 #define ESP_ROM_HAS_LAYOUT_TABLE            (1) // ROM has the layout table
 #define ESP_ROM_HAS_SPI_FLASH               (1) // ROM has the implementation of SPI Flash driver
+#define ESP_ROM_HAS_REGI2C_BUG              (1) // ROM has the regi2c bug
diff --git a/components/esp_rom/esp32s2/Kconfig.soc_caps.in b/components/esp_rom/esp32s2/Kconfig.soc_caps.in
@@ -14,3 +14,7 @@ config ESP_ROM_HAS_MZ_CRC32
 config ESP_ROM_NEEDS_SWSETUP_WORKAROUND
     bool
     default y
+
+config ESP_ROM_HAS_REGI2C_BUG
+    bool
+    default y
diff --git a/components/esp_rom/esp32s2/esp_rom_caps.h b/components/esp_rom/esp32s2/esp_rom_caps.h
@@ -6,6 +6,7 @@
 
 #pragma once
 
-#define ESP_ROM_HAS_CRC_LE            (1) // ROM CRC library supports Little Endian
-#define ESP_ROM_HAS_MZ_CRC32          (1) // ROM has mz_crc32 function
+#define ESP_ROM_HAS_CRC_LE                  (1) // ROM CRC library supports Little Endian
+#define ESP_ROM_HAS_MZ_CRC32                (1) // ROM has mz_crc32 function
 #define ESP_ROM_NEEDS_SWSETUP_WORKAROUND    (1) // ROM uses 32-bit time_t. A workaround is required to prevent printf functions from crashing
+#define ESP_ROM_HAS_REGI2C_BUG              (1) // ROM has the regi2c bug