Skip to content

Commit 8d82e4b

Browse files
authored
Merge pull request #7008 from MicroDev1/patch
Cleanup `mpconfigboard.mk` of espressif boards
2 parents e0517c7 + 4f75325 commit 8d82e4b

File tree

89 files changed

+10
-556
lines changed

Some content is hidden

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

89 files changed

+10
-556
lines changed

ports/espressif/Makefile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,16 +226,21 @@ endif
226226

227227
# TinyUSB defines
228228
ifeq ($(CIRCUITPY_USB),1)
229+
ifeq ($(IDF_TARGET),esp32s2)
230+
CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_ESP32S2
231+
else ifeq ($(IDF_TARGET),esp32s3)
232+
CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_ESP32S3
233+
endif
229234
CFLAGS += \
230-
-DCFG_TUSB_MCU=OPT_MCU_ESP32S2 \
231235
-DCFG_TUSB_OS=OPT_OS_FREERTOS \
232236
-DCFG_TUD_CDC_RX_BUFSIZE=1024 \
233237
-DCFG_TUD_CDC_TX_BUFSIZE=1024 \
234238
-DCFG_TUD_MSC_BUFSIZE=4096 \
235239
-DCFG_TUD_MIDI_RX_BUFSIZE=128 \
236240
-DCFG_TUD_MIDI_TX_BUFSIZE=128 \
237241
-DCFG_TUD_VENDOR_RX_BUFSIZE=128 \
238-
-DCFG_TUD_VENDOR_TX_BUFSIZE=128
242+
-DCFG_TUD_VENDOR_TX_BUFSIZE=128 \
243+
-DCFG_TUD_TASK_QUEUE_SZ=32
239244
endif
240245

241246
######################################

ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.mk

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Adafruit"
55

66
IDF_TARGET = esp32s2
77

8-
INTERNAL_FLASH_FILESYSTEM = 1
9-
LONGINT_IMPL = MPZ
10-
11-
# The default queue depth of 16 overflows on release builds,
12-
# so increase it to 32.
13-
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
14-
158
CIRCUITPY_ESP_FLASH_MODE = dio
169
CIRCUITPY_ESP_FLASH_FREQ = 40m
1710
CIRCUITPY_ESP_FLASH_SIZE = 4MB

ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.mk

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,6 @@ CIRCUITPY_CREATION_ID = 0x00320001
33

44
IDF_TARGET = esp32
55

6-
INTERNAL_FLASH_FILESYSTEM = 1
7-
LONGINT_IMPL = MPZ
8-
9-
# The default queue depth of 16 overflows on release builds,
10-
# so increase it to 32.
11-
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
12-
136
CIRCUITPY_ESP_FLASH_MODE = dio
147
CIRCUITPY_ESP_FLASH_FREQ = 40m
158
CIRCUITPY_ESP_FLASH_SIZE = 8MB

ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.mk

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Adafruit"
55

66
IDF_TARGET = esp32s2
77

8-
INTERNAL_FLASH_FILESYSTEM = 1
9-
LONGINT_IMPL = MPZ
10-
11-
# The default queue depth of 16 overflows on release builds,
12-
# so increase it to 32.
13-
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
14-
158
CIRCUITPY_ESP_FLASH_MODE = dio
169
CIRCUITPY_ESP_FLASH_FREQ = 40m
1710
CIRCUITPY_ESP_FLASH_SIZE = 4MB

ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.mk

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,6 @@ USB_MANUFACTURER = "Adafruit"
66

77
IDF_TARGET = esp32s2
88

9-
INTERNAL_FLASH_FILESYSTEM = 1
10-
LONGINT_IMPL = MPZ
11-
12-
# The default queue depth of 16 overflows on release builds,
13-
# so increase it to 32.
14-
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
15-
169
CIRCUITPY_ESP_FLASH_MODE = dio
1710
CIRCUITPY_ESP_FLASH_FREQ = 40m
1811
CIRCUITPY_ESP_FLASH_SIZE = 4MB

ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.mk

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Adafruit"
55

66
IDF_TARGET = esp32s2
77

8-
INTERNAL_FLASH_FILESYSTEM = 1
9-
LONGINT_IMPL = MPZ
10-
11-
# The default queue depth of 16 overflows on release builds,
12-
# so increase it to 32.
13-
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
14-
158
CIRCUITPY_ESP_FLASH_MODE = dio
169
CIRCUITPY_ESP_FLASH_FREQ = 40m
1710
CIRCUITPY_ESP_FLASH_SIZE = 4MB

ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Adafruit"
55

