From fcff80ecf887d4e611aa6503302a5aa4bed8e5f8 Mon Sep 17 00:00:00 2001 From: Mahavir Jain Date: Fri, 4 Jan 2019 12:53:31 +0530 Subject: [PATCH] fix cmake build for bootloader --- .flake8 | 2 +- components/bootloader_support/CMakeLists.txt | 2 +- tools/ci/mirror-list.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.flake8 b/.flake8 index 3d6f32476..5196e73e3 100644 --- a/.flake8 +++ b/.flake8 @@ -141,7 +141,7 @@ exclude = __pycache__, # submodules components/esptool_py/esptool, - components/micro-ecc/micro-ecc, + components/bootloader/subproject/components/micro-ecc/micro-ecc, components/nghttp/nghttp2, components/libsodium/libsodium, components/json/cJSON, diff --git a/components/bootloader_support/CMakeLists.txt b/components/bootloader_support/CMakeLists.txt index 3bd3e9b14..244dad5de 100644 --- a/components/bootloader_support/CMakeLists.txt +++ b/components/bootloader_support/CMakeLists.txt @@ -54,7 +54,7 @@ else() set(COMPONENT_ADD_INCLUDEDIRS "include") set(COMPONENT_PRIV_INCLUDEDIRS "include_bootloader") set(COMPONENT_REQUIRES) - set(COMPONENT_PRIV_REQUIRES spi_flash mbedtls micro-ecc efuse) + set(COMPONENT_PRIV_REQUIRES spi_flash mbedtls efuse) endif() register_component() diff --git a/tools/ci/mirror-list.txt b/tools/ci/mirror-list.txt index 8495ee139..3a2f9f3d6 100644 --- a/tools/ci/mirror-list.txt +++ b/tools/ci/mirror-list.txt @@ -8,7 +8,7 @@ components/json/cJSON @GENERAL_MIRROR_SERV components/libsodium/libsodium @GENERAL_MIRROR_SERVER@/idf/libsodium.git ALLOW_TO_SYNC_FROM_PUBLIC components/mbedtls/mbedtls @GENERAL_MIRROR_SERVER@/idf/mbedtls.git ALLOW_TO_SYNC_FROM_PUBLIC components/expat/expat @GENERAL_MIRROR_SERVER@/idf/libexpat.git ALLOW_TO_SYNC_FROM_PUBLIC -components/micro-ecc/micro-ecc @GENERAL_MIRROR_SERVER@/idf/micro-ecc.git ALLOW_TO_SYNC_FROM_PUBLIC +components/bootloader/subproject/components/micro-ecc/micro-ecc @GENERAL_MIRROR_SERVER@/idf/micro-ecc.git ALLOW_TO_SYNC_FROM_PUBLIC components/nghttp/nghttp2 @GENERAL_MIRROR_SERVER@/idf/nghttp2.git ALLOW_TO_SYNC_FROM_PUBLIC components/spiffs/spiffs @GENERAL_MIRROR_SERVER@/idf/spiffs.git ALLOW_TO_SYNC_FROM_PUBLIC components/asio/asio @GENERAL_MIRROR_SERVER@/idf/asio.git