Disable IRAM optimization for WiFi

espressif · Nov 15, 2020 · 954df2f · 954df2f
1 parent cecef8e
commit 954df2f
Show file tree

Hide file tree

Showing 75 changed files with 8 additions and 14 deletions.
diff --git a/platform.txt b/platform.txt
@@ -35,7 +35,7 @@ compiler.S.flags=-c -g3 -x assembler-with-cpp -MMD -mlongcalls
 
 compiler.c.elf.cmd=xtensa-esp32-elf-gcc
 compiler.c.elf.flags=-nostdlib "-L{compiler.sdk.path}/lib" "-L{compiler.sdk.path}/ld" -T esp32_out.ld -T esp32.project.ld -T esp32.rom.ld -T esp32.peripherals.ld -T esp32.rom.libgcc.ld -T esp32.rom.spiram_incompatible_fns.ld -u ld_include_panic_highint_hdl -u call_user_start_cpu0 -Wl,--gc-sections -Wl,-static -Wl,--undefined=uxTopUsedPriority  -u __cxa_guard_dummy -u __cxx_fatal_exception
-compiler.c.elf.libs=-lgcc -lfatfs -lcore -lfr -lc_nano -lwpa_supplicant -lulp -ldl -lface_detection -lesp32 -llog -llwip -lmbedtls -lespnow -lprotobuf-c -ljsmn -lspi_flash -lnet80211 -lod -lesp_ringbuf -lnvs_flash -ltcpip_adapter -lesp_event -lbootloader_support -lcxx -lmesh -lexpat -lprotocomm -lsmartconfig_ack -lesp_https_server -lm -lsmartconfig -lvfs -lwps -lwpa -lxtensa-debug-module -lmdns -lbtdm_app -lrtc -lsoc -lbt -lwpa2 -lesp_adc_cal -lapp_trace -lspiffs -lnewlib -lesp32-camera -lesp_http_server -lesp-tls -lfreertos -lcoap -ljson -lasio -lmicro-ecc -lpp -lesp_websocket_client -lconsole -lhal -lopenssl -lheap -lespcoredump -ldetection -lnghttp -lapp_update -ldriver -lefuse -lesp_https_ota -lphy -lc -ldetection_cat_face -lfd -limage_util -lwifi_provisioning -lface_recognition -lethernet -lcoexist -lmqtt -llibsodium -lwear_levelling -lesp_http_client -lpthread -lfreemodbus -ltcp_transport -lfb_gfx -lpe -lsdmmc -lunity  -lstdc++
+compiler.c.elf.libs=-lgcc -lopenssl -lbtdm_app -lfatfs -lwps -lcoexist -lwear_levelling -lesp_http_client -lprotobuf-c -lhal -lnewlib -ldriver -lbootloader_support -lpp -lfreemodbus -lmesh -lsmartconfig -ljsmn -lwpa -lethernet -lphy -lapp_trace -lconsole -lulp -lwpa_supplicant -lfreertos -lbt -lmicro-ecc -lesp32-camera -lcxx -lxtensa-debug-module -ltcp_transport -lod -lmdns -ldetection -lvfs -lpe -lesp_websocket_client -lespcoredump -lesp_ringbuf -lsoc -lcore -lfb_gfx -lsdmmc -llibsodium -lcoap -ltcpip_adapter -lprotocomm -lesp_event -limage_util -lc_nano -lesp-tls -lasio -lrtc -lspi_flash -lwpa2 -lwifi_provisioning -lesp32 -lface_recognition -lapp_update -lnghttp -ldl -lspiffs -lface_detection -lefuse -lunity -lesp_https_server -lespnow -lnvs_flash -lesp_adc_cal -llog -ldetection_cat_face -lsmartconfig_ack -lexpat -lm -lfr -lmqtt -lc -lheap -lmbedtls -llwip -lnet80211 -lesp_http_server -lpthread -ljson -lesp_https_ota -lfd  -lstdc++
 
 compiler.as.cmd=xtensa-esp32-elf-as
 

