fix: Change wrap triggered only when compressed ota is enabled

espressif · Dec 12, 2023 · 7db59b2 · 7db59b2
1 parent 5e4b981
commit 7db59b2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 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
@@ -6,8 +6,8 @@ set(srcs "src/bootloader_custom_image_format.c"
 set(requires "bootloader" "bootloader_support" "spi_flash")
 
 if(BOOTLOADER_BUILD)
-    list(APPEND srcs "src/bootloader_custom_malloc.c" 
-                     "src/bootloader_decompressor_common.c" 
+    list(APPEND srcs "src/bootloader_custom_malloc.c"
+                     "src/bootloader_decompressor_common.c"
                      "src/bootloader_storage_flash.c")
 else()
     list(APPEND requires "app_update" "esp_partition")
@@ -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})
+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
@@ -13,4 +13,4 @@ dependencies:
   cmake_utilities: "0.*"
   xz: "1.*"
 examples:
-  - path: ../../examples/ota/simple_ota_example
+  - path: ../../examples/ota/simple_ota_example