Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/cmake_uninit_vars_case_error' into 'master'

Browse source 
cmake: Fix some uninitialized variable issues

See merge request espressif/esp-idf!6632
This commit is contained in:
Angus Gratton 2019-11-08 18:54:33 +08:00
commit ae777b026f
4 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
components/bootloader/project_include.cmake
View file

@ -67,6 +67,7 @@ if(CONFIG_SECURE_SIGNED_APPS)
set(SECURE_BOOT_SIGNING_KEY ${secure_boot_signing_key}) # needed by some other components set(SECURE_BOOT_SIGNING_KEY ${secure_boot_signing_key}) # needed by some other components
set(sign_key_arg "-DSECURE_BOOT_SIGNING_KEY=${secure_boot_signing_key}") set(sign_key_arg "-DSECURE_BOOT_SIGNING_KEY=${secure_boot_signing_key}")
set(ver_key_arg)
add_dependencies(gen_secure_boot_keys gen_secure_boot_signing_key) add_dependencies(gen_secure_boot_keys gen_secure_boot_signing_key)
else() else()
@ -87,10 +88,14 @@ if(CONFIG_SECURE_SIGNED_APPS)
add_custom_target(gen_secure_boot_verification_key) add_custom_target(gen_secure_boot_verification_key)
endif() endif()
set(sign_key_arg)
set(ver_key_arg "-DSECURE_BOOT_VERIFICATION_KEY=${secure_boot_verification_key}") set(ver_key_arg "-DSECURE_BOOT_VERIFICATION_KEY=${secure_boot_verification_key}")
add_dependencies(gen_secure_boot_keys gen_secure_boot_verification_key) add_dependencies(gen_secure_boot_keys gen_secure_boot_verification_key)
endif() endif()
else()
set(sign_key_arg)
set(ver_key_arg)
endif() endif()
idf_build_get_property(idf_path IDF_PATH) idf_build_get_property(idf_path IDF_PATH)
@ -110,7 +115,7 @@ externalproject_add(bootloader
# the bootloader common component requirements depends on this and # the bootloader common component requirements depends on this and
# config variables are not available before project() call. # config variables are not available before project() call.
-DLEGACY_INCLUDE_COMMON_HEADERS=${CONFIG_LEGACY_INCLUDE_COMMON_HEADERS} -DLEGACY_INCLUDE_COMMON_HEADERS=${CONFIG_LEGACY_INCLUDE_COMMON_HEADERS}
${EXTRA_CMAKE_ARGS} ${extra_cmake_args}
INSTALL_COMMAND "" INSTALL_COMMAND ""
BUILD_ALWAYS 1 # no easy way around this... BUILD_ALWAYS 1 # no easy way around this...
BUILD_BYPRODUCTS ${bootloader_binary_files} BUILD_BYPRODUCTS ${bootloader_binary_files}

2
components/lwip/CMakeLists.txt
View file

@ -134,7 +134,7 @@ idf_component_register(SRCS "${srcs}"
INCLUDE_DIRS "${include_dirs}" INCLUDE_DIRS "${include_dirs}"
LDFRAGMENTS linker.lf LDFRAGMENTS linker.lf
REQUIRES vfs esp_wifi REQUIRES vfs esp_wifi
PRIV_REQUIRES ${priv_requires} esp_eth tcpip_adapter nvs_flash) PRIV_REQUIRES esp_eth tcpip_adapter nvs_flash)
# lots of LWIP source files evaluate macros that check address of stack variables # lots of LWIP source files evaluate macros that check address of stack variables
target_compile_options(${COMPONENT_LIB} PRIVATE -Wno-address) target_compile_options(${COMPONENT_LIB} PRIVATE -Wno-address)

2
components/mbedtls/CMakeLists.txt
View file

@ -2,7 +2,7 @@ idf_build_get_property(idf_target IDF_TARGET)
idf_component_register(INCLUDE_DIRS "port/include" "mbedtls/include" idf_component_register(INCLUDE_DIRS "port/include" "mbedtls/include"
REQUIRES lwip REQUIRES lwip
PRIV_REQUIRES ${IDF_COMPONENT_REQUIRES_COMMON} soc PRIV_REQUIRES soc
) )
# Only build mbedtls libraries # Only build mbedtls libraries

2
components/ulp/project_include.cmake
View file

@ -48,7 +48,7 @@ function(ulp_embed_binary app_name s_sources exp_dep_srcs)
-DIDF_PATH=${idf_path} -DIDF_PATH=${idf_path}
-DSDKCONFIG=${SDKCONFIG_HEADER} -DSDKCONFIG=${SDKCONFIG_HEADER}
-DPYTHON=${python} -DPYTHON=${python}
${EXTRA_CMAKE_ARGS} ${extra_cmake_args}
BUILD_COMMAND ${CMAKE_COMMAND} --build ${CMAKE_CURRENT_BINARY_DIR}/${app_name} --target build BUILD_COMMAND ${CMAKE_COMMAND} --build ${CMAKE_CURRENT_BINARY_DIR}/${app_name} --target build
BUILD_BYPRODUCTS ${ulp_artifacts} ${ulp_artifacts_extras} ${ulp_ps_sources} BUILD_BYPRODUCTS ${ulp_artifacts} ${ulp_artifacts_extras} ${ulp_ps_sources}
${CMAKE_CURRENT_BINARY_DIR}/${app_name}/${app_name} ${CMAKE_CURRENT_BINARY_DIR}/${app_name}/${app_name}