diff --git a/tools/platformio-build.py b/tools/platformio-build.py
@@ -171,7 +171,7 @@
     ],
 
     LIBS=[
-        "-lgcc", "-lfatfs", "-lcore", "-lfr", "-lc_nano", "-lwpa_supplicant", "-lulp", "-ldl", "-lface_detection", "-lesp32", "-llog", "-llwip", "-lmbedtls", "-lespnow", "-lprotobuf-c", "-ljsmn", "-lspi_flash", "-lnet80211", "-lod", "-lesp_ringbuf", "-lnvs_flash", "-ltcpip_adapter", "-lesp_event", "-lbootloader_support", "-lcxx", "-lmesh", "-lexpat", "-lprotocomm", "-lsmartconfig_ack", "-lesp_https_server", "-lm", "-lsmartconfig", "-lvfs", "-lwps", "-lwpa", "-lxtensa-debug-module", "-lmdns", "-lbtdm_app", "-lrtc", "-lsoc", "-lbt", "-lwpa2", "-lesp_adc_cal", "-lapp_trace", "-lspiffs", "-lnewlib", "-lesp32-camera", "-lesp_http_server", "-lesp-tls", "-lfreertos", "-lcoap", "-ljson", "-lasio", "-lmicro-ecc", "-lpp", "-lesp_websocket_client", "-lconsole", "-lhal", "-lopenssl", "-lheap", "-lespcoredump", "-ldetection", "-lnghttp", "-lapp_update", "-ldriver", "-lefuse", "-lesp_https_ota", "-lphy", "-lc", "-ldetection_cat_face", "-lfd", "-limage_util", "-lwifi_provisioning", "-lface_recognition", "-lethernet", "-lcoexist", "-lmqtt", "-llibsodium", "-lwear_levelling", "-lesp_http_client", "-lpthread", "-lfreemodbus", "-ltcp_transport", "-lfb_gfx", "-lpe", "-lsdmmc", "-lunity", "-lstdc++"
+        "-lgcc", "-lopenssl", "-lbtdm_app", "-lfatfs", "-lwps", "-lcoexist", "-lwear_levelling", "-lesp_http_client", "-lprotobuf-c", "-lhal", "-lnewlib", "-ldriver", "-lbootloader_support", "-lpp", "-lfreemodbus", "-lmesh", "-lsmartconfig", "-ljsmn", "-lwpa", "-lethernet", "-lphy", "-lapp_trace", "-lconsole", "-lulp", "-lwpa_supplicant", "-lfreertos", "-lbt", "-lmicro-ecc", "-lesp32-camera", "-lcxx", "-lxtensa-debug-module", "-ltcp_transport", "-lod", "-lmdns", "-ldetection", "-lvfs", "-lpe", "-lesp_websocket_client", "-lespcoredump", "-lesp_ringbuf", "-lsoc", "-lcore", "-lfb_gfx", "-lsdmmc", "-llibsodium", "-lcoap", "-ltcpip_adapter", "-lprotocomm", "-lesp_event", "-limage_util", "-lc_nano", "-lesp-tls", "-lasio", "-lrtc", "-lspi_flash", "-lwpa2", "-lwifi_provisioning", "-lesp32", "-lface_recognition", "-lapp_update", "-lnghttp", "-ldl", "-lspiffs", "-lface_detection", "-lefuse", "-lunity", "-lesp_https_server", "-lespnow", "-lnvs_flash", "-lesp_adc_cal", "-llog", "-ldetection_cat_face", "-lsmartconfig_ack", "-lexpat", "-lm", "-lfr", "-lmqtt", "-lc", "-lheap", "-lmbedtls", "-llwip", "-lnet80211", "-lesp_http_server", "-lpthread", "-ljson", "-lesp_https_ota", "-lfd", "-lstdc++"
     ],
 
     LIBSOURCE_DIRS=[

diff --git a/tools/sdk/bin/bootloader_dio_40m.bin b/tools/sdk/bin/bootloader_dio_40m.bin
diff --git a/tools/sdk/bin/bootloader_dio_80m.bin b/tools/sdk/bin/bootloader_dio_80m.bin
diff --git a/tools/sdk/bin/bootloader_dout_40m.bin b/tools/sdk/bin/bootloader_dout_40m.bin
diff --git a/tools/sdk/bin/bootloader_dout_80m.bin b/tools/sdk/bin/bootloader_dout_80m.bin
diff --git a/tools/sdk/bin/bootloader_qio_40m.bin b/tools/sdk/bin/bootloader_qio_40m.bin
diff --git a/tools/sdk/bin/bootloader_qio_80m.bin b/tools/sdk/bin/bootloader_qio_80m.bin
diff --git a/tools/sdk/bin/bootloader_qout_40m.bin b/tools/sdk/bin/bootloader_qout_40m.bin
diff --git a/tools/sdk/bin/bootloader_qout_80m.bin b/tools/sdk/bin/bootloader_qout_80m.bin
diff --git a/tools/sdk/include/config/sdkconfig.h b/tools/sdk/include/config/sdkconfig.h
@@ -245,7 +245,6 @@
 #define CONFIG_SPIFFS_GC_MAX_RUNS 10
 #define CONFIG_ARDUINO_RUN_CORE1 1
 #define CONFIG_ESP32_APPTRACE_DEST_NONE 1
-#define CONFIG_ESP32_WIFI_RX_IRAM_OPT 1
 #define CONFIG_HP_NANO1 1
 #define CONFIG_MBEDTLS_INTERNAL_MEM_ALLOC 1
 #define CONFIG_MBEDTLS_SSL_PROTO_TLS1_2 1
@@ -393,7 +392,6 @@
 #define CONFIG_HD_NANO1 1
 #define CONFIG_BTDM_MODEM_SLEEP_MODE_ORIG 1
 #define CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL_ERROR 1
-#define CONFIG_ESP32_WIFI_IRAM_OPT 1
 #define CONFIG_FATFS_API_ENCODING_ANSI_OEM 1
-#define CONFIG_ARDUINO_IDF_COMMIT "68b237fe5"
+#define CONFIG_ARDUINO_IDF_COMMIT "66d3783c8"
 #define CONFIG_ARDUINO_IDF_BRANCH "release/v3.3"
diff --git a/tools/sdk/ld/esp32.project.ld b/tools/sdk/ld/esp32.project.ld
diff --git a/tools/sdk/lib/libapp_trace.a b/tools/sdk/lib/libapp_trace.a
diff --git a/tools/sdk/lib/libapp_update.a b/tools/sdk/lib/libapp_update.a
diff --git a/tools/sdk/lib/libasio.a b/tools/sdk/lib/libasio.a
diff --git a/tools/sdk/lib/libbootloader_support.a b/tools/sdk/lib/libbootloader_support.a
diff --git a/tools/sdk/lib/libbt.a b/tools/sdk/lib/libbt.a
diff --git a/tools/sdk/lib/libcoap.a b/tools/sdk/lib/libcoap.a
diff --git a/tools/sdk/lib/libconsole.a b/tools/sdk/lib/libconsole.a
diff --git a/tools/sdk/lib/libcxx.a b/tools/sdk/lib/libcxx.a
diff --git a/tools/sdk/lib/libdriver.a b/tools/sdk/lib/libdriver.a
diff --git a/tools/sdk/lib/libefuse.a b/tools/sdk/lib/libefuse.a
diff --git a/tools/sdk/lib/libesp-tls.a b/tools/sdk/lib/libesp-tls.a
diff --git a/tools/sdk/lib/libesp32-camera.a b/tools/sdk/lib/libesp32-camera.a
diff --git a/tools/sdk/lib/libesp32.a b/tools/sdk/lib/libesp32.a
diff --git a/tools/sdk/lib/libesp_adc_cal.a b/tools/sdk/lib/libesp_adc_cal.a
diff --git a/tools/sdk/lib/libesp_event.a b/tools/sdk/lib/libesp_event.a
diff --git a/tools/sdk/lib/libesp_http_client.a b/tools/sdk/lib/libesp_http_client.a
diff --git a/tools/sdk/lib/libesp_http_server.a b/tools/sdk/lib/libesp_http_server.a
diff --git a/tools/sdk/lib/libesp_https_ota.a b/tools/sdk/lib/libesp_https_ota.a
diff --git a/tools/sdk/lib/libesp_https_server.a b/tools/sdk/lib/libesp_https_server.a
diff --git a/tools/sdk/lib/libesp_ringbuf.a b/tools/sdk/lib/libesp_ringbuf.a
diff --git a/tools/sdk/lib/libesp_websocket_client.a b/tools/sdk/lib/libesp_websocket_client.a
diff --git a/tools/sdk/lib/libespcoredump.a b/tools/sdk/lib/libespcoredump.a
diff --git a/tools/sdk/lib/libethernet.a b/tools/sdk/lib/libethernet.a
diff --git a/tools/sdk/lib/libexpat.a b/tools/sdk/lib/libexpat.a
diff --git a/tools/sdk/lib/libface_detection.a b/tools/sdk/lib/libface_detection.a
diff --git a/tools/sdk/lib/libface_recognition.a b/tools/sdk/lib/libface_recognition.a
diff --git a/tools/sdk/lib/libfatfs.a b/tools/sdk/lib/libfatfs.a
diff --git a/tools/sdk/lib/libfb_gfx.a b/tools/sdk/lib/libfb_gfx.a
diff --git a/tools/sdk/lib/libfreemodbus.a b/tools/sdk/lib/libfreemodbus.a
diff --git a/tools/sdk/lib/libfreertos.a b/tools/sdk/lib/libfreertos.a
diff --git a/tools/sdk/lib/libheap.a b/tools/sdk/lib/libheap.a
diff --git a/tools/sdk/lib/libimage_util.a b/tools/sdk/lib/libimage_util.a
diff --git a/tools/sdk/lib/libjsmn.a b/tools/sdk/lib/libjsmn.a
diff --git a/tools/sdk/lib/libjson.a b/tools/sdk/lib/libjson.a
diff --git a/tools/sdk/lib/liblibsodium.a b/tools/sdk/lib/liblibsodium.a
diff --git a/tools/sdk/lib/liblog.a b/tools/sdk/lib/liblog.a
diff --git a/tools/sdk/lib/liblwip.a b/tools/sdk/lib/liblwip.a
diff --git a/tools/sdk/lib/libmbedtls.a b/tools/sdk/lib/libmbedtls.a
diff --git a/tools/sdk/lib/libmdns.a b/tools/sdk/lib/libmdns.a
diff --git a/tools/sdk/lib/libmicro-ecc.a b/tools/sdk/lib/libmicro-ecc.a
diff --git a/tools/sdk/lib/libmqtt.a b/tools/sdk/lib/libmqtt.a
diff --git a/tools/sdk/lib/libnewlib.a b/tools/sdk/lib/libnewlib.a
diff --git a/tools/sdk/lib/libnghttp.a b/tools/sdk/lib/libnghttp.a
diff --git a/tools/sdk/lib/libnvs_flash.a b/tools/sdk/lib/libnvs_flash.a
diff --git a/tools/sdk/lib/libopenssl.a b/tools/sdk/lib/libopenssl.a
diff --git a/tools/sdk/lib/libprotobuf-c.a b/tools/sdk/lib/libprotobuf-c.a
diff --git a/tools/sdk/lib/libprotocomm.a b/tools/sdk/lib/libprotocomm.a
diff --git a/tools/sdk/lib/libpthread.a b/tools/sdk/lib/libpthread.a
diff --git a/tools/sdk/lib/libsdmmc.a b/tools/sdk/lib/libsdmmc.a
diff --git a/tools/sdk/lib/libsmartconfig_ack.a b/tools/sdk/lib/libsmartconfig_ack.a
diff --git a/tools/sdk/lib/libsoc.a b/tools/sdk/lib/libsoc.a
diff --git a/tools/sdk/lib/libspi_flash.a b/tools/sdk/lib/libspi_flash.a
diff --git a/tools/sdk/lib/libspiffs.a b/tools/sdk/lib/libspiffs.a
diff --git a/tools/sdk/lib/libtcp_transport.a b/tools/sdk/lib/libtcp_transport.a
diff --git a/tools/sdk/lib/libtcpip_adapter.a b/tools/sdk/lib/libtcpip_adapter.a
diff --git a/tools/sdk/lib/libulp.a b/tools/sdk/lib/libulp.a
diff --git a/tools/sdk/lib/libunity.a b/tools/sdk/lib/libunity.a
diff --git a/tools/sdk/lib/libvfs.a b/tools/sdk/lib/libvfs.a
diff --git a/tools/sdk/lib/libwear_levelling.a b/tools/sdk/lib/libwear_levelling.a
diff --git a/tools/sdk/lib/libwifi_provisioning.a b/tools/sdk/lib/libwifi_provisioning.a
diff --git a/tools/sdk/lib/libwpa_supplicant.a b/tools/sdk/lib/libwpa_supplicant.a
diff --git a/tools/sdk/lib/libxtensa-debug-module.a b/tools/sdk/lib/libxtensa-debug-module.a
diff --git a/tools/sdk/sdkconfig b/tools/sdk/sdkconfig
@@ -457,8 +457,8 @@ CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1=
 CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752
 CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32
 CONFIG_ESP32_WIFI_DEBUG_LOG_ENABLE=
-CONFIG_ESP32_WIFI_IRAM_OPT=y
-CONFIG_ESP32_WIFI_RX_IRAM_OPT=y
+CONFIG_ESP32_WIFI_IRAM_OPT=
+CONFIG_ESP32_WIFI_RX_IRAM_OPT=
 
 #
 # PHY