From ce634ef221cc919ca94f62ab99e6d06912613969 Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Fri, 13 Jul 2018 15:21:07 +1000 Subject: [PATCH] bootloader: Fix secure boot & flash encryption functionality Fixes regression in 3e0ac4db79. --- .../subproject/main/esp32.bootloader.ld | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/components/bootloader/subproject/main/esp32.bootloader.ld b/components/bootloader/subproject/main/esp32.bootloader.ld index 2c5778c39c..b89bba1248 100644 --- a/components/bootloader/subproject/main/esp32.bootloader.ld +++ b/components/bootloader/subproject/main/esp32.bootloader.ld @@ -36,19 +36,25 @@ SECTIONS *(.iram1 .iram1.*) /* catch stray IRAM_ATTR */ *liblog.a:(.literal .text .literal.* .text.*) *libgcc.a:(.literal .text .literal.* .text.*) - *libbootloader_support.a:bootloader_utility.o(.literal .text .literal.* .text.*) - *libbootloader_support.a:esp_image_format.o(.literal .text .literal.* .text.*) - *libbootloader_support.a:bootloader_random.o(.literal .text .literal.* .text.*) *libbootloader_support.a:bootloader_flash.o(.literal .text .literal.* .text.*) - *libbootloader_support.a:flash_partitions.o(.literal .text .literal.* .text.*) + *libbootloader_support.a:bootloader_random.o(.literal .text .literal.* .text.*) + *libbootloader_support.a:bootloader_utility.o(.literal .text .literal.* .text.*) *libbootloader_support.a:bootloader_sha.o(.literal .text .literal.* .text.*) + *libbootloader_support.a:efuse.o(.literal .text .literal.* .text.*) + *libbootloader_support.a:esp_image_format.o(.literal .text .literal.* .text.*) + *libbootloader_support.a:flash_encrypt.o(.literal .text .literal.* .text.*) + *libbootloader_support.a:flash_partitions.o(.literal .text .literal.* .text.*) + *libbootloader_support.a:secure_boot.o(.literal .text .literal.* .text.*) + *libbootloader_support.a:secure_boot_signatures.o(.literal .text .literal.* .text.*) + *libmicro-ecc.a:*.o(.literal .text .literal.* .text.*) + *libspi_flash.a:*.o(.literal .text .literal.* .text.*) *(.fini.literal) *(.fini) *(.gnu.version) _text_end = ABSOLUTE(.); _etext = .; } > iram_loader_seg - + .iram.text : { . = ALIGN (16);