espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-03 20:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

bootloader_support: exclude bootloader_init.c when building app

Browse Source 
Depending on link order of libraries, bootloader implementation of
__assert_func could be linked instead of the one provided by newlib.
This commit is contained in:
Ivan Grokhotkov
2018-09-30 12:27:06 +08:00
parent 8c1d9e70b5
commit 9845219a5f
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/bootloader_support/CMakeLists.txt
View File

@@ -1,7 +1,6 @@
set(COMPONENT_SRCS "src/bootloader_clock.c" set(COMPONENT_SRCS "src/bootloader_clock.c"
"src/bootloader_common.c" "src/bootloader_common.c"
"src/bootloader_flash.c" "src/bootloader_flash.c"
"src/bootloader_init.c"
"src/bootloader_random.c" "src/bootloader_random.c"
"src/bootloader_sha.c" "src/bootloader_sha.c"
"src/bootloader_utility.c" "src/bootloader_utility.c"
@@ -17,6 +16,7 @@ if(${BOOTLOADER_BUILD})
set(COMPONENT_ADD_INCLUDEDIRS "include include_priv") set(COMPONENT_ADD_INCLUDEDIRS "include include_priv")
set(COMPONENT_REQUIRES) set(COMPONENT_REQUIRES)
set(COMPONENT_PRIV_REQUIRES spi_flash micro-ecc) set(COMPONENT_PRIV_REQUIRES spi_flash micro-ecc)
list(APPEND COMPONENT_SRCS "src/bootloader_init.c")
else() else()
set(COMPONENT_ADD_INCLUDEDIRS "include") set(COMPONENT_ADD_INCLUDEDIRS "include")
set(COMPONENT_PRIV_INCLUDEDIRS "include_priv") set(COMPONENT_PRIV_INCLUDEDIRS "include_priv")

4
components/bootloader_support/component.mk
View File

@@ -9,6 +9,10 @@ endif
COMPONENT_SRCDIRS := src COMPONENT_SRCDIRS := src
ifndef IS_BOOTLOADER_BUILD
COMPONENT_OBJEXCLUDE := src/bootloader_init.o
endif
# #
# Secure boot signing key support # Secure boot signing key support
# #