From 1480d70d17cd75ffef4daf9b22b87730790a6552 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott@tannewt.org>
Date: Thu, 21 Sep 2023 16:02:41 -0700
Subject: [PATCH] Fix builds

* Disable bleio on C3 with 4MB flash.
* Fix gpio include path in board.c's that use it.
---
 .../boards/01space_lcd042_esp32c3/mpconfigboard.mk     |  2 ++
 .../espressif/boards/adafruit_feather_esp32s2/board.c  |  2 +-
 .../adafruit_feather_esp32s3_4mbflash_2mbpsram/board.c |  2 +-
 .../boards/adafruit_feather_esp32s3_nopsram/board.c    |  2 +-
 .../espressif/boards/adafruit_matrixportal_s3/board.c  |  2 +-
 .../espressif/boards/adafruit_qtpy_esp32_pico/board.c  |  2 +-
 .../boards/adafruit_qtpy_esp32c3/mpconfigboard.mk      |  2 ++
 ports/espressif/boards/ai_thinker_esp32-c3s-2m/board.c |  2 +-
 ports/espressif/boards/ai_thinker_esp32-c3s/board.c    |  2 +-
 .../boards/ai_thinker_esp32-c3s/mpconfigboard.mk       |  2 ++
 ports/espressif/boards/arduino_nano_esp32s3/board.c    | 10 +---------
 .../arduino_nano_esp32s3_inverted_statusled/board.c    | 10 +---------
 .../espressif/boards/beetle-esp32-c3/mpconfigboard.mk  |  2 ++
 .../boards/cytron_maker_feather_aiot_s3/board.c        |  2 +-
 ports/espressif/boards/deneyap_kart/board.c            |  2 +-
 ports/espressif/boards/deneyap_kart_1a/board.c         |  2 +-
 ports/espressif/boards/deneyap_kart_g/mpconfigboard.mk |  2 ++
 ports/espressif/boards/espressif_esp32_eye/board.c     |  2 +-
 ports/espressif/boards/espressif_esp32_lyrat/board.c   |  2 +-
 ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk  |  2 ++
 ports/espressif/boards/lolin_c3_pico/mpconfigboard.mk  |  2 ++
 .../boards/luatos_core_esp32c3/mpconfigboard.mk        |  2 ++
 .../boards/luatos_core_esp32c3_ch343/mpconfigboard.mk  |  2 ++
 ports/espressif/boards/m5stack_core2/board.c           |  2 +-
 .../espressif/boards/m5stack_stamp_c3/mpconfigboard.mk |  2 ++
 ports/espressif/boards/m5stack_stick_c/board.c         |  2 +-
 ports/espressif/boards/m5stack_stick_c_plus/board.c    |  2 +-
 ports/espressif/boards/m5stack_timer_camera_x/board.c  |  2 +-
 .../boards/microdev_micro_c3/mpconfigboard.mk          |  2 ++
 .../boards/seeed_xiao_esp32c3/mpconfigboard.mk         |  2 ++
 .../espressif/boards/unexpectedmaker_tinypico/board.c  |  2 +-
 .../boards/unexpectedmaker_tinypico_nano/board.c       |  2 +-
 ports/espressif/common-hal/canio/Listener.c            |  3 ++-
 33 files changed, 46 insertions(+), 37 deletions(-)

diff --git a/ports/espressif/boards/01space_lcd042_esp32c3/mpconfigboard.mk b/ports/espressif/boards/01space_lcd042_esp32c3/mpconfigboard.mk
index e0aee0c478..5f37ab5fac 100644
--- a/ports/espressif/boards/01space_lcd042_esp32c3/mpconfigboard.mk
+++ b/ports/espressif/boards/01space_lcd042_esp32c3/mpconfigboard.mk
@@ -8,3 +8,5 @@ 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_feather_esp32s2/board.c b/ports/espressif/boards/adafruit_feather_esp32s2/board.c
index f701d18442..4d64c316e1 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s2/board.c
+++ b/ports/espressif/boards/adafruit_feather_esp32s2/board.c
@@ -27,7 +27,7 @@
 #include "supervisor/board.h"
 #include "mpconfigboard.h"
 #include "shared-bindings/microcontroller/Pin.h"
