Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup mpconfigboard.mk of espressif boards #7008

Merged
merged 1 commit into from
Oct 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 7 additions & 2 deletions ports/espressif/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -226,16 +226,21 @@ endif

# TinyUSB defines
ifeq ($(CIRCUITPY_USB),1)
ifeq ($(IDF_TARGET),esp32s2)
CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_ESP32S2
else ifeq ($(IDF_TARGET),esp32s3)
CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_ESP32S3
endif
CFLAGS += \
-DCFG_TUSB_MCU=OPT_MCU_ESP32S2 \
-DCFG_TUSB_OS=OPT_OS_FREERTOS \
-DCFG_TUD_CDC_RX_BUFSIZE=1024 \
-DCFG_TUD_CDC_TX_BUFSIZE=1024 \
-DCFG_TUD_MSC_BUFSIZE=4096 \
-DCFG_TUD_MIDI_RX_BUFSIZE=128 \
-DCFG_TUD_MIDI_TX_BUFSIZE=128 \
-DCFG_TUD_VENDOR_RX_BUFSIZE=128 \
-DCFG_TUD_VENDOR_TX_BUFSIZE=128
-DCFG_TUD_VENDOR_TX_BUFSIZE=128 \
-DCFG_TUD_TASK_QUEUE_SZ=32
endif

######################################
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,6 @@ USB_MANUFACTURER = "Adafruit"

IDF_TARGET = esp32s2

INTERNAL_FLASH_FILESYSTEM = 1
LONGINT_IMPL = MPZ

# The default queue depth of 16 overflows on release builds,
# so increase it to 32.
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32

CIRCUITPY_ESP_FLASH_MODE = dio
CIRCUITPY_ESP_FLASH_FREQ = 40m
CIRCUITPY_ESP_FLASH_SIZE = 4MB
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,6 @@ CIRCUITPY_CREATION_ID = 0x00320001

IDF_TARGET = esp32

INTERNAL_FLASH_FILESYSTEM = 1
LONGINT_IMPL = MPZ

# The default queue depth of 16 overflows on release builds,
# so increase it to 32.
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32

CIRCUITPY_ESP_FLASH_MODE = dio
CIRCUITPY_ESP_FLASH_FREQ = 40m
CIRCUITPY_ESP_FLASH_SIZE = 8MB
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,6 @@ USB_MANUFACTURER = "Adafruit"

IDF_TARGET = esp32s2

INTERNAL_FLASH_FILESYSTEM = 1
LONGINT_IMPL = MPZ

# The default queue depth of 16 overflows on release builds,
# so increase it to 32.
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32

CIRCUITPY_ESP_FLASH_MODE = dio
CIRCUITPY_ESP_FLASH_FREQ = 40m
CIRCUITPY_ESP_FLASH_SIZE = 4MB
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,6 @@ USB_MANUFACTURER = "Adafruit"

IDF_TARGET = esp32s2

INTERNAL_FLASH_FILESYSTEM = 1
LONGINT_IMPL = MPZ

# The default queue depth of 16 overflows on release builds,
# so increase it to 32.
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32

CIRCUITPY_ESP_FLASH_MODE = dio
CIRCUITPY_ESP_FLASH_FREQ = 40m
CIRCUITPY_ESP_FLASH_SIZE = 4MB
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,6 @@ USB_MANUFACTURER = "Adafruit"

IDF_TARGET = esp32s2

INTERNAL_FLASH_FILESYSTEM = 1
LONGINT_IMPL = MPZ

# The default queue depth of 16 overflows on release builds,
# so increase it to 32.
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32

CIRCUITPY_ESP_FLASH_MODE = dio
CIRCUITPY_ESP_FLASH_FREQ = 40m
CIRCUITPY_ESP_FLASH_SIZE = 4MB
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,6 @@ USB_MANUFACTURER = "Adafruit"

IDF_TARGET = esp32s3

