Merge pull request #8924 from dhalbert/tls-nist-optim

dhalbert · web-flow · commit 82914678dbcd · 2024-02-15T13:01:06.000-05:00
esp-idf-config/sdkconfig.defaults: Fix TLS access to api.github.com; remove BLE from 4MB ESP32-S3
diff --git a/ports/espressif/boards/01space_lcd042_esp32c3/mpconfigboard.mk b/ports/espressif/boards/01space_lcd042_esp32c3/mpconfigboard.mk
@@ -8,5 +8,3 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
 CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
-
-CIRCUITPY_BLEIO = 0
diff --git a/ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.mk b/ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.mk
@@ -9,7 +9,5 @@ CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
 CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
 
-CIRCUITPY_BLEIO = 0
-
 # Not enough pins.
 CIRCUITPY_PARALLELDISPLAYBUS = 0
diff --git a/ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.mk b/ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.mk
@@ -10,5 +10,3 @@ CIRCUITPY_ESP_FLASH_SIZE = 2MB
 CIRCUITPY_DUALBANK = 0
 
 CIRCUITPY_ESP_USB_SERIAL_JTAG = 0
-
-CIRCUITPY_BLEIO = 0
diff --git a/ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.mk b/ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.mk
@@ -8,5 +8,3 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
 CIRCUITPY_ESP_USB_SERIAL_JTAG = 0
-
-CIRCUITPY_BLEIO = 0
diff --git a/ports/espressif/boards/beetle-esp32-c3/mpconfigboard.mk b/ports/espressif/boards/beetle-esp32-c3/mpconfigboard.mk
@@ -9,5 +9,3 @@ CIRCUITPY_ESP_FLASH_FREQ=80m
 CIRCUITPY_ESP_FLASH_SIZE=4MB
 
 CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
-
-CIRCUITPY_BLEIO = 0
diff --git a/ports/espressif/boards/deneyap_kart_1a_v2/mpconfigboard.mk b/ports/espressif/boards/deneyap_kart_1a_v2/mpconfigboard.mk
@@ -16,8 +16,7 @@ CIRCUITPY_ESP_PSRAM_FREQ = 80m
 
 CIRCUITPY_ESPCAMERA = 0
 CIRCUITPY_BITMAPFILTER = 0
-CIRCUITPY_BLEIO = 0
-CIRCUITPY_CODEOP=0
+CIRCUITPY_CODEOP = 0
 CIRCUITPY_PARALLELDISPLAYBUS = 0
 
 OPTIMIZATION_FLAGS = -Os
diff --git a/ports/espressif/boards/deneyap_kart_g/mpconfigboard.mk b/ports/espressif/boards/deneyap_kart_g/mpconfigboard.mk
@@ -8,5 +8,3 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
 CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
-
-CIRCUITPY_BLEIO = 0
diff --git a/ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/mpconfigboard.mk
@@ -8,5 +8,3 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
 CIRCUITPY_ESP_USB_SERIAL_JTAG = 0
-
-CIRCUITPY_BLEIO = 0
diff --git a/ports/espressif/boards/espressif_esp32c6_devkitm_1_n4/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32c6_devkitm_1_n4/mpconfigboard.mk
@@ -6,5 +6,3 @@ IDF_TARGET = esp32c6
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_BLEIO = 0
diff --git a/ports/espressif/boards/lilygo_ttgo_t-01c3/mpconfigboard.mk b/ports/espressif/boards/lilygo_ttgo_t-01c3/mpconfigboard.mk
@@ -8,5 +8,3 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
 CIRCUITPY_ESP_USB_SERIAL_JTAG = 0
-
-CIRCUITPY_BLEIO = 0
diff --git a/ports/espressif/boards/lilygo_ttgo_t-oi-plus/mpconfigboard.mk b/ports/espressif/boards/lilygo_ttgo_t-oi-plus/mpconfigboard.mk
@@ -8,5 +8,3 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
 CIRCUITPY_ESP_USB_SERIAL_JTAG = 0
-
-CIRCUITPY_BLEIO = 0
diff --git a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
@@ -8,5 +8,3 @@ CIRCUITPY_ESP_FLASH_FREQ=80m
 CIRCUITPY_ESP_FLASH_SIZE=4MB
 
 CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
-
-CIRCUITPY_BLEIO = 0
diff --git a/ports/espressif/boards/lolin_c3_pico/mpconfigboard.mk b/ports/espressif/boards/lolin_c3_pico/mpconfigboard.mk
@@ -9,7 +9,5 @@ CIRCUITPY_ESP_FLASH_SIZE=4MB
 
 CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
 