66
IDF_TARGET = esp32s3
77

8-
INTERNAL_FLASH_FILESYSTEM = 1
9-
LONGINT_IMPL = MPZ
10-
11-
# The default queue depth of 16 overflows on release builds,
12-
# so increase it to 32.
13-
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
14-
158
CIRCUITPY_ESP_FLASH_MODE = qio
169
CIRCUITPY_ESP_FLASH_FREQ = 40m
1710
CIRCUITPY_ESP_FLASH_SIZE = 4MB

ports/espressif/boards/adafruit_feather_esp32s3_nopsram/mpconfigboard.mk

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Adafruit"
55

66
IDF_TARGET = esp32s3
77

8-
INTERNAL_FLASH_FILESYSTEM = 1
9-
LONGINT_IMPL = MPZ
10-
11-
# The default queue depth of 16 overflows on release builds,
12-
# so increase it to 32.
13-
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
14-
158
CIRCUITPY_ESP_FLASH_MODE = qio
169
CIRCUITPY_ESP_FLASH_FREQ = 80m
1710
CIRCUITPY_ESP_FLASH_SIZE = 8MB

ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,6 @@ USB_MANUFACTURER = "Adafruit"
66

77
IDF_TARGET = esp32s3
88

9-
INTERNAL_FLASH_FILESYSTEM = 1
10-
LONGINT_IMPL = MPZ
11-
12-
# The default queue depth of 16 overflows on release builds,
13-
# so increase it to 32.
14-
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
15-
169
CIRCUITPY_ESP_FLASH_MODE = dio
1710
CIRCUITPY_ESP_FLASH_FREQ = 40m
1811
CIRCUITPY_ESP_FLASH_SIZE = 4MB

ports/espressif/boards/adafruit_feather_huzzah32/mpconfigboard.mk

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,6 @@ CIRCUITPY_CREATION_ID = 0x00320002
33

44
IDF_TARGET = esp32
55

6-
INTERNAL_FLASH_FILESYSTEM = 1
7-
LONGINT_IMPL = MPZ
8-
9-
# The default queue depth of 16 overflows on release builds,
10-
# so increase it to 32.
11-
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
12-
136
CIRCUITPY_ESP_FLASH_MODE = dio
147
CIRCUITPY_ESP_FLASH_FREQ = 40m
158
CIRCUITPY_ESP_FLASH_SIZE = 4MB

ports/espressif/boards/adafruit_funhouse/mpconfigboard.mk

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Adafruit"
55

66
IDF_TARGET = esp32s2
77

8-
INTERNAL_FLASH_FILESYSTEM = 1
9-
LONGINT_IMPL = MPZ
10-
11-
# The default queue depth of 16 overflows on release builds,
12-
# so increase it to 32.
13-
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
14-
158
CIRCUITPY_ESP_FLASH_MODE = dio
169
CIRCUITPY_ESP_FLASH_FREQ = 40m
1710
CIRCUITPY_ESP_FLASH_SIZE = 4MB

ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Adafruit"
55

66
IDF_TARGET = esp32s2
77

8-
INTERNAL_FLASH_FILESYSTEM = 1
9-
LONGINT_IMPL = MPZ
10-
11-
# The default queue depth of 16 overflows on release builds,
12-
# so increase it to 32.
13-
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
14-
158
CIRCUITPY_ESP_FLASH_MODE = dio
169
CIRCUITPY_ESP_FLASH_FREQ = 40m
1710
CIRCUITPY_ESP_FLASH_SIZE = 4MB

ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.mk

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Adafruit"
55

66
IDF_TARGET = esp32s2
77

8-
INTERNAL_FLASH_FILESYSTEM = 1
9-
LONGINT_IMPL = MPZ
10-
11-
# The default queue depth of 16 overflows on release builds,
12-
# so increase it to 32.
13-
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
14-
158
CIRCUITPY_ESP_FLASH_MODE = dio
169
CIRCUITPY_ESP_FLASH_FREQ = 40m
1710
CIRCUITPY_ESP_FLASH_SIZE = 4MB

ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.mk

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,6 @@ CIRCUITPY_CREATION_ID = 0x00320003
33

