Skip to content

Commit 952118f

Browse files
tannewttannewt
committed
Update new boards. Reduce memory use in S2
1 parent a3d3712 commit 952118f

File tree

28 files changed

+191
-306
lines changed

28 files changed

+191
-306
lines changed

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@
342342
url = https://github.com/bablokb/circuitpython-pcf85063a
343343
[submodule "frozen/Adafruit_CircuitPython_Wave"]
344344
path = frozen/Adafruit_CircuitPython_Wave
345-
url = http://github.com/adafruit/Adafruit_CircuitPython_Wave.git
345+
url = https://github.com/adafruit/Adafruit_CircuitPython_Wave.git
346346
[submodule "ports/raspberrypi/lib/Pico-PIO-USB"]
347347
path = ports/raspberrypi/lib/Pico-PIO-USB
348348
url = https://github.com/sekigon-gonnoc/Pico-PIO-USB.git

‎ports/espressif/boards/adafruit_esp32s3_camera/mpconfigboard.mk‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ USB_MANUFACTURER = "Adafruit"
55

66
IDF_TARGET = esp32s3
77

8+
CIRCUITPY_ESP_FLASH_SIZE = 4MB
89
CIRCUITPY_ESP_FLASH_MODE = dio
910
CIRCUITPY_ESP_FLASH_FREQ = 80m
10-
CIRCUITPY_ESP_FLASH_SIZE = 4MB
11+
1112
CIRCUITPY_ESP_PSRAM_SIZE = 2MB
1213
CIRCUITPY_ESP_PSRAM_MODE = qio
1314
CIRCUITPY_ESP_PSRAM_FREQ = 80m

‎ports/espressif/boards/adafruit_qualia_s3_rgb666/mpconfigboard.mk‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,12 @@ USB_MANUFACTURER = "Adafruit"
55

66
IDF_TARGET = esp32s3
77

8+
CIRCUITPY_ESP_FLASH_SIZE = 16MB
89
CIRCUITPY_ESP_FLASH_MODE = dio
910
CIRCUITPY_ESP_FLASH_FREQ = 80m
10-
CIRCUITPY_ESP_FLASH_SIZE = 16MB
11+
12+
CIRCUITPY_ESP_PSRAM_SIZE = 8MB
13+
CIRCUITPY_ESP_PSRAM_MODE = opi
14+
CIRCUITPY_ESP_PSRAM_FREQ = 80m
1115

1216
CIRCUITPY_DOTCLOCKFRAMEBUFFER = 1

‎ports/espressif/boards/adafruit_qualia_s3_rgb666/sdkconfig‎

Lines changed: 18 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,29 @@
1-
CONFIG_ESP32S3_SPIRAM_SUPPORT=y
21
#
3-
# SPI RAM config
2+
# Espressif IoT Development Framework Configuration
43
#
5-
# CONFIG_SPIRAM_MODE_QUAD is not set
6-
CONFIG_SPIRAM_MODE_OCT=y
7-
CONFIG_SPIRAM_TYPE_AUTO=y
8-
# end of SPI RAM config
9-
10-
CONFIG_DEFAULT_PSRAM_CLK_IO=30
114
#
12-
# PSRAM Clock and CS IO for ESP32S3
5+
# Component config
136
#
14-
CONFIG_DEFAULT_PSRAM_CS_IO=26
15-
# end of PSRAM Clock and CS IO for ESP32S3
167

