Skip to content

Commit 44515b5

Browse files
gschorchtgschorcht
committed
cpu/esp32: makefile migration to ESP-IDF v5.4
1 parent 47fc292 commit 44515b5

File tree

2 files changed

+75
-23
lines changed

2 files changed

+75
-23
lines changed

‎cpu/esp32/Makefile.dep‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,8 @@ ifneq (,$(filter esp_eth,$(USEMODULE)))
3636
USEMODULE += esp_idf_eth
3737
USEMODULE += esp_idf_event
3838
USEMODULE += esp_idf_gpio
39-
USEMODULE += esp_idf_spi_flash
4039
USEMODULE += netdev_eth
4140
USEMODULE += netopt
42-
USEMODULE += ztimer_msec
4341
endif
4442

4543
ifneq (,$(filter esp_wifi_any,$(USEMODULE)))
@@ -50,7 +48,6 @@ ifneq (,$(filter esp_wifi_any,$(USEMODULE)))
5048
USEMODULE += esp_idf_event
5149
USEMODULE += esp_idf_heap
5250
USEMODULE += esp_idf_nvs_flash
53-
USEMODULE += esp_idf_spi_flash
5451
USEMODULE += esp_idf_wifi
5552
USEMODULE += esp_idf_wpa_supplicant
5653
USEMODULE += esp_idf_wpa_supplicant_esp_supplicant
@@ -60,7 +57,7 @@ ifneq (,$(filter esp_wifi_any,$(USEMODULE)))
6057
USEMODULE += esp_idf_wpa_supplicant_crypto
6158
USEMODULE += esp_idf_wpa_supplicant_eap_peer
6259
USEMODULE += esp_idf_wpa_supplicant_rsn_supp
63-
USEMODULE += esp_idf_wpa_supplicant_tls
60+
# USEMODULE += esp_idf_wpa_supplicant_tls
6461
USEMODULE += esp_idf_wpa_supplicant_utils
6562
USEMODULE += esp_idf_wpa_supplicant_wps
6663
USEMODULE += pthread
@@ -123,7 +120,6 @@ ifneq (,$(filter esp_spi_ram,$(USEMODULE)))
123120
FEATURES_OPTIONAL += esp_spi_oct
124121
USEMODULE += esp_idf_gpio
125122
USEMODULE += esp_idf_heap
126-
USEMODULE += esp_idf_spi_flash
127123
USEMODULE += esp_idf_spi_ram
128124
endif
129125

@@ -147,6 +143,10 @@ ifneq (,$(filter esp_idf_heap,$(USEMODULE)))
147143
USEPKG += esp32_sdk_tlsf
148144
endif
149145

146+
ifneq (,$(filter esp_jtag,$(USEMODULE)))
147+
FEATURES_REQUIRED += esp_jtag
148+
endif
149+
150150
ifneq (,$(filter lcd_parallel_ll_mcu,$(USEMODULE)))
151151
USEMODULE += esp_lcd
152152
USEMODULE += esp_idf_lcd
@@ -206,11 +206,11 @@ ifneq (,$(filter tinyusb_portable_espressif,$(USEMODULE)))
206206
USEMODULE += esp_idf_usb
207207
endif
208208

209-
ifneq (,$(filter esp_jtag,$(USEMODULE)))
210-
FEATURES_REQUIRED += esp_jtag
211-
endif
212-
213209
# enable bootloader reset over USB, requires CDC ACM to be used
214210
ifneq (,$(filter usbus_cdc_acm tinyusb_class_cdc,$(USEMODULE)))
215211
USEMODULE += usb_board_reset
216212
endif
213+
214+
ifneq (,$(filter ztimer,$(USEMODULE)))
215+
USEMODULE += ztimer_auto_adjust
216+
endif

‎cpu/esp32/Makefile.include‎

