Skip to content

Commit 2e49617

Browse files
authored
Merge pull request #21714 from gschorcht/cpu/esp32/esp-idf-rmt-fix-21690
cpu/esp32/esp-idf-rmt: fix compilation together with Nimble and WiFi
2 parents 63c2a81 + 952f649 commit 2e49617

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

cpu/esp32/esp-idf/rmt/Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ ESP32_SDK_SRC = \
1111
#
1212

1313
ifeq (esp32s3,$(CPU_FAM))
14-
ESP32_SDK_SRC += components/bootloader_support/src/flash_encrypt.c
14+
ifeq (,$(filter esp_idf_nvs_flash,$(USEMODULE)))
15+
# this file is already compiled in `esp_idf_nvs_flash`
16+
# don't compile it again if `esp_idf_nvs_flash` is used
17+
ESP32_SDK_SRC += components/bootloader_support/src/flash_encrypt.c
18+
endif
1519
ESP32_SDK_SRC += components/esp_hw_support/dma/gdma.c
1620
ESP32_SDK_SRC += components/hal/gdma_hal_ahb_v1.c
1721
ESP32_SDK_SRC += components/hal/gdma_hal_top.c

0 commit comments

Comments
 (0)