17-
# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
18-
# CONFIG_SPIRAM_RODATA is not set
19-
CONFIG_SPIRAM_SPEED_80M=y
20-
# CONFIG_SPIRAM_SPEED_40M is not set
21-
CONFIG_SPIRAM=y
22-
CONFIG_SPIRAM_BOOT_INIT=y
23-
# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
24-
CONFIG_SPIRAM_USE_MEMMAP=y
25-
# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
26-
# CONFIG_SPIRAM_USE_MALLOC is not set
27-
CONFIG_SPIRAM_MEMTEST=y
28-
#
29-
# LWIP
308
#
31-
CONFIG_LWIP_LOCAL_HOSTNAME="qualia"
32-
# end of LWIP
9+
# ESP System Settings
3310
#
11+
CONFIG_ESP_CONSOLE_UART_CUSTOM=y
3412
# CONFIG_ESP_CONSOLE_NONE is not set
35-
CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
13+
CONFIG_ESP_CONSOLE_UART=y
3614
CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y
37-
CONFIG_ESP_CONSOLE_UART_CUSTOM=y
3815
CONFIG_ESP_CONSOLE_UART_NUM=0
39-
CONFIG_ESP_CONSOLE_UART_RX_GPIO=44
4016
CONFIG_ESP_CONSOLE_UART_TX_GPIO=43
41-
CONFIG_ESP_CONSOLE_UART=y
17+
CONFIG_ESP_CONSOLE_UART_RX_GPIO=44
18+
CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
19+
# end of ESP System Settings
20+
21+
#
22+
# LWIP
23+
#
24+
CONFIG_LWIP_LOCAL_HOSTNAME="qualia"
25+
# end of LWIP
26+
27+
# end of Component config
28+
29+
# end of Espressif IoT Development Framework Configuration

‎ports/espressif/boards/arduino_nano_esp32s3/mpconfigboard.mk‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,17 @@ USB_MANUFACTURER = "Arduino"
66

77
IDF_TARGET = esp32s3
88

9+
# This has a u-blox® NORA-W106-10B module.
10+
11+
# This flash lives outside the module.
912
CIRCUITPY_ESP_FLASH_MODE = dio
1013
CIRCUITPY_ESP_FLASH_FREQ = 80m
11-
CIRCUITPY_ESP_FLASH_SIZE = 8MB
14+
CIRCUITPY_ESP_FLASH_SIZE = 16MB
15+
16+
# This PSRAM is in the module.
17+
CIRCUITPY_ESP_PSRAM_SIZE = 8MB
18+
CIRCUITPY_ESP_PSRAM_MODE = opi
19+
CIRCUITPY_ESP_PSRAM_FREQ = 80m
1220

1321
INTERNAL_FLASH_FILESYSTEM = 0
1422
QSPI_FLASH_FILESYSTEM = 1

‎ports/espressif/boards/arduino_nano_esp32s3/sdkconfig‎

Lines changed: 6 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,15 @@
11
#
2-
# Component config
3-
#
4-
#
5-
# ESP32S3-Specific
6-
#
7-
CONFIG_ESP32S3_SPIRAM_SUPPORT=y
8-
9-
#
10-
# SPI RAM config
2+
# Espressif IoT Development Framework Configuration
113
#
12-
# CONFIG_SPIRAM_MODE_QUAD is not set
13-
CONFIG_SPIRAM_MODE_OCT=y
14-
# CONFIG_SPIRAM_TYPE_AUTO is not set
15-
CONFIG_SPIRAM_TYPE_ESPPSRAM64=y
16-
CONFIG_SPIRAM_SIZE=8388608
174
#
18-
# PSRAM Clock and CS IO for ESP32S3
5+
# Component config
196
#
20-
CONFIG_DEFAULT_PSRAM_CLK_IO=30
21-
CONFIG_DEFAULT_PSRAM_CS_IO=26
22-
# end of PSRAM Clock and CS IO for ESP32S3
23-
24-
# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
25-
# CONFIG_SPIRAM_RODATA is not set
26-
CONFIG_SPIRAM_SPEED_80M=y
27-
# CONFIG_SPIRAM_SPEED_40M is not set
28-
CONFIG_SPIRAM=y
29-
CONFIG_SPIRAM_BOOT_INIT=y
30-
# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
31-
CONFIG_SPIRAM_USE_MEMMAP=y
32-
# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
33-
# CONFIG_SPIRAM_USE_MALLOC is not set
34-
CONFIG_SPIRAM_MEMTEST=y
35-
# end of SPI RAM config
36-
37-
# end of ESP32S3-Specific
38-
397
#
408
# LWIP
419
#
4210
CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3"
4311
# end of LWIP
12+
13+
# end of Component config
14+
15+
# end of Espressif IoT Development Framework Configuration

‎ports/espressif/boards/arduino_nano_esp32s3_inverted_statusled/mpconfigboard.mk‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,17 @@ USB_MANUFACTURER = "Arduino"
66

77
IDF_TARGET = esp32s3
88