Lines changed: 66 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -126,13 +126,17 @@ INCLUDES += -I$(RIOTCPU)/$(CPU)/vendor/include
126126

127127
INCLUDES += -I$(ESP32_SDK_DIR)/components
128128
INCLUDES += -I$(ESP32_SDK_DIR)/components/bootloader_support/include
129-
INCLUDES += -I$(ESP32_SDK_DIR)/components/driver/include
129+
INCLUDES += -I$(ESP32_SDK_DIR)/components/driver/deprecated
130+
INCLUDES += -I$(ESP32_SDK_DIR)/components/esp_adc/include
130131
INCLUDES += -I$(ESP32_SDK_DIR)/components/esp_common/include
132+
INCLUDES += -I$(ESP32_SDK_DIR)/components/esp_driver_gpio/include
131133
INCLUDES += -I$(ESP32_SDK_DIR)/components/esp_hw_support/include
132134
INCLUDES += -I$(ESP32_SDK_DIR)/components/esp_hw_support/include/soc
135+
INCLUDES += -I$(ESP32_SDK_DIR)/components/esp_hw_support/port/$(CPU_FAM)/include
133136
INCLUDES += -I$(ESP32_SDK_DIR)/components/esp_rom/$(CPU_FAM)
134137
INCLUDES += -I$(ESP32_SDK_DIR)/components/esp_rom/include
135-
INCLUDES += -I$(ESP32_SDK_DIR)/components/esp_rom/include/$(CPU_FAM)
138+
INCLUDES += -I$(ESP32_SDK_DIR)/components/esp_rom/$(CPU_FAM)/include
139+
INCLUDES += -I$(ESP32_SDK_DIR)/components/esp_rom/$(CPU_FAM)/include/$(CPU_FAM)
136140
INCLUDES += -I$(ESP32_SDK_DIR)/components/esp_system/include
137141
INCLUDES += -I$(ESP32_SDK_DIR)/components/esp_system/port/include
138142
INCLUDES += -I$(ESP32_SDK_DIR)/components/esp_timer/include
@@ -144,7 +148,9 @@ INCLUDES += -I$(ESP32_SDK_DIR)/components/log/include
144148
INCLUDES += -I$(ESP32_SDK_DIR)/components/newlib/platform_include
145149
INCLUDES += -I$(ESP32_SDK_DIR)/components/soc/include
146150
INCLUDES += -I$(ESP32_SDK_DIR)/components/soc/$(CPU_FAM)/include
151+
INCLUDES += -I$(ESP32_SDK_DIR)/components/soc/$(CPU_FAM)/register
147152
INCLUDES += -I$(ESP32_SDK_DIR)/components/spi_flash/include
153+
INCLUDES += -I$(ESP32_SDK_DIR)/components/spi_flash/include/spi_flash
148154

149155
ifneq (,$(filter riscv32%,$(TARGET_ARCH)))
150156
INCLUDES += -I$(ESP32_SDK_DIR)/components/riscv/include
@@ -156,22 +162,35 @@ ifneq (,$(filter xtensa%,$(TARGET_ARCH)))
156162
endif
157163

158164
ifneq (,$(filter esp_ble,$(USEMODULE)))
159-
INCLUDES += -I$(ESP32_SDK_DIR)/components/bt/include/$(CPU_FAM)/include
165+
ifeq (esp32,$(CPU_FAM))
166+
INCLUDES += -I$(ESP32_SDK_DIR)/components/bt/include/$(CPU_FAM)/include
167+
else ifneq (,$(filter esp32s3 esp32c3,$(CPU_FAM)))
168+
INCLUDES += -I$(ESP32_SDK_DIR)/components/bt/include/esp32c3/include
169+
endif
160170
endif
161171

162172
ifneq (,$(filter esp_ble_nimble,$(USEMODULE)))
163173
INCLUDES += -I$(RIOTCPU)/$(CPU)/include/esp_ble_nimble
164174
INCLUDES += $(NIMIBASE)/nimble/transport/common/hci_h4/include
165175
endif
166176

