Skip to content

Commit 85cff9f

Browse files
authored
Merge branch 'master' into feature/tinyusb_host
2 parents 7ba3077 + 87aa70c commit 85cff9f

File tree

3 files changed

+23
-5
lines changed

3 files changed

+23
-5
lines changed

configs/defconfig.common

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ CONFIG_LWIP_ETHARP_TRUST_IP_MAC=y
5757
CONFIG_LWIP_TCP_SYNMAXRTX=6
5858
CONFIG_LWIP_TCP_MSS=1436
5959
CONFIG_LWIP_TCP_RTO_TIME=3000
60+
CONFIG_LWIP_TCP_SACK_OUT=y
6061
CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=4096
6162
CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU0=y
6263
CONFIG_LWIP_MAX_SOCKETS=16

configs/defconfig.esp32p4

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ CONFIG_SPIRAM=y
33
# CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1 is not set
44
CONFIG_LWIP_TCP_SACK_OUT=y
55

6+
# ESP-Hosted-MCU
67
CONFIG_SLAVE_IDF_TARGET_ESP32C6=y
78
CONFIG_ESP_SDIO_BUS_WIDTH=4
89
CONFIG_ESP_SDIO_CLOCK_FREQ_KHZ=40000
@@ -13,6 +14,15 @@ CONFIG_ESP_SDIO_PIN_D1=15
1314
CONFIG_ESP_SDIO_PIN_D2=16
1415
CONFIG_ESP_SDIO_PIN_D3=17
1516

17+
# Bluetooth through ESP-Hosted-MCU
18+
CONFIG_BT_ENABLED=y
19+
CONFIG_BT_CONTROLLER_DISABLED=y
20+
CONFIG_BT_BLUEDROID_ENABLED=n
21+
CONFIG_BT_NIMBLE_ENABLED=y
22+
CONFIG_BT_NIMBLE_TRANSPORT_UART=n
23+
CONFIG_ESP_HOSTED_ENABLE_BT_NIMBLE=y
24+
CONFIG_ESP_HOSTED_NIMBLE_HCI_VHCI=y
25+
1626
# RGB Display Optimizations
1727
CONFIG_LCD_RGB_ISR_IRAM_SAFE=y
1828
CONFIG_LCD_RGB_RESTART_IN_VSYNC=y

tools/copy-libs.sh

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -318,16 +318,23 @@ done
318318

319319
mkdir -p "$AR_SDK"
320320

321+
# Keep only -march, -mabi and -mlongcalls flags for Assembler
322+
PIOARDUINO_AS_FLAGS=$(
323+
{
324+
echo "$PIOARDUINO_CXX_FLAGS" | grep -oE '\-march=[^[:space:]]*|\-mabi=[^[:space:]]*|\-mlongcalls'
325+
echo "$PIOARDUINO_CC_FLAGS" | grep -oE '\-march=[^[:space:]]*|\-mabi=[^[:space:]]*|\-mlongcalls'
326+
} | awk '!seen[$0]++' | paste -sd ' '
327+
)
328+
321329
# start generation of pioarduino-build.py
322330
AR_PIOARDUINO_PY="$AR_SDK/pioarduino-build.py"
323331
cat configs/pioarduino_start.txt > "$AR_PIOARDUINO_PY"
324332

325333
echo " ASFLAGS=[" >> "$AR_PIOARDUINO_PY"
326-
if [ "$IS_XTENSA" = "y" ]; then
327-
echo " \"-mlongcalls\"" >> "$AR_PIOARDUINO_PY"
328-
else
329-
echo " \"-march=rv32imc\"" >> "$AR_PIOARDUINO_PY"
330-
fi
334+
set -- $PIOARDUINO_AS_FLAGS
335+
for item; do
336+
echo " \"$item\"," >> "$AR_PIOARDUINO_PY"
337+
done
331338
echo " ]," >> "$AR_PIOARDUINO_PY"
332339
echo "" >> "$AR_PIOARDUINO_PY"
333340

0 commit comments

Comments
 (0)