-CIRCUITPY_BLEIO = 0
-
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
diff --git a/ports/espressif/boards/lolin_s3_mini/mpconfigboard.mk b/ports/espressif/boards/lolin_s3_mini/mpconfigboard.mk
@@ -16,8 +16,7 @@ CIRCUITPY_ESP_PSRAM_FREQ = 80m
 OPTIMIZATION_FLAGS = -Os
 CIRCUITPY_ESPCAMERA = 0
 CIRCUITPY_BITMAPFILTER = 0
-CIRCUITPY_BLEIO = 0
-CIRCUITPY_CODEOP=0
+CIRCUITPY_CODEOP = 0
 CIRCUITPY_PARALLELDISPLAYBUS = 0
 
 # Include these Python libraries in firmware.
diff --git a/ports/espressif/boards/luatos_core_esp32c3/mpconfigboard.mk b/ports/espressif/boards/luatos_core_esp32c3/mpconfigboard.mk
@@ -8,5 +8,3 @@ CIRCUITPY_ESP_FLASH_FREQ=80m
 CIRCUITPY_ESP_FLASH_SIZE=4MB
 
 CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
-
-CIRCUITPY_BLEIO = 0
diff --git a/ports/espressif/boards/luatos_core_esp32c3_ch343/mpconfigboard.mk b/ports/espressif/boards/luatos_core_esp32c3_ch343/mpconfigboard.mk
@@ -8,5 +8,3 @@ CIRCUITPY_ESP_FLASH_FREQ=80m
 CIRCUITPY_ESP_FLASH_SIZE=4MB
 
 CIRCUITPY_ESP_USB_SERIAL_JTAG = 0
-
-CIRCUITPY_BLEIO = 0
diff --git a/ports/espressif/boards/m5stack_stamp_c3/mpconfigboard.mk b/ports/espressif/boards/m5stack_stamp_c3/mpconfigboard.mk
@@ -8,5 +8,3 @@ CIRCUITPY_ESP_FLASH_FREQ=80m
 CIRCUITPY_ESP_FLASH_SIZE=4MB
 
 CIRCUITPY_ESP_USB_SERIAL_JTAG = 0
-
-CIRCUITPY_BLEIO = 0
diff --git a/ports/espressif/boards/magiclick_s3_n4r2/mpconfigboard.mk b/ports/espressif/boards/magiclick_s3_n4r2/mpconfigboard.mk
@@ -14,7 +14,5 @@ CIRCUITPY_ESP_PSRAM_MODE = qio
 CIRCUITPY_ESP_PSRAM_FREQ = 80m
 CIRCUITPY_ESP_PSRAM_SIZE = 2MB
 
-CIRCUITPY_BLEIO = 0
 CIRCUITPY_ESPCAMERA = 0
 CIRCUITPY_DISPLAYIO = 1
-CIRCUITPY_GIFIO = 1
diff --git a/ports/espressif/boards/microdev_micro_c3/mpconfigboard.mk b/ports/espressif/boards/microdev_micro_c3/mpconfigboard.mk
@@ -8,5 +8,3 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
 CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
-
-CIRCUITPY_BLEIO = 0
diff --git a/ports/espressif/boards/seeed_xiao_esp32c3/mpconfigboard.mk b/ports/espressif/boards/seeed_xiao_esp32c3/mpconfigboard.mk
@@ -8,5 +8,3 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
 CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
-
-CIRCUITPY_BLEIO = 0
diff --git a/ports/espressif/boards/waveshare_esp32_s3_zero/mpconfigboard.mk b/ports/espressif/boards/waveshare_esp32_s3_zero/mpconfigboard.mk
@@ -16,8 +16,7 @@ CIRCUITPY_ESP_PSRAM_FREQ = 80m
 OPTIMIZATION_FLAGS = -Os
 CIRCUITPY_ESPCAMERA = 0
 CIRCUITPY_BITMAPFILTER = 0
-CIRCUITPY_BLEIO = 0
-CIRCUITPY_CODEOP=0
+CIRCUITPY_CODEOP = 0
 CIRCUITPY_PARALLELDISPLAYBUS = 0
 
 # Include these Python libraries in firmware.
diff --git a/ports/espressif/boards/weact_esp32c6_n4/mpconfigboard.mk b/ports/espressif/boards/weact_esp32c6_n4/mpconfigboard.mk
@@ -6,6 +6,3 @@ IDF_TARGET = esp32c6
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
-
-CIRCUITPY_BLEIO = 0
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/boards/weact_esp32c6_n8/mpconfigboard.mk b/ports/espressif/boards/weact_esp32c6_n8/mpconfigboard.mk
@@ -6,6 +6,3 @@ IDF_TARGET = esp32c6
 CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 8MB