-#include "components/driver/include/driver/gpio.h"
+#include "components/driver/gpio/include/driver/gpio.h"
 #include "components/hal/include/hal/gpio_hal.h"
 #include "common-hal/microcontroller/Pin.h"
 
diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/board.c b/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/board.c
index 983d62a911..ba228d7b12 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/board.c
+++ b/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/board.c
@@ -27,7 +27,7 @@
 #include "supervisor/board.h"
 #include "mpconfigboard.h"
 #include "shared-bindings/microcontroller/Pin.h"
-#include "components/driver/include/driver/gpio.h"
+#include "components/driver/gpio/include/driver/gpio.h"
 #include "components/hal/include/hal/gpio_hal.h"
 #include "common-hal/microcontroller/Pin.h"
 
diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_nopsram/board.c b/ports/espressif/boards/adafruit_feather_esp32s3_nopsram/board.c
index 983d62a911..ba228d7b12 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s3_nopsram/board.c
+++ b/ports/espressif/boards/adafruit_feather_esp32s3_nopsram/board.c
@@ -27,7 +27,7 @@
 #include "supervisor/board.h"
 #include "mpconfigboard.h"
 #include "shared-bindings/microcontroller/Pin.h"
-#include "components/driver/include/driver/gpio.h"
+#include "components/driver/gpio/include/driver/gpio.h"
 #include "components/hal/include/hal/gpio_hal.h"
 #include "common-hal/microcontroller/Pin.h"
 
diff --git a/ports/espressif/boards/adafruit_matrixportal_s3/board.c b/ports/espressif/boards/adafruit_matrixportal_s3/board.c
index a023845eb0..a5067b98fd 100644
--- a/ports/espressif/boards/adafruit_matrixportal_s3/board.c
+++ b/ports/espressif/boards/adafruit_matrixportal_s3/board.c
@@ -27,7 +27,7 @@
 #include "supervisor/board.h"
 #include "mpconfigboard.h"
 #include "shared-bindings/microcontroller/Pin.h"
-#include "components/driver/include/driver/gpio.h"
+#include "components/driver/gpio/include/driver/gpio.h"
 #include "components/hal/include/hal/gpio_hal.h"
 #include "common-hal/microcontroller/Pin.h"
 
diff --git a/ports/espressif/boards/adafruit_qtpy_esp32_pico/board.c b/ports/espressif/boards/adafruit_qtpy_esp32_pico/board.c
index b714fd41f0..0e4504e8b8 100644
--- a/ports/espressif/boards/adafruit_qtpy_esp32_pico/board.c
+++ b/ports/espressif/boards/adafruit_qtpy_esp32_pico/board.c
@@ -27,7 +27,7 @@
 #include "supervisor/board.h"
 #include "mpconfigboard.h"
 #include "shared-bindings/microcontroller/Pin.h"
-#include "components/driver/include/driver/gpio.h"
+#include "components/driver/gpio/include/driver/gpio.h"
 #include "components/hal/include/hal/gpio_hal.h"
 #include "common-hal/microcontroller/Pin.h"
 
diff --git a/ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.mk b/ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.mk
index a8b7315c11..df1a53faba 100644
--- a/ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.mk
@@ -8,3 +8,5 @@ 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/ai_thinker_esp32-c3s-2m/board.c b/ports/espressif/boards/ai_thinker_esp32-c3s-2m/board.c
index 0118b6d8ea..9e9b34a237 100644
--- a/ports/espressif/boards/ai_thinker_esp32-c3s-2m/board.c
+++ b/ports/espressif/boards/ai_thinker_esp32-c3s-2m/board.c
@@ -28,7 +28,7 @@
 #include "shared-bindings/microcontroller/Pin.h"
 #include "supervisor/board.h"
 