44
IDF_TARGET = esp32
55

6-
INTERNAL_FLASH_FILESYSTEM = 1
7-
LONGINT_IMPL = MPZ
8-
9-
# The default queue depth of 16 overflows on release builds,
10-
# so increase it to 32.
11-
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
12-
136
CIRCUITPY_ESP_FLASH_MODE = dio
147
CIRCUITPY_ESP_FLASH_FREQ = 40m
158
CIRCUITPY_ESP_FLASH_SIZE = 8MB

ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ CIRCUITPY_CREATION_ID = 0x00c30001
33

44
IDF_TARGET = esp32c3
55

6-
INTERNAL_FLASH_FILESYSTEM = 1
7-
86
CIRCUITPY_ESP_FLASH_MODE = dio
97
CIRCUITPY_ESP_FLASH_FREQ = 80m
108
CIRCUITPY_ESP_FLASH_SIZE = 4MB

ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.mk

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,6 @@ USB_MANUFACTURER = "Adafruit"
66

77
IDF_TARGET = esp32s2
88

9-
INTERNAL_FLASH_FILESYSTEM = 1
10-
LONGINT_IMPL = MPZ
11-
12-
# The default queue depth of 16 overflows on release builds,
13-
# so increase it to 32.
14-
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
15-
169
CIRCUITPY_ESP_FLASH_MODE = dio
1710
CIRCUITPY_ESP_FLASH_FREQ = 40m
1811
CIRCUITPY_ESP_FLASH_SIZE = 4MB

ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.mk

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,6 @@ USB_MANUFACTURER = "Adafruit"
66

77
IDF_TARGET = esp32s3
88

9-
INTERNAL_FLASH_FILESYSTEM = 1
10-
LONGINT_IMPL = MPZ
11-
12-
# The default queue depth of 16 overflows on release builds,
13-
# so increase it to 32.
14-
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
15-
169
CIRCUITPY_ESP_FLASH_MODE = dio
1710
CIRCUITPY_ESP_FLASH_FREQ = 80m
1811
CIRCUITPY_ESP_FLASH_SIZE = 8MB

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ CIRCUITPY_CREATION_ID = 0x00C30001
33

44
IDF_TARGET = esp32c3
55

6-
INTERNAL_FLASH_FILESYSTEM = 1
7-
86
CIRCUITPY_ESP_FLASH_MODE = dio
97
CIRCUITPY_ESP_FLASH_FREQ = 80m
108
CIRCUITPY_ESP_FLASH_SIZE = 2MB

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ CIRCUITPY_CREATION_ID = 0x00C30002
33

44
IDF_TARGET = esp32c3
55

6-
INTERNAL_FLASH_FILESYSTEM = 1
7-
86
CIRCUITPY_ESP_FLASH_MODE = qio
97
CIRCUITPY_ESP_FLASH_FREQ = 80m
108
CIRCUITPY_ESP_FLASH_SIZE = 4MB

ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.mk

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Ai-Thinker"
55

66
IDF_TARGET = esp32s2
77

8-
INTERNAL_FLASH_FILESYSTEM = 1
9-
LONGINT_IMPL = MPZ
10-
11-
# The default queue depth of 16 overflows on release builds,
12-
# so increase it to 32.
13-
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
14-
158
CIRCUITPY_ESP_FLASH_MODE = dio
169
CIRCUITPY_ESP_FLASH_FREQ = 40m
1710
CIRCUITPY_ESP_FLASH_SIZE = 4MB

ports/espressif/boards/artisense_rd00/mpconfigboard.mk

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Artisense"
55

66
IDF_TARGET = esp32s2
77

8-
INTERNAL_FLASH_FILESYSTEM = 1
9-
LONGINT_IMPL = MPZ
10-
11-
# The default queue depth of 16 overflows on release builds,
12-
# so increase it to 32.
13-
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
14-
158
CIRCUITPY_ESP_FLASH_MODE = dio
169
CIRCUITPY_ESP_FLASH_FREQ = 40m
1710
CIRCUITPY_ESP_FLASH_SIZE = 4MB

ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.mk

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "ATMegaZero"
55

66
IDF_TARGET = esp32s2
77