177+
ifneq (,$(filter esp_i2c_hw,$(USEMODULE)))
178+
INCLUDES += -I$(ESP32_SDK_DIR)/components/esp_driver_i2c/include
179+
INCLUDES += -I$(ESP32_SDK_DIR)/components/esp_pm/include
180+
endif
181+
167182
ifneq (,$(filter esp_spi_ram,$(USEMODULE)))
168-
INCLUDES += -I$(ESP32_SDK_DIR)/components/esp_hw_support/include/soc/$(CPU_FAM)
183+
INCLUDES += -I$(ESP32_SDK_DIR)/components/esp_psram/include
169184
endif
170185

171186
ifneq (,$(filter esp_idf_lcd,$(USEMODULE)))
172187
INCLUDES += -I$(ESP32_SDK_DIR)/components/esp_lcd/include
173188
endif
174189

190+
ifneq (,$(filter esp_idf_nvs_flash,$(USEMODULE)))
191+
INCLUDES += -I$(ESP32_SDK_DIR)/components/esp_partition/include
192+
endif
193+
175194
ifneq (,$(filter esp_idf_spi_flash,$(USEMODULE)))
176195
INCLUDES += -I$(ESP32_SDK_DIR)/components/spi_flash/include
177196
endif
@@ -202,14 +221,26 @@ ifneq (,$(filter esp_eth,$(USEMODULE)))
202221
INCLUDES += -I$(ESP32_SDK_DIR)/components/esp_wifi/include
203222
endif
204223

224+
ifneq (,$(filter periph_sdmmc,$(USEMODULE)))
225+
INCLUDES += -I$(ESP32_SDK_DIR)/components/esp_driver_sdmmc/include
226+
INCLUDES += -I$(ESP32_SDK_DIR)/components/sdmmc/include
227+
INCLUDES += -I$(ESP32_SDK_DIR)/components/esp_hw_support/dma/include
228+
endif
229+
230+
ifneq (,$(filter ws281x_esp32_hw,$(USEMODULE)))
231+
INCLUDES += -I$(ESP32_SDK_DIR)/components/driver/deprecated
232+
CFLAGS += -DCONFIG_RMT_SUPPRESS_DEPRECATE_WARN
233+
endif
234+
205235
CFLAGS += -DCPU_FAM_$(call uppercase_and_underscore,$(CPU_FAM))
206236

207-
# we use ESP32 only in single core mode
237+
# we use ESP32x SoC only in single core mode
208238
CFLAGS += -DCONFIG_ESP_SYSTEM_SINGLE_CORE_MODE
209239
CFLAGS += -DCONFIG_FREERTOS_UNICORE
210240

211241
# other ESP-IDF configurations
212242
CFLAGS += -DCONFIG_IDF_TARGET_$(call uppercase_and_underscore,$(CPU_FAM))
243+
CFLAGS += -DCONFIG_IDF_TARGET=\"$(CPU_FAM)\"
213244
CFLAGS += -DESP_PLATFORM
214245
CFLAGS += -DLOG_TAG_IN_BRACKETS
215246

@@ -246,7 +277,9 @@ CFLAGS += -D_CONST=const
246277