INTERNAL_FLASH_FILESYSTEM = 1
LONGINT_IMPL = MPZ

# The default queue depth of 16 overflows on release builds,
# so increase it to 32.
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32

CIRCUITPY_ESP_FLASH_MODE = qio
CIRCUITPY_ESP_FLASH_FREQ = 40m
CIRCUITPY_ESP_FLASH_SIZE = 4MB
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,6 @@ USB_MANUFACTURER = "Adafruit"

IDF_TARGET = esp32s3

INTERNAL_FLASH_FILESYSTEM = 1
LONGINT_IMPL = MPZ

# The default queue depth of 16 overflows on release builds,
# so increase it to 32.
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32

CIRCUITPY_ESP_FLASH_MODE = qio
CIRCUITPY_ESP_FLASH_FREQ = 80m
CIRCUITPY_ESP_FLASH_SIZE = 8MB
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,6 @@ USB_MANUFACTURER = "Adafruit"

IDF_TARGET = esp32s3

INTERNAL_FLASH_FILESYSTEM = 1
LONGINT_IMPL = MPZ

# The default queue depth of 16 overflows on release builds,
# so increase it to 32.
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32

CIRCUITPY_ESP_FLASH_MODE = dio
CIRCUITPY_ESP_FLASH_FREQ = 40m
CIRCUITPY_ESP_FLASH_SIZE = 4MB
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,6 @@ CIRCUITPY_CREATION_ID = 0x00320002

IDF_TARGET = esp32

INTERNAL_FLASH_FILESYSTEM = 1
LONGINT_IMPL = MPZ

# The default queue depth of 16 overflows on release builds,
# so increase it to 32.
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32

CIRCUITPY_ESP_FLASH_MODE = dio
CIRCUITPY_ESP_FLASH_FREQ = 40m
CIRCUITPY_ESP_FLASH_SIZE = 4MB
Expand Down
7 changes: 0 additions & 7 deletions ports/espressif/boards/adafruit_funhouse/mpconfigboard.mk
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,6 @@ USB_MANUFACTURER = "Adafruit"

IDF_TARGET = esp32s2

INTERNAL_FLASH_FILESYSTEM = 1
LONGINT_IMPL = MPZ

# The default queue depth of 16 overflows on release builds,
# so increase it to 32.
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32

CIRCUITPY_ESP_FLASH_MODE = dio
CIRCUITPY_ESP_FLASH_FREQ = 40m
CIRCUITPY_ESP_FLASH_SIZE = 4MB
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,6 @@ USB_MANUFACTURER = "Adafruit"

IDF_TARGET = esp32s2

INTERNAL_FLASH_FILESYSTEM = 1
LONGINT_IMPL = MPZ

# The default queue depth of 16 overflows on release builds,
# so increase it to 32.
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32

CIRCUITPY_ESP_FLASH_MODE = dio
CIRCUITPY_ESP_FLASH_FREQ = 40m
CIRCUITPY_ESP_FLASH_SIZE = 4MB
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,6 @@ USB_MANUFACTURER = "Adafruit"

IDF_TARGET = esp32s2

INTERNAL_FLASH_FILESYSTEM = 1
LONGINT_IMPL = MPZ

# The default queue depth of 16 overflows on release builds,
# so increase it to 32.
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32

CIRCUITPY_ESP_FLASH_MODE = dio
CIRCUITPY_ESP_FLASH_FREQ = 40m
CIRCUITPY_ESP_FLASH_SIZE = 4MB
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,6 @@ CIRCUITPY_CREATION_ID = 0x00320003

IDF_TARGET = esp32

INTERNAL_FLASH_FILESYSTEM = 1
LONGINT_IMPL = MPZ

# The default queue depth of 16 overflows on release builds,
# so increase it to 32.
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32

