Skip to content

Commit 202fac5

Browse files
dhalbertdhalbert
committed
ESP32 fixes for no PSRAM; some cleanup
1 parent d4e8c19 commit 202fac5

File tree

5 files changed

+62
-74
lines changed

5 files changed

+62
-74
lines changed

‎ports/espressif/boards/adafruit_feather_esp32_v2/sdkconfig

Lines changed: 28 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,32 @@ CONFIG_SPIRAM_TYPE_ESPPSRAM16=y
66
# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
77
# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
88
CONFIG_SPIRAM_SIZE=2097152
9-
# end of SPI RAM config
9+
CONFIG_SPIRAM_SPEED_40M=y
10+
CONFIG_SPIRAM=y
11+
CONFIG_SPIRAM_BOOT_INIT=y
12+
CONFIG_SPIRAM_IGNORE_NOTFOUND=y
13+
CONFIG_SPIRAM_USE_MEMMAP=y
14+
# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
15+
# CONFIG_SPIRAM_USE_MALLOC is not set
16+
CONFIG_SPIRAM_MEMTEST=y
17+
# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
18+
# CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY is not set
19+
CONFIG_SPIRAM_CACHE_WORKAROUND=y
1020

11-
# Uncomment to send log output to TX/RX pins on Feather ESP32V2
12-
#
13-
# ESP System Settings
14-
#
15-
# CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
16-
# # CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
17-
# CONFIG_ESP_CONSOLE_UART_CUSTOM=y
18-
# # CONFIG_ESP_CONSOLE_NONE is not set
19-
# CONFIG_ESP_CONSOLE_UART=y
20-
# nCONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y
21-
# # CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_1 is not set
22-
# CONFIG_ESP_CONSOLE_UART_NUM=0
23-
# CONFIG_ESP_CONSOLE_UART_TX_GPIO=8
24-
# CONFIG_ESP_CONSOLE_UART_RX_GPIO=7
25-
# CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
26-
# # CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5 is not set
27-
# # end of ESP System Settings
21+
# Uncomment (remove ###) to send ESP_LOG output to TX/RX pins
22+
### #
23+
### # ESP System Settings
24+
### #
25+
### CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
26+
### # CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
27+
### CONFIG_ESP_CONSOLE_UART_CUSTOM=y
28+
### # CONFIG_ESP_CONSOLE_NONE is not set
29+
### CONFIG_ESP_CONSOLE_UART=y
30+
### CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y
31+
### # CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_1 is not set
32+
### CONFIG_ESP_CONSOLE_UART_NUM=0
33+
### CONFIG_ESP_CONSOLE_UART_TX_GPIO=8
34+
### CONFIG_ESP_CONSOLE_UART_RX_GPIO=7
35+
### CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
36+
### # CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5 is not set
37+
### # end of ESP System Settings

‎ports/espressif/boards/adafruit_feather_huzzah32/sdkconfig

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
1-
### TEST
21
CONFIG_ESP32_ECO3_CACHE_LOCK_FIX=y
3-
42
CONFIG_ESP32_SPIRAM_SUPPORT=n
53

6-
# Uncomment to send log output to TX/RX pins
7-
#
8-
# ESP System Settings
9-
#
10-
CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
11-
# CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
12-
# CONFIG_ESP_CONSOLE_UART_CUSTOM=y
13-
# CONFIG_ESP_CONSOLE_NONE is not set
14-
CONFIG_ESP_CONSOLE_UART=y
15-
CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y
16-
# CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_1 is not set
17-
CONFIG_ESP_CONSOLE_UART_NUM=0
18-
CONFIG_ESP_CONSOLE_UART_TX_GPIO=17
19-
CONFIG_ESP_CONSOLE_UART_RX_GPIO=16
20-
CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
21-
# CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5 is not set
22-
# end of ESP System Settings
4+
# Uncomment (remove ###) to send ESP_LOG output to TX/RX pins
5+
### #
6+
### # ESP System Settings
7+
### #
8+
### CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
9+
### # CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
10+
### CONFIG_ESP_CONSOLE_UART_CUSTOM=y
11+
### CONFIG_ESP_CONSOLE_NONE is not set
12+
### CONFIG_ESP_CONSOLE_UART=y
13+
### CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y
14+
### # CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_1 is not set
15+
### CONFIG_ESP_CONSOLE_UART_NUM=0
16+
### CONFIG_ESP_CONSOLE_UART_TX_GPIO=17
17+
### CONFIG_ESP_CONSOLE_UART_RX_GPIO=16
18+
### CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
19+
### # CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5 is not set
20+
### # end of ESP System Settings

‎ports/espressif/boards/adafruit_qtpy_esp32_pico/sdkconfig

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
#
2-
# Partition Table
3-
#
4-
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="esp-idf-config/partitions-8MB-no-uf2.csv"
5-
CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-8MB-no-uf2.csv"
6-
# end of Partition Table
7-
81
#
92
# SPI RAM config
103
#
@@ -33,7 +26,7 @@ CONFIG_ESP32_SPIRAM_SUPPORT=y
3326
# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
3427
# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
3528