-#include "components/driver/include/driver/gpio.h"
+#include "components/driver/gpio/include/driver/gpio.h"
 #include "soc/usb_serial_jtag_struct.h"
 
 void board_init(void) {
diff --git a/ports/espressif/boards/ai_thinker_esp32-c3s/board.c b/ports/espressif/boards/ai_thinker_esp32-c3s/board.c
index 0118b6d8ea..9e9b34a237 100644
--- a/ports/espressif/boards/ai_thinker_esp32-c3s/board.c
+++ b/ports/espressif/boards/ai_thinker_esp32-c3s/board.c
@@ -28,7 +28,7 @@
 #include "shared-bindings/microcontroller/Pin.h"
 #include "supervisor/board.h"
 
-#include "components/driver/include/driver/gpio.h"
+#include "components/driver/gpio/include/driver/gpio.h"
 #include "soc/usb_serial_jtag_struct.h"
 
 void board_init(void) {
diff --git a/ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.mk b/ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.mk
index 9bcaa3473a..8bc9948aee 100644
--- a/ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.mk
+++ b/ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.mk
@@ -8,3 +8,5 @@ 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/arduino_nano_esp32s3/board.c b/ports/espressif/boards/arduino_nano_esp32s3/board.c
index 8952a19c5d..58432f9811 100644
--- a/ports/espressif/boards/arduino_nano_esp32s3/board.c
+++ b/ports/espressif/boards/arduino_nano_esp32s3/board.c
@@ -27,15 +27,7 @@
 #include "supervisor/board.h"
 #include "mpconfigboard.h"
 #include "shared-bindings/microcontroller/Pin.h"
-#include "components/driver/include/driver/gpio.h"
-
-void board_init(void) {
-    // Debug UART
-    #ifdef DEBUG
-    common_hal_never_reset_pin(&pin_GPIO43);
-    common_hal_never_reset_pin(&pin_GPIO44);
-    #endif
-}
+#include "components/driver/gpio/include/driver/gpio.h"
 
 bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
     if (pin_number == 13) {
diff --git a/ports/espressif/boards/arduino_nano_esp32s3_inverted_statusled/board.c b/ports/espressif/boards/arduino_nano_esp32s3_inverted_statusled/board.c
index 8952a19c5d..58432f9811 100644
--- a/ports/espressif/boards/arduino_nano_esp32s3_inverted_statusled/board.c
+++ b/ports/espressif/boards/arduino_nano_esp32s3_inverted_statusled/board.c
@@ -27,15 +27,7 @@
 #include "supervisor/board.h"
 #include "mpconfigboard.h"
 #include "shared-bindings/microcontroller/Pin.h"
-#include "components/driver/include/driver/gpio.h"
-
-void board_init(void) {
-    // Debug UART
-    #ifdef DEBUG
-    common_hal_never_reset_pin(&pin_GPIO43);
-    common_hal_never_reset_pin(&pin_GPIO44);
-    #endif
-}
+#include "components/driver/gpio/include/driver/gpio.h"
 
 bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
     if (pin_number == 13) {
diff --git a/ports/espressif/boards/beetle-esp32-c3/mpconfigboard.mk b/ports/espressif/boards/beetle-esp32-c3/mpconfigboard.mk
index 5ad71b2da5..034d94bb5f 100644
--- a/ports/espressif/boards/beetle-esp32-c3/mpconfigboard.mk
+++ b/ports/espressif/boards/beetle-esp32-c3/mpconfigboard.mk
@@ -9,3 +9,5 @@ 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/cytron_maker_feather_aiot_s3/board.c b/ports/espressif/boards/cytron_maker_feather_aiot_s3/board.c
index 1f9ef3c4e7..8f1a584194 100644
--- a/ports/espressif/boards/cytron_maker_feather_aiot_s3/board.c
+++ b/ports/espressif/boards/cytron_maker_feather_aiot_s3/board.c
@@ -27,7 +27,7 @@
 #include "supervisor/board.h"
 #include "mpconfigboard.h"
 #include "shared-bindings/microcontroller/Pin.h"
-#include "components/driver/include/driver/gpio.h"
+#include "components/driver/gpio/include/driver/gpio.h"
 #include "components/hal/include/hal/gpio_hal.h"
 #include "common-hal/microcontroller/Pin.h"
 
diff --git a/ports/espressif/boards/deneyap_kart/board.c b/ports/espressif/boards/deneyap_kart/board.c
index 8c0c8b8b0b..12d8928cd5 100644
--- a/ports/espressif/boards/deneyap_kart/board.c
+++ b/ports/espressif/boards/deneyap_kart/board.c
@@ -27,7 +27,7 @@
 #include "supervisor/board.h"
 #include "mpconfigboard.h"
 #include "shared-bindings/microcontroller/Pin.h"
-#include "components/driver/include/driver/gpio.h"
+#include "components/driver/gpio/include/driver/gpio.h"
 #include "components/hal/include/hal/gpio_hal.h"
 #include "common-hal/microcontroller/Pin.h"
 
diff --git a/ports/espressif/boards/deneyap_kart_1a/board.c b/ports/espressif/boards/deneyap_kart_1a/board.c
index 8c0c8b8b0b..12d8928cd5 100644
--- a/ports/espressif/boards/deneyap_kart_1a/board.c
+++ b/ports/espressif/boards/deneyap_kart_1a/board.c
@@ -27,7 +27,7 @@
 #include "supervisor/board.h"
 #include "mpconfigboard.h"
 #include "shared-bindings/microcontroller/Pin.h"
-#include "components/driver/include/driver/gpio.h"
+#include "components/driver/gpio/include/driver/gpio.h"
 #include "components/hal/include/hal/gpio_hal.h"
 #include "common-hal/microcontroller/Pin.h"
 
diff --git a/ports/espressif/boards/deneyap_kart_g/mpconfigboard.mk b/ports/espressif/boards/deneyap_kart_g/mpconfigboard.mk
index 1743090e0e..98e4e4c9a5 100644
--- a/ports/espressif/boards/deneyap_kart_g/mpconfigboard.mk
+++ b/ports/espressif/boards/deneyap_kart_g/mpconfigboard.mk
@@ -8,3 +8,5 @@ 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_esp32_eye/board.c b/ports/espressif/boards/espressif_esp32_eye/board.c
index 1c09fb1316..b37123db04 100644
--- a/ports/espressif/boards/espressif_esp32_eye/board.c
+++ b/ports/espressif/boards/espressif_esp32_eye/board.c
@@ -27,7 +27,7 @@
 #include "supervisor/board.h"
 #include "mpconfigboard.h"
 #include "shared-bindings/microcontroller/Pin.h"
-#include "components/driver/include/driver/gpio.h"
+#include "components/driver/gpio/include/driver/gpio.h"
 #include "components/hal/include/hal/gpio_hal.h"
 #include "common-hal/microcontroller/Pin.h"
 
diff --git a/ports/espressif/boards/espressif_esp32_lyrat/board.c b/ports/espressif/boards/espressif_esp32_lyrat/board.c
index 8c0c8b8b0b..12d8928cd5 100644
--- a/ports/espressif/boards/espressif_esp32_lyrat/board.c
+++ b/ports/espressif/boards/espressif_esp32_lyrat/board.c
@@ -27,7 +27,7 @@
 #include "supervisor/board.h"
 #include "mpconfigboard.h"
 #include "shared-bindings/microcontroller/Pin.h"
-#include "components/driver/include/driver/gpio.h"
+#include "components/driver/gpio/include/driver/gpio.h"
 #include "components/hal/include/hal/gpio_hal.h"
 #include "common-hal/microcontroller/Pin.h"
 
diff --git a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
index 99c910e6d2..b6dea28098 100644
--- a/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
+++ b/ports/espressif/boards/lolin_c3_mini/mpconfigboard.mk
@@ -8,3 +8,5 @@ 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
index 6778550a2d..56c03ddf68 100644
--- a/ports/espressif/boards/lolin_c3_pico/mpconfigboard.mk
+++ b/ports/espressif/boards/lolin_c3_pico/mpconfigboard.mk
@@ -9,5 +9,7 @@ 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/luatos_core_esp32c3/mpconfigboard.mk b/ports/espressif/boards/luatos_core_esp32c3/mpconfigboard.mk
index 03f5171a31..dfd8ff63de 100644
--- a/ports/espressif/boards/luatos_core_esp32c3/mpconfigboard.mk
+++ b/ports/espressif/boards/luatos_core_esp32c3/mpconfigboard.mk
@@ -8,3 +8,5 @@ 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
index 9e777889c0..8a425a75cb 100644
--- a/ports/espressif/boards/luatos_core_esp32c3_ch343/mpconfigboard.mk
+++ b/ports/espressif/boards/luatos_core_esp32c3_ch343/mpconfigboard.mk
@@ -8,3 +8,5 @@ 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_core2/board.c b/ports/espressif/boards/m5stack_core2/board.c
index e64ac35a7d..29011638b2 100644
--- a/ports/espressif/boards/m5stack_core2/board.c
+++ b/ports/espressif/boards/m5stack_core2/board.c
@@ -34,7 +34,7 @@
 #include "shared-bindings/board/__init__.h"
 
 #include "shared-bindings/microcontroller/Pin.h"
-#include "components/driver/include/driver/gpio.h"
+#include "components/driver/gpio/include/driver/gpio.h"
 #include "components/hal/include/hal/gpio_hal.h"
 #include "common-hal/microcontroller/Pin.h"
 
diff --git a/ports/espressif/boards/m5stack_stamp_c3/mpconfigboard.mk b/ports/espressif/boards/m5stack_stamp_c3/mpconfigboard.mk
index 2f3b62f90f..e360567a0a 100644
--- a/ports/espressif/boards/m5stack_stamp_c3/mpconfigboard.mk
+++ b/ports/espressif/boards/m5stack_stamp_c3/mpconfigboard.mk
@@ -8,3 +8,5 @@ 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_stick_c/board.c b/ports/espressif/boards/m5stack_stick_c/board.c
index 779125a017..7f9b5a54f4 100644
--- a/ports/espressif/boards/m5stack_stick_c/board.c
+++ b/ports/espressif/boards/m5stack_stick_c/board.c
@@ -33,7 +33,7 @@
 #include "shared-module/displayio/mipi_constants.h"
 #include "shared-bindings/board/__init__.h"
 #include "shared-bindings/microcontroller/Pin.h"
-#include "components/driver/include/driver/gpio.h"
+#include "components/driver/gpio/include/driver/gpio.h"
 #include "components/hal/include/hal/gpio_hal.h"
 #include "common-hal/microcontroller/Pin.h"
 
diff --git a/ports/espressif/boards/m5stack_stick_c_plus/board.c b/ports/espressif/boards/m5stack_stick_c_plus/board.c
index ea43209c24..5901f8cea8 100644
--- a/ports/espressif/boards/m5stack_stick_c_plus/board.c
+++ b/ports/espressif/boards/m5stack_stick_c_plus/board.c
@@ -33,7 +33,7 @@
 #include "shared-module/displayio/mipi_constants.h"
 #include "shared-bindings/board/__init__.h"
 #include "shared-bindings/microcontroller/Pin.h"
-#include "components/driver/include/driver/gpio.h"
+#include "components/driver/gpio/include/driver/gpio.h"
 #include "components/hal/include/hal/gpio_hal.h"
 #include "common-hal/microcontroller/Pin.h"
 
diff --git a/ports/espressif/boards/m5stack_timer_camera_x/board.c b/ports/espressif/boards/m5stack_timer_camera_x/board.c
index 65b857c3ae..162ad40a80 100755
--- a/ports/espressif/boards/m5stack_timer_camera_x/board.c
+++ b/ports/espressif/boards/m5stack_timer_camera_x/board.c
@@ -27,7 +27,7 @@
 #include "supervisor/board.h"
 #include "mpconfigboard.h"
 #include "shared-bindings/microcontroller/Pin.h"
-#include "components/driver/include/driver/gpio.h"
+#include "components/driver/gpio/include/driver/gpio.h"
 #include "components/hal/include/hal/gpio_hal.h"
 #include "common-hal/microcontroller/Pin.h"
 
diff --git a/ports/espressif/boards/microdev_micro_c3/mpconfigboard.mk b/ports/espressif/boards/microdev_micro_c3/mpconfigboard.mk
index 1bb9d0835f..dd3e159386 100644
--- a/ports/espressif/boards/microdev_micro_c3/mpconfigboard.mk
+++ b/ports/espressif/boards/microdev_micro_c3/mpconfigboard.mk
@@ -8,3 +8,5 @@ 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
index 4bec24347e..3e2c97dab9 100644
--- a/ports/espressif/boards/seeed_xiao_esp32c3/mpconfigboard.mk
+++ b/ports/espressif/boards/seeed_xiao_esp32c3/mpconfigboard.mk
@@ -8,3 +8,5 @@ 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/unexpectedmaker_tinypico/board.c b/ports/espressif/boards/unexpectedmaker_tinypico/board.c
index e59af9528d..530c27f776 100644
--- a/ports/espressif/boards/unexpectedmaker_tinypico/board.c
+++ b/ports/espressif/boards/unexpectedmaker_tinypico/board.c
@@ -27,7 +27,7 @@
 #include "supervisor/board.h"
 #include "mpconfigboard.h"
 #include "shared-bindings/microcontroller/Pin.h"
-#include "components/driver/include/driver/gpio.h"
+#include "components/driver/gpio/include/driver/gpio.h"
 #include "components/hal/include/hal/gpio_hal.h"
 #include "common-hal/microcontroller/Pin.h"
 
diff --git a/ports/espressif/boards/unexpectedmaker_tinypico_nano/board.c b/ports/espressif/boards/unexpectedmaker_tinypico_nano/board.c
index d66ab9e5f1..551058611e 100644
--- a/ports/espressif/boards/unexpectedmaker_tinypico_nano/board.c
+++ b/ports/espressif/boards/unexpectedmaker_tinypico_nano/board.c
@@ -27,7 +27,7 @@
 #include "supervisor/board.h"
 #include "mpconfigboard.h"
 #include "shared-bindings/microcontroller/Pin.h"
-#include "components/driver/include/driver/gpio.h"
+#include "components/driver/gpio/include/driver/gpio.h"
 #include "components/hal/include/hal/gpio_hal.h"
 #include "common-hal/microcontroller/Pin.h"
 
diff --git a/ports/espressif/common-hal/canio/Listener.c b/ports/espressif/common-hal/canio/Listener.c
index 0df8ee1b8d..a6c0dbf90c 100644
--- a/ports/espressif/common-hal/canio/Listener.c
+++ b/ports/espressif/common-hal/canio/Listener.c
@@ -39,7 +39,8 @@
 
 #include "hal/twai_ll.h"
 
-#if !defined(TWAI) && defined(TWAI0)
+// There is no logic that dictates TWAI vs TWAI0
+#if defined(CONFIG_IDF_TARGET_ESP32H2) || defined(CONFIG_IDF_TARGET_ESP32C6)
 #define TWAI TWAI0
 #endif