CIRCUITPY_ESP_FLASH_MODE = dio
CIRCUITPY_ESP_FLASH_FREQ = 40m
CIRCUITPY_ESP_FLASH_SIZE = 8MB
2 changes: 0 additions & 2 deletions ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ CIRCUITPY_CREATION_ID = 0x00c30001

IDF_TARGET = esp32c3

INTERNAL_FLASH_FILESYSTEM = 1

CIRCUITPY_ESP_FLASH_MODE = dio
CIRCUITPY_ESP_FLASH_FREQ = 80m
CIRCUITPY_ESP_FLASH_SIZE = 4MB
7 changes: 0 additions & 7 deletions ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.mk
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,6 @@ USB_MANUFACTURER = "Adafruit"

IDF_TARGET = esp32s2

INTERNAL_FLASH_FILESYSTEM = 1
LONGINT_IMPL = MPZ

# The default queue depth of 16 overflows on release builds,
# so increase it to 32.
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32

CIRCUITPY_ESP_FLASH_MODE = dio
CIRCUITPY_ESP_FLASH_FREQ = 40m
CIRCUITPY_ESP_FLASH_SIZE = 4MB
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,6 @@ USB_MANUFACTURER = "Adafruit"

IDF_TARGET = esp32s3

INTERNAL_FLASH_FILESYSTEM = 1
LONGINT_IMPL = MPZ

# The default queue depth of 16 overflows on release builds,
# so increase it to 32.
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32

CIRCUITPY_ESP_FLASH_MODE = dio
CIRCUITPY_ESP_FLASH_FREQ = 80m
CIRCUITPY_ESP_FLASH_SIZE = 8MB
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ CIRCUITPY_CREATION_ID = 0x00C30001

IDF_TARGET = esp32c3

INTERNAL_FLASH_FILESYSTEM = 1

CIRCUITPY_ESP_FLASH_MODE = dio
CIRCUITPY_ESP_FLASH_FREQ = 80m
CIRCUITPY_ESP_FLASH_SIZE = 2MB
2 changes: 0 additions & 2 deletions ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ CIRCUITPY_CREATION_ID = 0x00C30002

IDF_TARGET = esp32c3

INTERNAL_FLASH_FILESYSTEM = 1

CIRCUITPY_ESP_FLASH_MODE = qio
CIRCUITPY_ESP_FLASH_FREQ = 80m
CIRCUITPY_ESP_FLASH_SIZE = 4MB
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,6 @@ USB_MANUFACTURER = "Ai-Thinker"

IDF_TARGET = esp32s2

INTERNAL_FLASH_FILESYSTEM = 1
LONGINT_IMPL = MPZ

# The default queue depth of 16 overflows on release builds,
# so increase it to 32.
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32

CIRCUITPY_ESP_FLASH_MODE = dio
CIRCUITPY_ESP_FLASH_FREQ = 40m
CIRCUITPY_ESP_FLASH_SIZE = 4MB
7 changes: 0 additions & 7 deletions ports/espressif/boards/artisense_rd00/mpconfigboard.mk
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,6 @@ USB_MANUFACTURER = "Artisense"

IDF_TARGET = esp32s2

INTERNAL_FLASH_FILESYSTEM = 1
LONGINT_IMPL = MPZ

# The default queue depth of 16 overflows on release builds,
# so increase it to 32.
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32

CIRCUITPY_ESP_FLASH_MODE = dio
CIRCUITPY_ESP_FLASH_FREQ = 40m
CIRCUITPY_ESP_FLASH_SIZE = 4MB
7 changes: 0 additions & 7 deletions ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.mk
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,6 @@ USB_MANUFACTURER = "ATMegaZero"

IDF_TARGET = esp32s2

INTERNAL_FLASH_FILESYSTEM = 1
LONGINT_IMPL = MPZ

# The default queue depth of 16 overflows on release builds,
# so increase it to 32.
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32