8-
INTERNAL_FLASH_FILESYSTEM = 1
9-
LONGINT_IMPL = MPZ
10-
11-
# The default queue depth of 16 overflows on release builds,
12-
# so increase it to 32.
13-
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
14-
158
CIRCUITPY_ESP_FLASH_MODE = qio
169
CIRCUITPY_ESP_FLASH_FREQ = 40m
1710
CIRCUITPY_ESP_FLASH_SIZE = 16MB

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ CIRCUITPY_CREATION_ID = 0x00C30001
44

55
IDF_TARGET = esp32c3
66

7-
INTERNAL_FLASH_FILESYSTEM = 1
8-
97
CIRCUITPY_ESP_FLASH_MODE=qio
108
CIRCUITPY_ESP_FLASH_FREQ=80m
119
CIRCUITPY_ESP_FLASH_SIZE=4MB

ports/espressif/boards/bpi_bit_s2/mpconfigboard.mk

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "BananaPi"
55

66
IDF_TARGET = esp32s2
77

8-
INTERNAL_FLASH_FILESYSTEM = 1
9-
LONGINT_IMPL = MPZ
10-
11-
# The default queue depth of 16 overflows on release builds,
12-
# so increase it to 32.
13-
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
14-
158
CIRCUITPY_ESP_FLASH_MODE=dio
169
CIRCUITPY_ESP_FLASH_FREQ=40m
1710
CIRCUITPY_ESP_FLASH_SIZE=4MB

ports/espressif/boards/bpi_leaf_s3/mpconfigboard.mk

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "BananaPi"
55

66
IDF_TARGET = esp32s3
77

8-
INTERNAL_FLASH_FILESYSTEM = 1
9-
LONGINT_IMPL = MPZ
10-
11-
# The default queue depth of 16 overflows on release builds,
12-
# so increase it to 32.
13-
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
14-
158
CIRCUITPY_ESP_FLASH_MODE=dio
169
CIRCUITPY_ESP_FLASH_FREQ=80m
1710
CIRCUITPY_ESP_FLASH_SIZE=8MB

ports/espressif/boards/crumpspace_crumps2/mpconfigboard.mk

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "CrumpSpace"
55

66
IDF_TARGET = esp32s2
77

8-
INTERNAL_FLASH_FILESYSTEM = 1
9-
LONGINT_IMPL = MPZ
10-
11-
# The default queue depth of 16 overflows on release builds,
12-
# so increase it to 32.
13-
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
14-
158
CIRCUITPY_ESP_FLASH_MODE = dio
169
CIRCUITPY_ESP_FLASH_FREQ = 40m
1710
CIRCUITPY_ESP_FLASH_SIZE = 4MB

ports/espressif/boards/cytron_maker_feather_aiot_s3/mpconfigboard.mk

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "Cytron"
55

66
IDF_TARGET = esp32s3
77

8-
INTERNAL_FLASH_FILESYSTEM = 1
9-
LONGINT_IMPL = MPZ
10-
11-
# The default queue depth of 16 overflows on release builds,
12-
# so increase it to 32.
13-
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
14-
158
CIRCUITPY_ESP_FLASH_MODE = dio
169
CIRCUITPY_ESP_FLASH_FREQ = 80m
1710
CIRCUITPY_ESP_FLASH_SIZE = 8MB

ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.mk

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,6 @@ USB_MANUFACTURER = "ElectronicCats"
55

66
IDF_TARGET = esp32s2
77

8-
INTERNAL_FLASH_FILESYSTEM = 1
9-
LONGINT_IMPL = MPZ
10-
11-
# The default queue depth of 16 overflows on release builds,
12-
# so increase it to 32.
13-
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
14-
158
CIRCUITPY_NEOPIXEL_WRITE = 0
169

1710
CIRCUITPY_ESP_FLASH_MODE = dio

ports/espressif/boards/espressif_esp32_eye/mpconfigboard.mk

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ CIRCUITPY_CREATION_ID = 0x00320001
33

44
IDF_TARGET = esp32
55

6-
INTERNAL_FLASH_FILESYSTEM = 1
7-
LONGINT_IMPL = MPZ
8-
96
CIRCUITPY_ESP_FLASH_MODE = dio
107
CIRCUITPY_ESP_FLASH_FREQ = 40m
118
CIRCUITPY_ESP_FLASH_SIZE = 4MB

0 commit comments

Comments
 (0)