Merge branch 'bugfix/rom_export_functions' into 'master'

esp32, bootloader: fix issues related to linking order See merge request idf/esp-idf!3375
2018-10-05 12:40:05 +08:00
parent 7313e39fde 9240bbb708
commit 1b272bb77e
8 changed files with 71 additions and 55 deletions
@@ -1,7 +1,6 @@
 set(COMPONENT_SRCS "src/bootloader_clock.c"
                   "src/bootloader_common.c"
                   "src/bootloader_flash.c"
-                   "src/bootloader_init.c"
                   "src/bootloader_random.c"
                   "src/bootloader_sha.c"
                   "src/bootloader_utility.c"
@@ -17,6 +16,7 @@ if(${BOOTLOADER_BUILD})
    set(COMPONENT_ADD_INCLUDEDIRS "include include_bootloader")
    set(COMPONENT_REQUIRES)
    set(COMPONENT_PRIV_REQUIRES spi_flash micro-ecc)
+    list(APPEND COMPONENT_SRCS "src/bootloader_init.c")
 else()
    set(COMPONENT_ADD_INCLUDEDIRS "include")
    set(COMPONENT_PRIV_INCLUDEDIRS "include_bootloader")
@@ -9,6 +9,10 @@ endif

 COMPONENT_SRCDIRS := src

+ifndef IS_BOOTLOADER_BUILD
+COMPONENT_OBJEXCLUDE := src/bootloader_init.o
+endif
+
 #
 # Secure boot signing key support
 #