Merge branch 'bugfix/cmake_ulp_reserved_size_v4.2' into 'release/v4.2'

ulp: Fix bug where ULP linker script not regenerated for new config (v4.2)

See merge request espressif/esp-idf!13629

components/ulp/cmake/CMakeLists.txt

@@ -31,7 +31,7 @@ endif()
 set(ULP_MAP_GEN ${PYTHON} ${IDF_PATH}/components/ulp/esp32ulp_mapgen.py)
 set(ULP_LD_TEMPLATE ${IDF_PATH}/components/ulp/ld/esp32.ulp.ld)
 
-get_filename_component(sdkconfig_dir ${SDKCONFIG} DIRECTORY)
+get_filename_component(sdkconfig_dir ${SDKCONFIG_HEADER} DIRECTORY)
 
 foreach(include ${COMPONENT_INCLUDES})
     list(APPEND component_includes -I${include})
@@ -50,7 +50,7 @@ get_filename_component(ULP_LD_SCRIPT ${ULP_LD_TEMPLATE} NAME)
 add_custom_command( OUTPUT ${ULP_LD_SCRIPT}
                     COMMAND ${CMAKE_C_COMPILER} -E -P -xc -o ${ULP_LD_SCRIPT} ${ULP_PREPROCESSOR_ARGS} ${ULP_LD_TEMPLATE}
                     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-                    DEPENDS ${ULP_LD_TEMPLATE}
+                    DEPENDS ${ULP_LD_TEMPLATE} ${SDKCONFIG_HEADER}
                     VERBATIM)
 add_custom_target(${ULP_APP_NAME}_ld_script
                     DEPENDS ${ULP_LD_SCRIPT}

components/ulp/project_include.cmake

@@ -52,7 +52,7 @@ function(ulp_embed_binary app_name s_sources exp_dep_srcs)
                         -DCOMPONENT_DIR=${COMPONENT_DIR}
                         -DCOMPONENT_INCLUDES=$<TARGET_PROPERTY:${COMPONENT_TARGET},INTERFACE_INCLUDE_DIRECTORIES>
                         -DIDF_PATH=${idf_path}
-                        -DSDKCONFIG=${SDKCONFIG_HEADER}
+                        -DSDKCONFIG_HEADER=${SDKCONFIG_HEADER}
                         -DPYTHON=${python}
                         ${extra_cmake_args}
             BUILD_COMMAND ${CMAKE_COMMAND} --build ${CMAKE_CURRENT_BINARY_DIR}/${app_name} --target build