-
-CIRCUITPY_BLEIO = 0
-CIRCUITPY_ESPCAMERA = 0
diff --git a/ports/espressif/esp-idf-config/sdkconfig.defaults b/ports/espressif/esp-idf-config/sdkconfig.defaults
@@ -99,7 +99,7 @@ CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
 # CONFIG_MBEDTLS_ECP_DP_BP256R1_ENABLED is not set
 # CONFIG_MBEDTLS_ECP_DP_BP384R1_ENABLED is not set
 # CONFIG_MBEDTLS_ECP_DP_BP512R1_ENABLED is not set
-# CONFIG_MBEDTLS_ECP_NIST_OPTIM is not set
+CONFIG_MBEDTLS_ECP_NIST_OPTIM=y
 # CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM is not set
 # end of mbedTLS
 
diff --git a/ports/espressif/mpconfigport.mk b/ports/espressif/mpconfigport.mk
@@ -20,7 +20,6 @@ CIRCUITPY_AUDIOBUSIO ?= 1
 CIRCUITPY_AUDIOBUSIO_PDMIN ?= 0
 CIRCUITPY_AUDIOIO ?= 0
 CIRCUITPY_AUDIOMP3 ?= 0
-CIRCUITPY_BLEIO ?= 1
 CIRCUITPY_BLEIO_HCI = 0
 CIRCUITPY_CANIO ?= 1
 CIRCUITPY_COUNTIO ?= 1
@@ -56,6 +55,7 @@ else ifeq ($(IDF_TARGET),esp32c3)
 # Modules
 CIRCUITPY_ALARM = 0
 CIRCUITPY_AUDIOBUSIO = 0
+CIRCUITPY_BLEIO ?= 0
 CIRCUITPY_COUNTIO = 0
 CIRCUITPY_ESPCAMERA = 0
 CIRCUITPY_ESPULP = 0
@@ -73,6 +73,7 @@ else ifeq ($(IDF_TARGET),esp32c6)
 # Modules
 CIRCUITPY_ALARM = 0
 CIRCUITPY_AUDIOBUSIO = 0
+CIRCUITPY_BLEIO ?= 0
 CIRCUITPY_ESPCAMERA = 0
 CIRCUITPY_ESPULP = 0
 CIRCUITPY_MEMORYMAP = 0
@@ -91,6 +92,7 @@ CIRCUITPY_ALARM = 0
 # https://github.com/espressif/esp-idf/issues/11038
 CIRCUITPY_ANALOGIO = 0
 CIRCUITPY_AUDIOBUSIO = 0
+CIRCUITPY_BLEIO ?= 1
 CIRCUITPY_ESPCAMERA = 0
 CIRCUITPY_ESPULP = 0
 CIRCUITPY_MEMORYMAP = 0
@@ -106,6 +108,7 @@ CIRCUITPY_WIFI = 0
 
 else ifeq ($(IDF_TARGET),esp32s2)
 # Modules
+# No BLE in hw
 CIRCUITPY_BLEIO = 0
 CIRCUITPY_RGBMATRIX_USES_SUPERVISOR_ALLOCATION = 0
 
@@ -115,9 +118,15 @@ else ifeq ($(IDF_TARGET),esp32s3)
 # Modules
 CIRCUITPY_BITMAPFILTER ?= $(CIRCUITPY_ESPCAMERA)
 CIRCUITPY_RGBMATRIX_USES_SUPERVISOR_ALLOCATION = 0
-
 CIRCUITPY_ESP_USB_SERIAL_JTAG ?= 0
 
+# No room for _bleio on boards with 4MB flash
+ifeq ($(CIRCUITPY_ESP_FLASH_SIZE),4MB)
+CIRCUITPY_BLEIO ?= 0
+else
+CIRCUITPY_BLEIO ?= 1
+endif
+
 endif
 
 # No room for dualbank on boards with 2MB flash
@@ -127,8 +136,8 @@ endif
 
 # Modules dependent on other modules
 CIRCUITPY_ESPNOW ?= $(CIRCUITPY_WIFI)
-CIRCUITPY_GIFIO ?= $(CIRCUITPY_ESPCAMERA)
-CIRCUITPY_JPEGIO ?= $(CIRCUITPY_ESPCAMERA)
+CIRCUITPY_GIFIO ?= $(CIRCUITPY_DISPLAYIO)
+CIRCUITPY_JPEGIO ?= $(CIRCUITPY_DISPLAYIO)
 CIRCUITPY_QRIO ?= $(CIRCUITPY_ESPCAMERA)
 
 # Features dependent on other features