CIRCUITPY_ESP_FLASH_MODE = qio
CIRCUITPY_ESP_FLASH_FREQ = 40m
CIRCUITPY_ESP_FLASH_SIZE = 16MB
2 changes: 0 additions & 2 deletions ports/espressif/boards/beetle-esp32-c3/mpconfigboard.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ CIRCUITPY_CREATION_ID = 0x00C30001

IDF_TARGET = esp32c3

INTERNAL_FLASH_FILESYSTEM = 1

CIRCUITPY_ESP_FLASH_MODE=qio
CIRCUITPY_ESP_FLASH_FREQ=80m
CIRCUITPY_ESP_FLASH_SIZE=4MB
7 changes: 0 additions & 7 deletions ports/espressif/boards/bpi_bit_s2/mpconfigboard.mk
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,6 @@ USB_MANUFACTURER = "BananaPi"

IDF_TARGET = esp32s2

INTERNAL_FLASH_FILESYSTEM = 1
LONGINT_IMPL = MPZ

# The default queue depth of 16 overflows on release builds,
# so increase it to 32.
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32

CIRCUITPY_ESP_FLASH_MODE=dio
CIRCUITPY_ESP_FLASH_FREQ=40m
CIRCUITPY_ESP_FLASH_SIZE=4MB
Expand Down
7 changes: 0 additions & 7 deletions ports/espressif/boards/bpi_leaf_s3/mpconfigboard.mk
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,6 @@ USB_MANUFACTURER = "BananaPi"

IDF_TARGET = esp32s3

INTERNAL_FLASH_FILESYSTEM = 1
LONGINT_IMPL = MPZ

# The default queue depth of 16 overflows on release builds,
# so increase it to 32.
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32

CIRCUITPY_ESP_FLASH_MODE=dio
CIRCUITPY_ESP_FLASH_FREQ=80m
CIRCUITPY_ESP_FLASH_SIZE=8MB
Expand Down
7 changes: 0 additions & 7 deletions ports/espressif/boards/crumpspace_crumps2/mpconfigboard.mk
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,6 @@ USB_MANUFACTURER = "CrumpSpace"

IDF_TARGET = esp32s2

INTERNAL_FLASH_FILESYSTEM = 1
LONGINT_IMPL = MPZ

# The default queue depth of 16 overflows on release builds,
# so increase it to 32.
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32

CIRCUITPY_ESP_FLASH_MODE = dio
CIRCUITPY_ESP_FLASH_FREQ = 40m
CIRCUITPY_ESP_FLASH_SIZE = 4MB
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,6 @@ USB_MANUFACTURER = "Cytron"

IDF_TARGET = esp32s3

INTERNAL_FLASH_FILESYSTEM = 1
LONGINT_IMPL = MPZ

# The default queue depth of 16 overflows on release builds,
# so increase it to 32.
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32

CIRCUITPY_ESP_FLASH_MODE = dio
CIRCUITPY_ESP_FLASH_FREQ = 80m
CIRCUITPY_ESP_FLASH_SIZE = 8MB
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,6 @@ USB_MANUFACTURER = "ElectronicCats"

IDF_TARGET = esp32s2

INTERNAL_FLASH_FILESYSTEM = 1
LONGINT_IMPL = MPZ

# The default queue depth of 16 overflows on release builds,
# so increase it to 32.
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32

CIRCUITPY_NEOPIXEL_WRITE = 0

CIRCUITPY_ESP_FLASH_MODE = dio
Expand Down
3 changes: 0 additions & 3 deletions ports/espressif/boards/espressif_esp32_eye/mpconfigboard.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ CIRCUITPY_CREATION_ID = 0x00320001

IDF_TARGET = esp32

INTERNAL_FLASH_FILESYSTEM = 1
LONGINT_IMPL = MPZ

CIRCUITPY_ESP_FLASH_MODE = dio
CIRCUITPY_ESP_FLASH_FREQ = 40m
CIRCUITPY_ESP_FLASH_SIZE = 4MB