Skip to content

Commit 34be88f

Browse files
committed
fix configs
1 parent 2e5932d commit 34be88f

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

sdkconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752
379379
CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32
380380
# CONFIG_ESP32_WIFI_DEBUG_LOG_ENABLE is not set
381381
CONFIG_ESP32_WIFI_IRAM_OPT=y
382-
CONFIG_ESP32_WIFI_RX_IRAM_OPT=y
382+
# CONFIG_ESP32_WIFI_RX_IRAM_OPT is not set
383383
CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE=y
384384
# CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION is not set
385385
CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=20

tools/prepare-libs.sh

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,12 @@ done
8787
cp build/bootloader_support/libbootloader_support.a $AR_SDK/lib/
8888
cp build/micro-ecc/libmicro-ecc.a $AR_SDK/lib/
8989

90+
# remove libc.a (use the one in the toolchain)
91+
rm -rf $AR_SDK/lib/libc.a
92+
93+
# remove libc_nano.a (use libc.a the toolchain)
94+
rm -rf $AR_SDK/lib/libc_nano.a
95+
9096
# remove liblib.a from esp-face (empty and causing issues on Windows)
9197
rm -rf $AR_SDK/lib/liblib.a
9298

@@ -98,7 +104,7 @@ for lib in `find . -name '*.a'`; do
98104
AR_LIBS+="-l"$(basename ${lib:5} .a)" "
99105
PIO_LIBS+=", \"-l"$(basename ${lib:5} .a)"\""
100106
done
101-
PIO_LIBS+=", \"-lstdc++\""
107+
PIO_LIBS+=", \"-lc\", \"-lstdc++\""
102108
cd "$AR_ROOT"
103109

104110
echo " LIBPATH=[" >> "$AR_PLATFORMIO_PY"
@@ -125,7 +131,7 @@ rm 1platform_start.txt
125131
cat platform_start.txt > "$AR_PLATFORM_TXT"
126132
echo "compiler.cpreprocessor.flags=$AR_INC" >> "$AR_PLATFORM_TXT"
127133
cat platform_mid.txt >> "$AR_PLATFORM_TXT"
128-
echo "compiler.c.elf.libs=-lgcc $AR_LIBS -lstdc++" >> "$AR_PLATFORM_TXT"
134+
echo "compiler.c.elf.libs=-lgcc $AR_LIBS -lc -lstdc++" >> "$AR_PLATFORM_TXT"
129135
cat 1platform_mid.txt >> "$AR_PLATFORM_TXT"
130136
rm platform_start.txt platform_mid.txt 1platform_mid.txt
131137

0 commit comments

Comments
 (0)