Skip to content

Commit 8291467

Browse files
dhalbertdhalbert
authored
Merge pull request #8924 from dhalbert/tls-nist-optim
esp-idf-config/sdkconfig.defaults: Fix TLS access to api.github.com; remove BLE from 4MB ESP32-S3
2 parents c84c066 + b15aaa9 commit 8291467

File tree

25 files changed

+17
-53
lines changed

25 files changed

+17
-53
lines changed

‎ports/espressif/boards/01space_lcd042_esp32c3/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,3 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
99

1010
CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
11-
12-
CIRCUITPY_BLEIO = 0

‎ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,5 @@ CIRCUITPY_ESP_FLASH_SIZE = 4MB
99

1010
CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
1111

12-
CIRCUITPY_BLEIO = 0
13-
1412
# Not enough pins.
1513
CIRCUITPY_PARALLELDISPLAYBUS = 0

‎ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,3 @@ CIRCUITPY_ESP_FLASH_SIZE = 2MB
1010
CIRCUITPY_DUALBANK = 0
1111

1212
CIRCUITPY_ESP_USB_SERIAL_JTAG = 0
13-
14-
CIRCUITPY_BLEIO = 0

‎ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,3 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
99

1010
CIRCUITPY_ESP_USB_SERIAL_JTAG = 0
11-
12-
CIRCUITPY_BLEIO = 0

‎ports/espressif/boards/beetle-esp32-c3/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,3 @@ CIRCUITPY_ESP_FLASH_FREQ=80m
99
CIRCUITPY_ESP_FLASH_SIZE=4MB
1010

1111
CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
12-
13-
CIRCUITPY_BLEIO = 0

‎ports/espressif/boards/deneyap_kart_1a_v2/mpconfigboard.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ CIRCUITPY_ESP_PSRAM_FREQ = 80m
1616

1717
CIRCUITPY_ESPCAMERA = 0
1818
CIRCUITPY_BITMAPFILTER = 0
19-
CIRCUITPY_BLEIO = 0
20-
CIRCUITPY_CODEOP=0
19+
CIRCUITPY_CODEOP = 0
2120
CIRCUITPY_PARALLELDISPLAYBUS = 0
2221

2322
OPTIMIZATION_FLAGS = -Os

‎ports/espressif/boards/deneyap_kart_g/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,3 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
99

1010
CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
11-
12-
CIRCUITPY_BLEIO = 0

‎ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,3 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
99

1010
CIRCUITPY_ESP_USB_SERIAL_JTAG = 0
11-
12-
CIRCUITPY_BLEIO = 0

‎ports/espressif/boards/espressif_esp32c6_devkitm_1_n4/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,3 @@ IDF_TARGET = esp32c6
66
CIRCUITPY_ESP_FLASH_MODE = qio
77
CIRCUITPY_ESP_FLASH_FREQ = 80m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
9-
10-
CIRCUITPY_BLEIO = 0

‎ports/espressif/boards/lilygo_ttgo_t-01c3/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,3 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
99

1010
CIRCUITPY_ESP_USB_SERIAL_JTAG = 0
11-
12-
CIRCUITPY_BLEIO = 0

‎ports/espressif/boards/lilygo_ttgo_t-oi-plus/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,3 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
99

1010
CIRCUITPY_ESP_USB_SERIAL_JTAG = 0
11-
12-
CIRCUITPY_BLEIO = 0

‎ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,3 @@ CIRCUITPY_ESP_FLASH_FREQ=80m
88
CIRCUITPY_ESP_FLASH_SIZE=4MB
99

1010
CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
11-
12-
CIRCUITPY_BLEIO = 0

‎ports/espressif/boards/lolin_c3_pico/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,5 @@ CIRCUITPY_ESP_FLASH_SIZE=4MB
99

1010
CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
1111

12-
CIRCUITPY_BLEIO = 0
13-
1412
# Include these Python libraries in firmware.
1513
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel

