Skip to content

Commit 1c0155c

Browse files
tannewttannewt
authored
Merge pull request #8424 from tannewt/update-idf5.1
Update to ESP-IDF 5.1 and add C6 and H2 support
2 parents d6b284e + c726e87 commit 1c0155c

File tree

114 files changed

+1439
-362
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+1439
-362
lines changed

‎.gitmodules‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@
143143
[submodule "ports/espressif/esp-idf"]
144144
path = ports/espressif/esp-idf
145145
url = https://github.com/adafruit/esp-idf.git
146+
branch = circuitpython-v5.1
146147
[submodule "ports/espressif/esp-protocols"]
147148
path = ports/espressif/esp-protocols
148149
url = https://github.com/espressif/esp-protocols.git
@@ -151,7 +152,7 @@
151152
url = https://github.com/espressif/esp-iot-solution.git
152153
[submodule "ports/espressif/esp-camera"]
153154
path = ports/espressif/esp-camera
154-
url = https://github.com/espressif/esp32-camera.git
155+
url = https://github.com/adafruit/esp32-camera.git
155156
branch = circuitpython
156157
[submodule "frozen/Adafruit_CircuitPython_ST7789"]
157158
path = frozen/Adafruit_CircuitPython_ST7789

‎ports/espressif/Makefile‎

Lines changed: 88 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,23 @@ include ../../py/circuitpy_mkenv.mk
2727
ifeq ($(IDF_TARGET),esp32c3)
2828
IDF_TARGET_ARCH = riscv
2929
CROSS_COMPILE = riscv32-esp-elf-
30+
else ifeq ($(IDF_TARGET),esp32c6)
31+
IDF_TARGET_ARCH = riscv
32+
CROSS_COMPILE = riscv32-esp-elf-
33+
else ifeq ($(IDF_TARGET),esp32h2)
34+
IDF_TARGET_ARCH = riscv
35+
CROSS_COMPILE = riscv32-esp-elf-
3036
else
3137
IDF_TARGET_ARCH = xtensa
3238
CROSS_COMPILE = xtensa-$(IDF_TARGET)-elf-
3339
endif
3440