9+
# This has a u-blox® NORA-W106-10B module.
10+
11+
# This flash lives outside the module.
912
CIRCUITPY_ESP_FLASH_MODE = dio
1013
CIRCUITPY_ESP_FLASH_FREQ = 80m
11-
CIRCUITPY_ESP_FLASH_SIZE = 8MB
14+
CIRCUITPY_ESP_FLASH_SIZE = 16MB
15+
16+
# This PSRAM is in the module.
17+
CIRCUITPY_ESP_PSRAM_SIZE = 8MB
18+
CIRCUITPY_ESP_PSRAM_MODE = opi
19+
CIRCUITPY_ESP_PSRAM_FREQ = 80m
1220

1321
INTERNAL_FLASH_FILESYSTEM = 0
1422
QSPI_FLASH_FILESYSTEM = 1

‎ports/espressif/boards/arduino_nano_esp32s3_inverted_statusled/sdkconfig‎

Lines changed: 6 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,15 @@
11
#
2-
# Component config
3-
#
4-
#
5-
# ESP32S3-Specific
6-
#
7-
CONFIG_ESP32S3_SPIRAM_SUPPORT=y
8-
9-
#
10-
# SPI RAM config
2+
# Espressif IoT Development Framework Configuration
113
#
12-
# CONFIG_SPIRAM_MODE_QUAD is not set
13-
CONFIG_SPIRAM_MODE_OCT=y
14-
# CONFIG_SPIRAM_TYPE_AUTO is not set
15-
CONFIG_SPIRAM_TYPE_ESPPSRAM64=y
16-
CONFIG_SPIRAM_SIZE=8388608
174
#
18-
# PSRAM Clock and CS IO for ESP32S3
5+
# Component config
196
#
20-
CONFIG_DEFAULT_PSRAM_CLK_IO=30
21-
CONFIG_DEFAULT_PSRAM_CS_IO=26
22-
# end of PSRAM Clock and CS IO for ESP32S3
23-
24-
# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
25-
# CONFIG_SPIRAM_RODATA is not set
26-
CONFIG_SPIRAM_SPEED_80M=y
27-
# CONFIG_SPIRAM_SPEED_40M is not set
28-
CONFIG_SPIRAM=y
29-
CONFIG_SPIRAM_BOOT_INIT=y
30-
# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
31-
CONFIG_SPIRAM_USE_MEMMAP=y
32-
# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
33-
# CONFIG_SPIRAM_USE_MALLOC is not set
34-
CONFIG_SPIRAM_MEMTEST=y
35-
# end of SPI RAM config
36-
37-
# end of ESP32S3-Specific
38-
397
#
408
# LWIP
419
#
4210
CONFIG_LWIP_LOCAL_HOSTNAME="nano-esp32"
4311
# end of LWIP
12+
13+
# end of Component config
14+
15+
# end of Espressif IoT Development Framework Configuration

‎ports/espressif/boards/espressif_esp32_eye/sdkconfig‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,6 @@
44
#
55
# Component config
66
#
7-
#
8-
# Hardware Settings
9-
#
10-
#
11-
# Sleep Config
12-
#
13-
CONFIG_ESP_SLEEP_PSRAM_LEAKAGE_WORKAROUND=y
14-
# end of Sleep Config
15-
16-
# end of Hardware Settings
17-
187
#
198
# Camera configuration
209
#

‎ports/espressif/boards/espressif_esp32s2_devkitc_1_n4r2/mpconfigboard.mk‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ USB_MANUFACTURER = "Espressif"
55

66
IDF_TARGET = esp32s2
77

8-
CIRCUITPY_ESP_FLASH_MODE = dio
9-
CIRCUITPY_ESP_FLASH_FREQ = 40m
108
CIRCUITPY_ESP_FLASH_SIZE = 4MB
9+
CIRCUITPY_ESP_FLASH_MODE = qio
10+
CIRCUITPY_ESP_FLASH_FREQ = 80m
1111

1212
CIRCUITPY_ESP_PSRAM_SIZE = 2MB
1313
CIRCUITPY_ESP_PSRAM_MODE = qio
14-
CIRCUITPY_ESP_PSRAM_FREQ = 40m
14+
CIRCUITPY_ESP_PSRAM_FREQ = 80m

0 commit comments

Comments
 (0)