247278
# TODO no relaxation yet
248279
ifneq (,$(filter riscv%,$(TARGET_ARCH)))
280+
CFLAGS += -DCONFIG_IDF_TARGET_ARCH_RISCV
249281
CFLAGS += -mno-relax -march=rv32imc_zicsr_zifencei -mabi=ilp32 -DRISCV_NO_RELAX
282+
LDGENFLAGS += -DCONFIG_IDF_TARGET_ARCH_RISCV
250283
LINKFLAGS += -mno-relax -march=rv32imc_zicsr_zifencei -mabi=ilp32
251284
GCC_NEW_RISCV_ISA ?= $(shell echo "typedef int dont_be_pedantic;" | \
252285
$(TARGET_ARCH)-gcc -march=rv32imac -mabi=ilp32 \
@@ -258,6 +291,8 @@ ifneq (,$(filter riscv%,$(TARGET_ARCH)))
258291
endif
259292

260293
ifneq (,$(filter xtensa%,$(TARGET_ARCH)))
294+
CFLAGS += -DCONFIG_IDF_TARGET_ARCH_XTENSA
295+
LDGENFLAGS += -DCONFIG_IDF_TARGET_ARCH_XTENSA
261296
LINKFLAGS += -L$(ESP32_SDK_DIR)/components/xtensa/$(CPU_FAM)
262297
ARCHIVES += -lxt_hal
263298
endif
@@ -272,13 +307,25 @@ LINKFLAGS += -T$(ESP32_SDK_DIR)/components/esp_rom/$(CPU_FAM)/ld/$(CPU_FAM).rom.
272307
LINKFLAGS += -T$(ESP32_SDK_DIR)/components/esp_rom/$(CPU_FAM)/ld/$(CPU_FAM).rom.api.ld
273308
LINKFLAGS += -T$(ESP32_SDK_DIR)/components/esp_rom/$(CPU_FAM)/ld/$(CPU_FAM).rom.libgcc.ld
274309

275-
ifeq (esp32s2,$(CPU_FAM))
276-
LINKFLAGS += -T$(ESP32_SDK_DIR)/components/esp_rom/$(CPU_FAM)/ld/$(CPU_FAM).rom.spiflash.ld
310+
ifeq (esp32,$(CPU_FAM))
311+
# We don't use newlibc functions in ROM for ESP32
312+
# LINKFLAGS += -T$(ESP32_SDK_DIR)/components/esp_rom/$(CPU_FAM)/ld/$(CPU_FAM).rom.newlib-data.ld
313+
# LINKFLAGS += -T$(ESP32_SDK_DIR)/components/esp_rom/$(CPU_FAM)/ld/$(CPU_FAM).rom.newlib-funcs.lds
314+
else ifeq (esp32s2,$(CPU_FAM))
315+
# We don't use newlibc functions in ROM for ESP32-S2
316+
# LINKFLAGS += -T$(ESP32_SDK_DIR)/components/esp_rom/$(CPU_FAM)/ld/$(CPU_FAM).rom.newlib-data.ld
317+
# LINKFLAGS += -T$(ESP32_SDK_DIR)/components/esp_rom/$(CPU_FAM)/ld/$(CPU_FAM).rom.newlib-funcs.ld
318+
LINKFLAGS += -T$(ESP32_SDK_DIR)/components/esp_rom/$(CPU_FAM)/ld/$(CPU_FAM).rom.spiflash_legacy.ld
319+
else ifeq (esp32s3,$(CPU_FAM))
320+
LINKFLAGS += -T$(ESP32_SDK_DIR)/components/esp_rom/$(CPU_FAM)/ld/$(CPU_FAM).rom.ble_cca.ld
321+
LINKFLAGS += -T$(ESP32_SDK_DIR)/components/esp_rom/$(CPU_FAM)/ld/$(CPU_FAM).rom.bt_funcs.ld
322+
LINKFLAGS += -T$(ESP32_SDK_DIR)/components/esp_rom/$(CPU_FAM)/ld/$(CPU_FAM).rom.newlib.ld
277323
else ifeq (esp32c3,$(CPU_FAM))
324+
LINKFLAGS += -T$(ESP32_SDK_DIR)/components/esp_rom/$(CPU_FAM)/ld/$(CPU_FAM).rom.ble_cca.ld
325+
LINKFLAGS += -T$(ESP32_SDK_DIR)/components/esp_rom/$(CPU_FAM)/ld/$(CPU_FAM).rom.bt_funcs.ld
278326
LINKFLAGS += -T$(ESP32_SDK_DIR)/components/esp_rom/$(CPU_FAM)/ld/$(CPU_FAM).rom.newlib.ld
279327
LINKFLAGS += -T$(ESP32_SDK_DIR)/components/esp_rom/$(CPU_FAM)/ld/$(CPU_FAM).rom.eco3.ld
280-
else ifeq (esp32s3,$(CPU_FAM))
281-
LINKFLAGS += -T$(ESP32_SDK_DIR)/components/esp_rom/$(CPU_FAM)/ld/$(CPU_FAM).rom.newlib.ld
328+
LINKFLAGS += -T$(ESP32_SDK_DIR)/components/riscv/ld/rom.api.ld
282329
endif
283330

284331
LINKFLAGS += -nostdlib -lgcc -Wl,-gc-sections
@@ -293,6 +340,7 @@ endif
293340
ifneq (,$(filter esp_wifi_any,$(USEMODULE)))
294341
LINKFLAGS += -L$(ESP32_SDK_LIB_WIFI_DIR)/$(CPU_FAM)
295342
LINKFLAGS += -L$(ESP32_SDK_LIB_PHY_DIR)/$(CPU_FAM)
343+
LINKFLAGS += -L$(ESP32_SDK_LIB_COEXIST_DIR)/$(CPU_FAM)
296344
ARCHIVES += -lcoexist -lcore -lmesh -lnet80211 -lpp
297345
ARCHIVES += -lphy -lstdc++
298346
ifeq (esp32,$(CPU_FAM))
@@ -342,13 +390,17 @@ ifneq (,$(filter esp_jtag,$(USEMODULE)))
342390
endif
343391

344392
LD_SCRIPTS += $(BINDIR)/memory.ld $(BINDIR)/sections.ld
393+
LDGENFLAGS += -DLD_FILE_GEN
394+
LDGENFLAGS += -DRESERVE_RTC_MEM=0x18
395+
LDGENFLAGS += -DESP_BOOTLOADER_RESERVE_RTC=0x18
345396

346-
$(BINDIR)/memory.ld: $(RIOTCPU)/$(CPU)/ld/$(CPU_FAM)/memory.ld.in \
397+
$(BINDIR)/memory.ld: $(RIOTCPU)/$(CPU)/vendor/ld/$(CPU_FAM)/memory.ld.in \
347398
$(BINDIR)/riotbuild/riotbuild.h pkg-prepare
348-
$(Q)$(CC) -DLD_FILE_GEN $(INCLUDES) -include '$(BINDIR)/riotbuild/riotbuild.h' \
349-
-I$(RIOTCPU)/$(CPU)/ld -P -x c -E $< -o $@
350-
$(BINDIR)/sections.ld: $(RIOTCPU)/$(CPU)/ld/$(CPU_FAM)/sections.ld.in \
399+
$(Q)$(CC) $(INCLUDES) -include '$(BINDIR)/riotbuild/riotbuild.h' \
400+
$(LDGENFLAGS) -I$(RIOTCPU)/$(CPU)/vendor/ld -P -x c -E $< -o $@
401+
$(BINDIR)/sections.ld: $(RIOTCPU)/$(CPU)/vendor/ld/$(CPU_FAM)/sections.ld.in \
351402
$(BINDIR)/riotbuild/riotbuild.h pkg-prepare
352-
$(Q)$(CC) -DLD_FILE_GEN -include '$(BINDIR)/riotbuild/riotbuild.h' -C -P -x c -E $< -o $@
403+
$(Q)$(CC) $(INCLUDES) -include '$(BINDIR)/riotbuild/riotbuild.h' \
404+
$(LDGENFLAGS) -I$(RIOTCPU)/$(CPU)/vendor/ld -C -P -x c -E $< -o $@
353405

354406
$(BOOTLOADER_BIN):

0 commit comments

Comments
 (0)