36-
### # Uncomment to send log output to TX/RX pins on Feather ESP32V2
29+
### # Uncomment (remove ###) to send ESP_LOG output to TX/RX pins
3730
### #
3831
### # ESP System Settings
3932
### #
@@ -45,7 +38,7 @@ CONFIG_ESP32_SPIRAM_SUPPORT=y
4538
### CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y
4639
### # CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_1 is not set
4740
### CONFIG_ESP_CONSOLE_UART_NUM=0
48-
### CONFIG_ESP_CONSOLE_UART_TX_GPIO=8
41+
### CONFIG_ESP_CONSOLE_UART_TX_GPIO=32
4942
### CONFIG_ESP_CONSOLE_UART_RX_GPIO=7
5043
### CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
5144
### # CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5 is not set

‎ports/espressif/boards/hardkernel_odroid_go/sdkconfig

Lines changed: 10 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
1-
#
2-
# Partition Table
3-
#
4-
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="esp-idf-config/partitions-16MB-no-uf2.csv"
5-
CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-16MB-no-uf2.csv"
6-
# end of Partition Table
7-
8-
CONFIG_ESP_INT_WDT_TIMEOUT_MS=3000
9-
10-
#
1+
CONFIG_ESP32_SPIRAM_SUPPORT=y
112
# SPI RAM config
123
#
134
# CONFIG_SPIRAM_TYPE_AUTO is not set
@@ -27,28 +18,20 @@ CONFIG_SPIRAM_MEMTEST=y
2718
# CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY is not set
2819
CONFIG_SPIRAM_CACHE_WORKAROUND=y
2920

30-
#
31-
# SPI RAM config
32-
#
33-
CONFIG_ESP32_SPIRAM_SUPPORT=y
34-
# CONFIG_SPIRAM_TYPE_AUTO is not set
35-
# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
36-
# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
37-
38-
### # Uncomment to send log output to TX/RX pins on Feather ESP32V2
21+
# Uncomment (remove ###) to send ESP_LOG output to TX/RX pins
3922
### #
4023
### # ESP System Settings
4124
### #
42-
CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
25+
### CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
4326
### # CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
44-
CONFIG_ESP_CONSOLE_UART_CUSTOM=y
27+
### CONFIG_ESP_CONSOLE_UART_CUSTOM=y
4528
### # CONFIG_ESP_CONSOLE_NONE is not set
46-
CONFIG_ESP_CONSOLE_UART=y
47-
CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y
29+
### CONFIG_ESP_CONSOLE_UART=y
30+
### nCONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y
4831
### # CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_1 is not set
49-
CONFIG_ESP_CONSOLE_UART_NUM=0
50-
CONFIG_ESP_CONSOLE_UART_TX_GPIO=12
51-
CONFIG_ESP_CONSOLE_UART_RX_GPIO=15
52-
CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
32+
### CONFIG_ESP_CONSOLE_UART_NUM=0
33+
### CONFIG_ESP_CONSOLE_UART_TX_GPIO=12
34+
### CONFIG_ESP_CONSOLE_UART_RX_GPIO=15
35+
### CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
5336
### # CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5 is not set
5437
### # end of ESP System Settings

‎ports/espressif/supervisor/port.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ void sleep_timer_cb(void *arg);
160160
#define PSRAM_HSPI_SPIWP_SD3_IO 2
161161
#define PSRAM_HSPI_SPIHD_SD2_IO 4
162162

163+
#ifdef CONFIG_SPIRAM
163164
// PSRAM clock and cs IO should be configured based on hardware design.
164165
// For ESP32-WROVER or ESP32-WROVER-B module, the clock IO is IO17, the cs IO is IO16,
165166
// they are the default value for these two configs.
@@ -180,9 +181,11 @@ void sleep_timer_cb(void *arg);
180181

181182
#define PICO_V3_02_PSRAM_CLK_IO 10
182183
#define PICO_V3_02_PSRAM_CS_IO 9
184+
#endif // CONFIG_SPIRAM
183185

184186
static void _never_reset_spi_ram_flash(void) {
185187
#if defined(CONFIG_IDF_TARGET_ESP32)
188+
#if defined(CONFIG_SPIRAM)
186189
uint32_t pkg_ver = esp_efuse_get_pkg_ver();
187190
if (pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32D2WDQ5) {
188191
never_reset_pin_number(D2WD_PSRAM_CLK_IO);
@@ -202,6 +205,7 @@ static void _never_reset_spi_ram_flash(void) {
202205
never_reset_pin_number(D0WDR2_V3_PSRAM_CLK_IO);
203206
never_reset_pin_number(D0WDR2_V3_PSRAM_CS_IO);
204207
}
208+
#endif // CONFIG_SPIRAM
205209

206210
const uint32_t spiconfig = esp_rom_efuse_get_flash_gpio_info();
207211
if (spiconfig == ESP_ROM_EFUSE_FLASH_DEFAULT_SPI) {
@@ -226,7 +230,7 @@ static void _never_reset_spi_ram_flash(void) {
226230
never_reset_pin_number(EFUSE_SPICONFIG_RET_SPIHD(spiconfig));
227231
never_reset_pin_number(bootloader_flash_get_wp_pin());
228232
}
229-
#endif
233+
#endif // CONFIG_IDF_TARGET_ESP32
230234
}
231235

232236
safe_mode_t port_init(void) {

0 commit comments

Comments
 (0)