‎ports/espressif/boards/lolin_s3_mini/mpconfigboard.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ CIRCUITPY_ESP_PSRAM_FREQ = 80m
1616
OPTIMIZATION_FLAGS = -Os
1717
CIRCUITPY_ESPCAMERA = 0
1818
CIRCUITPY_BITMAPFILTER = 0
19-
CIRCUITPY_BLEIO = 0
20-
CIRCUITPY_CODEOP=0
19+
CIRCUITPY_CODEOP = 0
2120
CIRCUITPY_PARALLELDISPLAYBUS = 0
2221

2322
# Include these Python libraries in firmware.

‎ports/espressif/boards/luatos_core_esp32c3/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,3 @@ CIRCUITPY_ESP_FLASH_FREQ=80m
88
CIRCUITPY_ESP_FLASH_SIZE=4MB
99

1010
CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
11-
12-
CIRCUITPY_BLEIO = 0

‎ports/espressif/boards/luatos_core_esp32c3_ch343/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,3 @@ CIRCUITPY_ESP_FLASH_FREQ=80m
88
CIRCUITPY_ESP_FLASH_SIZE=4MB
99

1010
CIRCUITPY_ESP_USB_SERIAL_JTAG = 0
11-
12-
CIRCUITPY_BLEIO = 0

‎ports/espressif/boards/m5stack_stamp_c3/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,3 @@ CIRCUITPY_ESP_FLASH_FREQ=80m
88
CIRCUITPY_ESP_FLASH_SIZE=4MB
99

1010
CIRCUITPY_ESP_USB_SERIAL_JTAG = 0
11-
12-
CIRCUITPY_BLEIO = 0

‎ports/espressif/boards/magiclick_s3_n4r2/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,5 @@ CIRCUITPY_ESP_PSRAM_MODE = qio
1414
CIRCUITPY_ESP_PSRAM_FREQ = 80m
1515
CIRCUITPY_ESP_PSRAM_SIZE = 2MB
1616

17-
CIRCUITPY_BLEIO = 0
1817
CIRCUITPY_ESPCAMERA = 0
1918
CIRCUITPY_DISPLAYIO = 1
20-
CIRCUITPY_GIFIO = 1

‎ports/espressif/boards/microdev_micro_c3/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,3 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
99

1010
CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
11-
12-
CIRCUITPY_BLEIO = 0

‎ports/espressif/boards/seeed_xiao_esp32c3/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,3 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
99

1010
CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
11-
12-
CIRCUITPY_BLEIO = 0

‎ports/espressif/boards/waveshare_esp32_s3_zero/mpconfigboard.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ CIRCUITPY_ESP_PSRAM_FREQ = 80m
1616
OPTIMIZATION_FLAGS = -Os
1717
CIRCUITPY_ESPCAMERA = 0
1818
CIRCUITPY_BITMAPFILTER = 0
19-
CIRCUITPY_BLEIO = 0
20-
CIRCUITPY_CODEOP=0
19+
CIRCUITPY_CODEOP = 0
2120
CIRCUITPY_PARALLELDISPLAYBUS = 0
2221

2322
# Include these Python libraries in firmware.

‎ports/espressif/boards/weact_esp32c6_n4/mpconfigboard.mk

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,3 @@ IDF_TARGET = esp32c6
66
CIRCUITPY_ESP_FLASH_MODE = qio
77
CIRCUITPY_ESP_FLASH_FREQ = 80m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
9-
10-
CIRCUITPY_BLEIO = 0
11-
CIRCUITPY_ESPCAMERA = 0

‎ports/espressif/boards/weact_esp32c6_n8/mpconfigboard.mk

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,3 @@ IDF_TARGET = esp32c6
66
CIRCUITPY_ESP_FLASH_MODE = qio
77
CIRCUITPY_ESP_FLASH_FREQ = 80m
88
CIRCUITPY_ESP_FLASH_SIZE = 8MB
9-
10-
CIRCUITPY_BLEIO = 0
11-
CIRCUITPY_ESPCAMERA = 0

‎ports/espressif/esp-idf-config/sdkconfig.defaults

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
9999
# CONFIG_MBEDTLS_ECP_DP_BP256R1_ENABLED is not set
100100
# CONFIG_MBEDTLS_ECP_DP_BP384R1_ENABLED is not set
101101
# CONFIG_MBEDTLS_ECP_DP_BP512R1_ENABLED is not set
102-
# CONFIG_MBEDTLS_ECP_NIST_OPTIM is not set
102+
CONFIG_MBEDTLS_ECP_NIST_OPTIM=y
103103
# CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM is not set
104104
# end of mbedTLS
105105

