Merge branch 'fix/bootloader_wrap_err_when_disable_compressed_ota' in…

…to 'master' fix: Change wrap triggered only when compressed ota is enabled Closes AEG-1046 See merge request ae_group/esp-iot-solution!914
espressif · Dec 18, 2023 · faaf10f · faaf10f
2 parents 61b73a6 + 7db59b2
commit faaf10f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/components/bootloader_support_plus/CHANGELOG.md b/components/bootloader_support_plus/CHANGELOG.md
@@ -1,5 +1,11 @@
 # ChangeLog
 
+## v0.2.2 - 2023-12-12
+
+### Fix:
+
+* Change wrap to be triggered only when the CONFIG_BOOTLOADER_COMPRESSED_ENABLED is enabled.
+
 ## v0.2.1 - 2023-04-23
 
 ### Fix:

diff --git a/components/bootloader_support_plus/CMakeLists.txt b/components/bootloader_support_plus/CMakeLists.txt
@@ -38,7 +38,9 @@ if(BOOTLOADER_BUILD)
         target_linker_script(${COMPONENT_LIB} INTERFACE "ld/${CONFIG_IDF_TARGET}/linker.lf")
     endif()
 else()
-    target_link_libraries(${COMPONENT_LIB} INTERFACE "-Wl,--wrap=esp_ota_get_next_update_partition")
+    if(CONFIG_BOOTLOADER_COMPRESSED_ENABLED)
+        target_link_libraries(${COMPONENT_LIB} INTERFACE "-Wl,--wrap=esp_ota_get_next_update_partition")
+    endif()
 
     # Force app_update to also appear later than bootloader_support_plus in link line
     idf_component_get_property(app_update app_update COMPONENT_LIB)
@@ -52,7 +54,9 @@ else()
 
 endif()
 
-target_link_libraries(${COMPONENT_LIB} INTERFACE "-Wl,--wrap=esp_image_verify")
+if(CONFIG_BOOTLOADER_COMPRESSED_ENABLED)
+    target_link_libraries(${COMPONENT_LIB} INTERFACE "-Wl,--wrap=esp_image_verify")
+endif()
 
 include(package_manager)
 cu_pkg_define_version(${CMAKE_CURRENT_LIST_DIR})
diff --git a/components/bootloader_support_plus/idf_component.yml b/components/bootloader_support_plus/idf_component.yml
@@ -1,4 +1,4 @@
-version: "0.2.1"
+version: "0.2.2"
 targets:
   - esp32c2
   - esp32c3