41+
ifeq ($(IDF_TARGET),esp32s3)
42+
BT_IDF_TARGET = esp32c3
43+
else
44+
BT_IDF_TARGET = $(IDF_TARGET)
45+
endif
46+
3547
#######################################
3648
# CFLAGS
3749
#######################################
@@ -52,23 +64,35 @@ INC += \
5264
-isystem esp-idf/components/app_update/include \
5365
-isystem esp-idf/components/bootloader_support/include \
5466
-isystem esp-idf/components/bootloader_support/bootloader_flash/include \
55-
-isystem esp-idf/components/bt/include/$(IDF_TARGET)/include \
67+
-isystem esp-idf/components/bt/include/$(BT_IDF_TARGET)/include \
5668
-isystem esp-idf/components/bt/host/nimble/esp-hci/include \
5769
-isystem esp-idf/components/bt/host/nimble/nimble/nimble/controller/include \
5870
-isystem esp-idf/components/bt/host/nimble/nimble/nimble/host/include \
5971
-isystem esp-idf/components/bt/host/nimble/nimble/nimble/host/services/gap/include \
6072
-isystem esp-idf/components/bt/host/nimble/nimble/nimble/include \
6173
-isystem esp-idf/components/bt/host/nimble/nimble/nimble/host/util/include \
74+
-isystem esp-idf/components/bt/host/nimble/nimble/nimble/transport/include \
6275
-isystem esp-idf/components/bt/host/nimble/nimble/porting/nimble/include \
6376
-isystem esp-idf/components/bt/host/nimble/nimble/porting/npl/freertos/include \
6477
-isystem esp-idf/components/bt/host/nimble/port/include \
6578
-isystem esp-idf/components/driver/include \
6679
-isystem esp-idf/components/driver/deprecated \
80+
-isystem esp-idf/components/driver/dac/include \
81+
-isystem esp-idf/components/driver/gpio/include \
82+
-isystem esp-idf/components/driver/i2c/include \
83+
-isystem esp-idf/components/driver/i2s/include \
6784
-isystem esp-idf/components/driver/$(IDF_TARGET)/include \
85+
-isystem esp-idf/components/driver/ledc/include \
86+
-isystem esp-idf/components/driver/spi/include \
87+
-isystem esp-idf/components/driver/temperature_sensor/include \
88+
-isystem esp-idf/components/driver/touch_sensor/include \
89+
-isystem esp-idf/components/driver/touch_sensor/$(IDF_TARGET)/include \
90+
-isystem esp-idf/components/driver/twai/include \
6891
-isystem esp-idf/components/efuse/include \
6992
-isystem esp-idf/components/efuse/$(IDF_TARGET)/include \
7093
-isystem esp-idf/components/$(IDF_TARGET)/include \
71-
-isystem esp-idf/components/esp_adc/deprecated/include \
94+
-isystem esp-idf/components/esp_adc/include \
95+
-isystem esp-idf/components/esp_adc/$(IDF_TARGET)/include \
7296
-isystem esp-idf/components/esp_app_format/include \
7397
-isystem esp-idf/components/esp_common/include \
7498
-isystem esp-idf/components/esp_event/include \
@@ -85,6 +109,7 @@ INC += \
85109
-isystem esp-idf/components/esp_wifi/include \
86110
-isystem esp-idf/components/freertos/esp_additions/include \
87111
-isystem esp-idf/components/freertos/esp_additions/include/freertos \
112+
-isystem esp-idf/components/freertos/esp_additions/arch/$(IDF_TARGET_ARCH)/include \
88113
-isystem esp-idf/components/freertos/FreeRTOS-Kernel/include \
89114
-isystem esp-idf/components/freertos/FreeRTOS-Kernel/include/freertos \
90115
-isystem esp-idf/components/freertos/FreeRTOS-Kernel/portable/$(IDF_TARGET_ARCH)/include \
@@ -95,7 +120,9 @@ INC += \
95120
-isystem esp-idf/components/log/include \
96121
-isystem esp-idf/components/lwip/include \
97122
-isystem esp-idf/components/lwip/lwip/src/include \
98-
-isystem esp-idf/components/lwip/port/esp32/include \
123+
-isystem esp-idf/components/lwip/port/include \
124+
-isystem esp-idf/components/lwip/port/esp32xx/include \
125+
-isystem esp-idf/components/lwip/port/freertos/include \
99126
-isystem esp-idf/components/mbedtls/esp_crt_bundle/include \
100127
-isystem esp-idf/components/mbedtls/mbedtls/include \
101128
-isystem esp-idf/components/mbedtls/port/include \
@@ -153,12 +180,13 @@ CFLAGS += $(INC) -Werror -Wall -std=gnu11 -Wl,--gc-sections $(BASE_CFLAGS) $(C_D
153180
# Most current ESPs have nano versions of newlib in ROM so we use them.
154181
ifneq ($(IDF_TARGET),esp32c6)
155182
CFLAGS += --specs=nano.specs
183+
LDFLAGS += -T$(IDF_TARGET).rom.newlib-nano.ld
156184
endif
157185

158186
ifeq ($(IDF_TARGET_ARCH),xtensa)
159187
CFLAGS += -mlongcalls
160188
else ifeq ($(IDF_TARGET_ARCH),riscv)
161-
CFLAGS += -march=rv32imc
189+
CFLAGS += -march=rv32imac_zicsr_zifencei
162190
endif
163191

164192
LDFLAGS = $(CFLAGS) -Wl,-nostdlib -Wl,-Map=$@.map -Wl,-cref -Wl,--undefined=uxTopUsedPriority
@@ -173,7 +201,6 @@ LDFLAGS += \
173201
-T$(IDF_TARGET).rom.ld \
174202
-T$(IDF_TARGET).rom.api.ld \
175203
-T$(IDF_TARGET).rom.libgcc.ld \
176-
-T$(IDF_TARGET).rom.newlib-nano.ld \
177204
-Wl,-Bstatic \
178205
-Wl,--no-warn-mismatch \
179206
-Wl,--build-id=none \
@@ -189,6 +216,20 @@ LDFLAGS += \
189216
-Tesp32c3.rom.newlib.ld \
190217
-Tesp32c3.rom.version.ld \
191218
-Tesp32c3.rom.eco3.ld
219+
else ifeq ($(IDF_TARGET),esp32c6)
220+
LDFLAGS += \
221+
-Tesp32c6.rom.phy.ld \
222+
-Tesp32c6.rom.pp.ld \
223+
-Tesp32c6.rom.net80211.ld \
224+
-Tesp32c6.rom.newlib.ld \
225+
-Tesp32c6.rom.coexist.ld \
226+
-Tesp32c6.rom.heap.ld \
227+
-Tesp32c6.rom.wdt.ld
228+
else ifeq ($(IDF_TARGET),esp32h2)
229+
LDFLAGS += \
230+
-Tesp32h2.rom.heap.ld \
231+
-Tesp32h2.rom.newlib.ld \
232+
-Tesp32h2.rom.wdt.ld
192233
else ifeq ($(IDF_TARGET),esp32s2)
193234
LDFLAGS += \
194235
-T$(IDF_TARGET).rom.newlib-data.ld \
@@ -203,7 +244,7 @@ endif
203244
LIBS := -lgcc -lc -lstdc++
204245

205246
# Use toolchain libm if we're not using our own.
206-
ifndef INTERNAL_LIBM
247+
ifneq ($(INTERNAL_LIBM),1)
207248
LIBS += -lm
208249
endif
209250

@@ -243,12 +284,16 @@ SRC_C += \
243284

244285
SRC_C += $(wildcard common-hal/espidf/*.c)
245286

246-
ifeq ($(IDF_TARGET),esp32c3)
287+
ifneq ($(CIRCUITPY_ESP_USB_SERIAL_JTAG),0)
247288
SRC_C += supervisor/usb_serial_jtag.c
248-
else
249-
SRC_C += \
250-
peripherals/pcnt.c \
251-
peripherals/touch.c
289+
endif
290+
291+
ifneq ($(CIRCUITPY_COUNTIO),0)
292+
SRC_C += peripherals/pcnt.c
293+
endif
294+
295+
ifneq ($(CIRCUITPY_TOUCHIO_USE_NATIVE),0)
296+
SRC_C += peripherals/touch.c
252297
endif
253298

254299
ifneq ($(CIRCUITPY_USB),0)
@@ -408,21 +453,42 @@ update-all-sdkconfigs: $(BUILD)/esp-idf/config/sdkconfig.h
408453
update-board-sdkconfig: $(BUILD)/esp-idf/config/sdkconfig.h
409454
python tools/update_sdkconfig.py --board=$(BOARD) --debug=$(DEBUG)
410455

411-
BINARY_WIFI_BLOBS = libcoexist.a libcore.a libespnow.a libmesh.a libnet80211.a libpp.a libsmartconfig.a libwapi.a
412-
BINARY_BLOBS = esp-idf/components/esp_phy/lib/$(IDF_TARGET)/libphy.a $(addprefix esp-idf/components/esp_wifi/lib/$(IDF_TARGET)/, $(BINARY_WIFI_BLOBS))
456+
BINARY_WIFI_BLOBS = libcore.a libespnow.a libmesh.a libnet80211.a libpp.a libsmartconfig.a libwapi.a
457+
BINARY_BLOBS = esp-idf/components/esp_phy/lib/$(IDF_TARGET)/libphy.a
458+
ifneq ($(CIRCUITPY_WIFI),0)
459+
BINARY_BLOBS += esp-idf/components/esp_coex/lib/$(IDF_TARGET)/libcoexist.a $(addprefix esp-idf/components/esp_wifi/lib/$(IDF_TARGET)/, $(BINARY_WIFI_BLOBS))
460+
endif
413461
ifeq ($(IDF_TARGET),esp32)
414462
BINARY_BLOBS += esp-idf/components/esp_phy/lib/$(IDF_TARGET)/librtc.a
415463
endif
416464

417-
ESP_IDF_COMPONENTS_LINK = $(IDF_TARGET_ARCH) app_update bootloader_support driver efuse esp_adc esp_app_format esp_common esp_event esp_hw_support esp_netif esp_partition esp_phy esp_pm esp_ringbuf esp_rom esp_system esp_timer esp-tls esp_wifi freertos hal heap log lwip mbedtls mdns newlib nvs_flash pthread soc spi_flash vfs wpa_supplicant
465+
ESP_IDF_COMPONENTS_LINK = $(IDF_TARGET_ARCH) app_update bootloader_support driver efuse esp_adc esp_app_format esp_common esp_event esp_hw_support esp_mm esp_partition esp_phy esp_pm esp_ringbuf esp_rom esp_system esp_timer freertos hal heap log newlib nvs_flash pthread soc spi_flash vfs
466+
ifneq ($(CIRCUITPY_WIFI),0)
467+
ESP_IDF_COMPONENTS_LINK += esp_coex esp_netif esp-tls esp_wifi lwip mbedtls mdns wpa_supplicant
468+
endif
418469
ifneq ($(CIRCUITPY_BLEIO),0)
470+
BLE_IMPL_esp32 := esp32
471+
BLE_IMPL_esp32s3 := esp32c3
472+
BLE_IMPL_esp32c2 := libble
473+
BLE_IMPL_esp32c3 := esp32c3
474+
BLE_IMPL_esp32c6 := libble
475+
BLE_IMPL_esp32h2 := libble
476+
BLE_IMPL = $(BLE_IMPL_$(IDF_TARGET))
477+
419478
ESP_IDF_COMPONENTS_LINK += bt
420-
ifeq ($(IDF_TARGET),esp32)
421-
BINARY_BLOBS += esp-idf/components/bt/controller/lib_esp32/$(IDF_TARGET)/libbtdm_app.a
422-
else
479+
ifeq ($(BLE_IMPL),esp32)
480+
BINARY_BLOBS += esp-idf/components/bt/controller/lib_esp32/$(IDF_TARGET)/libbtdm_app.a
481+
endif
482+
483+
ifeq ($(BLE_IMPL),esp32c3)
423484
BINARY_BLOBS += esp-idf/components/esp_phy/lib/$(IDF_TARGET)/libbtbb.a \
424485
esp-idf/components/bt/controller/lib_esp32c3_family/$(IDF_TARGET)/libbtdm_app.a
425486
endif
487+
488+
ifeq ($(BLE_IMPL),libble)
489+
BINARY_BLOBS += esp-idf/components/esp_phy/lib/$(IDF_TARGET)/libbtbb.a \
490+
esp-idf/components/bt/controller/lib_$(IDF_TARGET)/$(IDF_TARGET)-bt-lib/libble_app.a
491+
endif
426492
endif
427493
ifneq ($(CIRCUITPY_ESPULP),0)
428494
ESP_IDF_COMPONENTS_LINK += ulp
@@ -450,11 +516,16 @@ ESP_IDF_COMPONENTS_EXPANDED += $(BUILD)/esp-idf/esp-idf/esp-camera/libesp-camera
450516
endif
451517

452518
ifneq ($(VALID_BOARD),)
519+
# From esp-idf/components/bootloader/Kconfig.projbuild
453520
# BOOTLOADER_OFFSET is determined by chip type, based on the ROM bootloader, and is not changeable.
454521
ifeq ($(IDF_TARGET),esp32)
455522
BOOTLOADER_OFFSET = 0x1000
523+
else ifeq ($(IDF_TARGET),esp32h2)
524+
BOOTLOADER_OFFSET = 0x0
456525
else ifeq ($(IDF_TARGET),esp32c3)
457526
BOOTLOADER_OFFSET = 0x0
527+
else ifeq ($(IDF_TARGET),esp32c6)
528+
BOOTLOADER_OFFSET = 0x0
458529
else ifeq ($(IDF_TARGET),esp32s3)
459530
BOOTLOADER_OFFSET = 0x0
460531
else ifeq ($(IDF_TARGET),esp32s2)

‎ports/espressif/bindings/espnow/Peer.c‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,13 @@ STATIC mp_obj_t espnow_peer_make_new(const mp_obj_type_t *type, size_t n_args, s
7979
self->peer_info.ifidx = (wifi_interface_t)mp_arg_validate_int_range(args[ARG_interface].u_int, 0, 1, MP_QSTR_interface);
8080

8181
self->peer_info.encrypt = args[ARG_encrypted].u_bool;
82+
self->lmk_set = false;
8283

8384
const mp_obj_t lmk = args[ARG_lmk].u_obj;
8485
if (lmk != mp_const_none) {
86+
self->lmk_set = true;
8587
memcpy(self->peer_info.lmk, common_hal_espnow_get_bytes_len(lmk, ESP_NOW_KEY_LEN), ESP_NOW_KEY_LEN);
86-
} else if (self->peer_info.encrypt && !self->peer_info.lmk) {
88+
} else if (self->peer_info.encrypt) {
8789
mp_raise_ValueError_varg(translate("%q is %q"), MP_QSTR_lmk, MP_QSTR_None);
8890
}
8991

@@ -196,7 +198,7 @@ STATIC mp_obj_t espnow_peer_set_encrypted(const mp_obj_t self_in, const mp_obj_t
196198

197199
self->peer_info.encrypt = mp_obj_is_true(value);
198200

199-
if (!self->peer_info.lmk) {
201+
if (!self->lmk_set) {
200202
mp_raise_ValueError_varg(translate("%q is %q"), MP_QSTR_lmk, MP_QSTR_None);
201203
}
202204

‎ports/espressif/bindings/espnow/Peer.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
typedef struct {
3333
mp_obj_base_t base;
3434
esp_now_peer_info_t peer_info;
35+
bool lmk_set;
3536
} espnow_peer_obj_t;
3637

3738
extern const mp_obj_type_t espnow_peer_type;

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,3 @@
3636

3737
// For entering safe mode
3838
#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO9)
39-
40-
#define CIRCUITPY_ESP_USB_SERIAL_JTAG (1)

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,7 @@ IDF_TARGET = esp32c3
66
CIRCUITPY_ESP_FLASH_MODE = dio
77
CIRCUITPY_ESP_FLASH_FREQ = 80m
88
CIRCUITPY_ESP_FLASH_SIZE = 4MB
9+
10+
CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
11+
12+
CIRCUITPY_BLEIO = 0

‎ports/espressif/boards/adafruit_feather_esp32_v2/board.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include "supervisor/board.h"
2828
#include "mpconfigboard.h"
2929
#include "shared-bindings/microcontroller/Pin.h"
30-
#include "components/driver/include/driver/gpio.h"
30+
#include "components/driver/gpio/include/driver/gpio.h"
3131
#include "components/hal/include/hal/gpio_hal.h"
3232
#include "common-hal/microcontroller/Pin.h"
3333

‎ports/espressif/boards/adafruit_feather_esp32s2/board.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include "supervisor/board.h"
2828
#include "mpconfigboard.h"
2929
#include "shared-bindings/microcontroller/Pin.h"
30-
#include "components/driver/include/driver/gpio.h"
30+
#include "components/driver/gpio/include/driver/gpio.h"
3131
#include "components/hal/include/hal/gpio_hal.h"
3232
#include "common-hal/microcontroller/Pin.h"
3333

‎ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/board.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include "supervisor/board.h"
2828
#include "mpconfigboard.h"
2929
#include "shared-bindings/microcontroller/Pin.h"
30-
#include "components/driver/include/driver/gpio.h"
30+
#include "components/driver/gpio/include/driver/gpio.h"
3131
#include "components/hal/include/hal/gpio_hal.h"
3232
#include "common-hal/microcontroller/Pin.h"
3333

‎ports/espressif/boards/adafruit_feather_esp32s3_nopsram/board.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include "supervisor/board.h"
2828
#include "mpconfigboard.h"
2929
#include "shared-bindings/microcontroller/Pin.h"
30-
#include "components/driver/include/driver/gpio.h"
30+
#include "components/driver/gpio/include/driver/gpio.h"
3131
#include "components/hal/include/hal/gpio_hal.h"
3232
#include "common-hal/microcontroller/Pin.h"
3333

0 commit comments

Comments
 (0)