Merge branch 'bugfix/pass_IDF_TARGET_to_bootloader_build' into 'master'

pass IDF_TARGET variable to bootloader build process

See merge request idf/esp-idf!4963
pull/3456/head
Ivan Grokhotkov 2019-05-09 19:45:20 +08:00
commit c2aef48a57
2 zmienionych plików z 6 dodań i 1 usunięć

Wyświetl plik

@ -51,7 +51,7 @@ if((NOT CONFIG_SECURE_BOOT_ENABLED) OR
# TODO: support overriding the bootloader in COMPONENT_PATHS
SOURCE_DIR "${IDF_PATH}/components/bootloader/subproject"
BINARY_DIR "${BOOTLOADER_BUILD_DIR}"
CMAKE_ARGS -DSDKCONFIG=${SDKCONFIG} -DIDF_PATH=${IDF_PATH}
CMAKE_ARGS -DSDKCONFIG=${SDKCONFIG} -DIDF_PATH=${IDF_PATH} -DIDF_TARGET=${IDF_TARGET}
-DSECURE_BOOT_SIGNING_KEY=${secure_boot_signing_key}
INSTALL_COMMAND ""
BUILD_ALWAYS 1 # no easy way around this...

Wyświetl plik

@ -10,6 +10,11 @@ if(NOT IDF_PATH)
"in by the parent build process.")
endif()
if(NOT IDF_TARGET)
message(FATAL_ERROR "Bootloader subproject expects the IDF_TARGET variable to be passed "
"in by the parent build process.")
endif()
set(COMPONENTS bootloader esptool_py partition_table soc bootloader_support log spi_flash micro-ecc main efuse)
set(BOOTLOADER_BUILD 1)
add_definitions(-DBOOTLOADER_BUILD=1)