Skip to content

Commit a5a4db3

Browse files
committed
esp32: Update to latest ESP IDF.
Latest ESP IDF requires flash_partitions.c compiled into the bootloader. It also removed the "KEEP" directive from some parts of the linker script to reduce RAM usage for unused components, so we follow suit.
1 parent f645428 commit a5a4db3

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
lines changed

esp32/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ all: $(BUILD)/bootloader.bin $(BUILD)/partitions.bin $(BUILD)/application.bin
508508
.PHONY: idf-version deploy erase
509509

510510
idf-version:
511-
$(ECHO) "IDF version: 05fcdcfedbff88959a5e98c4b44010ac92475b31"
511+
$(ECHO) "IDF version: bf3093feca1f470bdd6caf45adf3b71492b84a19"
512512

513513
deploy: $(BUILD)/bootloader.bin $(BUILD)/partitions.bin $(BUILD)/application.bin
514514
$(ECHO) "Writing $^ to the board"
@@ -572,6 +572,7 @@ BOOTLOADER_OBJ = $(addprefix $(BUILD)/bootloader/$(ESPCOMP)/,\
572572
bootloader_support/src/secure_boot.o \
573573
bootloader_support/src/esp_image_format.o \
574574
bootloader_support/src/flash_encrypt.o \
575+
bootloader_support/src/flash_partitions.o \
575576
log/log.o \
576577
spi_flash/spi_flash_rom_patch.o \
577578
micro-ecc/micro-ecc/uECC.o \

esp32/esp32.custom_common.ld

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ SECTIONS
9999
*(.sbss2.*)
100100
*(.gnu.linkonce.sb2.*)
101101
*(.dynbss)
102-
KEEP(*(.bss))
102+
*(.bss)
103103
*(.bss.*)
104104
*(.share.mem)
105105
*(.gnu.linkonce.b.*)
@@ -111,17 +111,17 @@ SECTIONS
111111
.dram0.data :
112112
{
113113
_data_start = ABSOLUTE(.);
114-
KEEP(*(.data))
115-
KEEP(*(.data.*))
116-
KEEP(*(.gnu.linkonce.d.*))
117-
KEEP(*(.data1))
118-
KEEP(*(.sdata))
119-
KEEP(*(.sdata.*))
120-
KEEP(*(.gnu.linkonce.s.*))
121-
KEEP(*(.sdata2))
122-
KEEP(*(.sdata2.*))
123-
KEEP(*(.gnu.linkonce.s2.*))
124-
KEEP(*(.jcr))
114+
*(.data)
115+
*(.data.*)
116+
*(.gnu.linkonce.d.*)
117+
*(.data1)
118+
*(.sdata)
119+
*(.sdata.*)
120+
*(.gnu.linkonce.s.*)
121+
*(.sdata2)
122+
*(.sdata2.*)
123+
*(.gnu.linkonce.s2.*)
124+
*(.jcr)
125125
*(.dram1 .dram1.*)
126126
*libesp32.a:panic.o(.rodata .rodata.*)
127127
_data_end = ABSOLUTE(.);

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy