From 6f761dd62d49751d050327b642dd276280ff8a95 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@espressif.com>
Date: Fri, 8 Nov 2019 12:50:28 +0800
Subject: [PATCH] cmake: Fix some uninitialized variable warnings

---
 components/bootloader/project_include.cmake | 5 +++++
 components/lwip/CMakeLists.txt              | 2 +-
 components/mbedtls/CMakeLists.txt           | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/components/bootloader/project_include.cmake b/components/bootloader/project_include.cmake
index 157ec3bb63..003a2b0b6a 100644
--- a/components/bootloader/project_include.cmake
+++ b/components/bootloader/project_include.cmake
@@ -67,6 +67,7 @@ if(CONFIG_SECURE_SIGNED_APPS)
 
         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(ver_key_arg)
 
         add_dependencies(gen_secure_boot_keys gen_secure_boot_signing_key)
     else()
@@ -87,10 +88,14 @@ if(CONFIG_SECURE_SIGNED_APPS)
             add_custom_target(gen_secure_boot_verification_key)
         endif()
 
+        set(sign_key_arg)
         set(ver_key_arg "-DSECURE_BOOT_VERIFICATION_KEY=${secure_boot_verification_key}")
 
         add_dependencies(gen_secure_boot_keys gen_secure_boot_verification_key)
     endif()
+else()
+    set(sign_key_arg)
+    set(ver_key_arg)
 endif()
 
 idf_build_get_property(idf_path IDF_PATH)
diff --git a/components/lwip/CMakeLists.txt b/components/lwip/CMakeLists.txt
index 7d346127ff..56187ca638 100644
--- a/components/lwip/CMakeLists.txt
+++ b/components/lwip/CMakeLists.txt
@@ -134,7 +134,7 @@ idf_component_register(SRCS "${srcs}"
                     INCLUDE_DIRS "${include_dirs}"
                     LDFRAGMENTS linker.lf
                     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
 target_compile_options(${COMPONENT_LIB} PRIVATE -Wno-address)
diff --git a/components/mbedtls/CMakeLists.txt b/components/mbedtls/CMakeLists.txt
index 0c4c263fef..a46a6b6f04 100644
--- a/components/mbedtls/CMakeLists.txt
+++ b/components/mbedtls/CMakeLists.txt
@@ -2,7 +2,7 @@ idf_build_get_property(idf_target IDF_TARGET)
 
 idf_component_register(INCLUDE_DIRS "port/include" "mbedtls/include"
     REQUIRES lwip
-    PRIV_REQUIRES ${IDF_COMPONENT_REQUIRES_COMMON} soc
+    PRIV_REQUIRES soc
     )
 
 # Only build mbedtls libraries