‎ports/espressif/mpconfigport.mk

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ CIRCUITPY_AUDIOBUSIO ?= 1
2020
CIRCUITPY_AUDIOBUSIO_PDMIN ?= 0
2121
CIRCUITPY_AUDIOIO ?= 0
2222
CIRCUITPY_AUDIOMP3 ?= 0
23-
CIRCUITPY_BLEIO ?= 1
2423
CIRCUITPY_BLEIO_HCI = 0
2524
CIRCUITPY_CANIO ?= 1
2625
CIRCUITPY_COUNTIO ?= 1
@@ -56,6 +55,7 @@ else ifeq ($(IDF_TARGET),esp32c3)
5655
# Modules
5756
CIRCUITPY_ALARM = 0
5857
CIRCUITPY_AUDIOBUSIO = 0
58+
CIRCUITPY_BLEIO ?= 0
5959
CIRCUITPY_COUNTIO = 0
6060
CIRCUITPY_ESPCAMERA = 0
6161
CIRCUITPY_ESPULP = 0
@@ -73,6 +73,7 @@ else ifeq ($(IDF_TARGET),esp32c6)
7373
# Modules
7474
CIRCUITPY_ALARM = 0
7575
CIRCUITPY_AUDIOBUSIO = 0
76+
CIRCUITPY_BLEIO ?= 0
7677
CIRCUITPY_ESPCAMERA = 0
7778
CIRCUITPY_ESPULP = 0
7879
CIRCUITPY_MEMORYMAP = 0
@@ -91,6 +92,7 @@ CIRCUITPY_ALARM = 0
9192
# https://github.com/espressif/esp-idf/issues/11038
9293
CIRCUITPY_ANALOGIO = 0
9394
CIRCUITPY_AUDIOBUSIO = 0
95+
CIRCUITPY_BLEIO ?= 1
9496
CIRCUITPY_ESPCAMERA = 0
9597
CIRCUITPY_ESPULP = 0
9698
CIRCUITPY_MEMORYMAP = 0
@@ -106,6 +108,7 @@ CIRCUITPY_WIFI = 0
106108

107109
else ifeq ($(IDF_TARGET),esp32s2)
108110
# Modules
111+
# No BLE in hw
109112
CIRCUITPY_BLEIO = 0
110113
CIRCUITPY_RGBMATRIX_USES_SUPERVISOR_ALLOCATION = 0
111114

@@ -115,9 +118,15 @@ else ifeq ($(IDF_TARGET),esp32s3)
115118
# Modules
116119
CIRCUITPY_BITMAPFILTER ?= $(CIRCUITPY_ESPCAMERA)
117120
CIRCUITPY_RGBMATRIX_USES_SUPERVISOR_ALLOCATION = 0
118-
119121
CIRCUITPY_ESP_USB_SERIAL_JTAG ?= 0
120122

123+
# No room for _bleio on boards with 4MB flash
124+
ifeq ($(CIRCUITPY_ESP_FLASH_SIZE),4MB)
125+
CIRCUITPY_BLEIO ?= 0
126+
else
127+
CIRCUITPY_BLEIO ?= 1
128+
endif
129+
121130
endif
122131

123132
# No room for dualbank on boards with 2MB flash
@@ -127,8 +136,8 @@ endif
127136

128137
# Modules dependent on other modules
129138
CIRCUITPY_ESPNOW ?= $(CIRCUITPY_WIFI)
130-
CIRCUITPY_GIFIO ?= $(CIRCUITPY_ESPCAMERA)
131-
CIRCUITPY_JPEGIO ?= $(CIRCUITPY_ESPCAMERA)
139+
CIRCUITPY_GIFIO ?= $(CIRCUITPY_DISPLAYIO)
140+
CIRCUITPY_JPEGIO ?= $(CIRCUITPY_DISPLAYIO)
132141
CIRCUITPY_QRIO ?= $(CIRCUITPY_ESPCAMERA)
133142

134143
# Features dependent on other features

0 commit comments

Comments
 (0)