Skip to content

Commit f8e2855

Browse files
committed
Undoing bad ideas. L2 cache can't be in PSRAM I guess
1 parent ec34dfa commit f8e2855

File tree

12 files changed

+18
-12
lines changed

12 files changed

+18
-12
lines changed

esp32p4/bin/bootloader_qio_80m.elf

0 Bytes
Binary file not shown.

esp32p4/ld/memory.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ MEMORY
5757
* Enabling Bluetooth & Trace Memory features in menuconfig will decrease the amount of RAM available.
5858
*/
5959
sram_low (RWX) : org = 0x4FF00000, len = 0x4FF2CBD0 - 0x4FF00000
60-
sram_high (RW) : org = 0x4FF40000, len = 0x80000 - 0x80000
60+
sram_high (RW) : org = 0x4FF40000, len = 0x80000 - 0x20000
6161
/* Flash mapped constant data */
6262
drom_seg (R) : org = 0x40000020, len = (0x10000 << 10) - 0x20
6363
/* (See irom_seg for meaning of 0x20 offset in the above.) */

esp32p4/lib/libdriver.a

19.5 KB
Binary file not shown.

esp32p4/lib/libesp_app_format.a

0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

esp32p4/lib/libesp_psram.a

3.47 KB
Binary file not shown.

esp32p4/lib/libfatfs.a

148 Bytes
Binary file not shown.

esp32p4/lib/libfreertos.a

2.91 KB
Binary file not shown.

esp32p4/lib/libheap.a

0 Bytes
Binary file not shown.

esp32p4/lib/libspi_flash.a

0 Bytes
Binary file not shown.

esp32p4/qio_qspi/include/sdkconfig.h

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -637,12 +637,14 @@
637637
#define CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY 1
638638
#define CONFIG_SPIRAM_BOOT_INIT 1
639639
#define CONFIG_SPIRAM_IGNORE_NOTFOUND 1
640-
#define CONFIG_SPIRAM_USE_MEMMAP 1
640+
#define CONFIG_SPIRAM_USE_MALLOC 1
641641
#define CONFIG_SPIRAM_MEMTEST 1
642+
#define CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL 16384
643+
#define CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL 32768
642644
#define CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_360 1
643645
#define CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ 360
644-
#define CONFIG_CACHE_L2_CACHE_512KB 1
645-
#define CONFIG_CACHE_L2_CACHE_SIZE 0x80000
646+
#define CONFIG_CACHE_L2_CACHE_128KB 1
647+
#define CONFIG_CACHE_L2_CACHE_SIZE 0x20000
646648
#define CONFIG_CACHE_L2_CACHE_LINE_128B 1
647649
#define CONFIG_CACHE_L2_CACHE_LINE_SIZE 128
648650
#define CONFIG_CACHE_L1_CACHE_LINE_SIZE 64
@@ -723,6 +725,7 @@
723725
#define CONFIG_FATFS_FS_LOCK 0
724726
#define CONFIG_FATFS_TIMEOUT_MS 10000
725727
#define CONFIG_FATFS_PER_FILE_CACHE 1
728+
#define CONFIG_FATFS_ALLOC_PREFER_EXTRAM 1
726729
#define CONFIG_FATFS_VFS_FSTAT_BLKSIZE 0
727730
#define CONFIG_FATFS_USE_LABEL 1
728731
#define CONFIG_FATFS_LINK_LOCK 1

esp32p4/sdkconfig

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1235,10 +1235,13 @@ CONFIG_SPIRAM_SPEED=20
12351235
CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y
12361236
CONFIG_SPIRAM_BOOT_INIT=y
12371237
CONFIG_SPIRAM_IGNORE_NOTFOUND=y
1238-
CONFIG_SPIRAM_USE_MEMMAP=y
1238+
# CONFIG_SPIRAM_USE_MEMMAP is not set
12391239
# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
1240-
# CONFIG_SPIRAM_USE_MALLOC is not set
1240+
CONFIG_SPIRAM_USE_MALLOC=y
12411241
CONFIG_SPIRAM_MEMTEST=y
1242+
CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=16384
1243+
# CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP is not set
1244+
CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=32768
12421245
# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
12431246
# CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY is not set
12441247
# end of PSRAM config
@@ -1259,10 +1262,11 @@ CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=360
12591262
#
12601263
# Cache config
12611264
#
1262-
# CONFIG_CACHE_L2_CACHE_128KB is not set
1265+
CONFIG_CACHE_L2_CACHE_128KB=y
12631266
# CONFIG_CACHE_L2_CACHE_256KB is not set
1264-
CONFIG_CACHE_L2_CACHE_512KB=y
1265-
CONFIG_CACHE_L2_CACHE_SIZE=0x80000
1267+
# CONFIG_CACHE_L2_CACHE_512KB is not set
1268+
CONFIG_CACHE_L2_CACHE_SIZE=0x20000
1269+
# CONFIG_CACHE_L2_CACHE_LINE_64B is not set
12661270
CONFIG_CACHE_L2_CACHE_LINE_128B=y
12671271
CONFIG_CACHE_L2_CACHE_LINE_SIZE=128
12681272
CONFIG_CACHE_L1_CACHE_LINE_SIZE=64
@@ -1365,7 +1369,6 @@ CONFIG_ESP_TIMER_IMPL_SYSTIMER=y
13651369
CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=16
13661370
CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=64
13671371
CONFIG_ESP_WIFI_STATIC_TX_BUFFER=y
1368-
# CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER is not set
13691372
CONFIG_ESP_WIFI_TX_BUFFER_TYPE=0
13701373
CONFIG_ESP_WIFI_STATIC_TX_BUFFER_NUM=16
13711374
CONFIG_ESP_WIFI_CACHE_TX_BUFFER_NUM=32
@@ -1453,6 +1456,7 @@ CONFIG_FATFS_API_ENCODING_UTF_8=y
14531456
CONFIG_FATFS_FS_LOCK=0
14541457
CONFIG_FATFS_TIMEOUT_MS=10000
14551458
CONFIG_FATFS_PER_FILE_CACHE=y
1459+
CONFIG_FATFS_ALLOC_PREFER_EXTRAM=y
14561460
# CONFIG_FATFS_USE_FASTSEEK is not set
14571461
CONFIG_FATFS_VFS_FSTAT_BLKSIZE=0
14581462
# CONFIG_FATFS_IMMEDIATE_FSYNC is not set
@@ -1766,6 +1770,7 @@ CONFIG_LWIP_HOOK_IP6_INPUT_CUSTOM=y
17661770
# mbedTLS
17671771
#
17681772
CONFIG_MBEDTLS_INTERNAL_MEM_ALLOC=y
1773+
# CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC is not set
17691774
# CONFIG_MBEDTLS_DEFAULT_MEM_ALLOC is not set
17701775
# CONFIG_MBEDTLS_CUSTOM_MEM_ALLOC is not set
17711776
CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384
@@ -2482,7 +2487,6 @@ CONFIG_TIMER_TASK_STACK_SIZE=4096
24822487
CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=16
24832488
CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=64
24842489
CONFIG_ESP32_WIFI_STATIC_TX_BUFFER=y
2485-
# CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER is not set
24862490
CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=0
24872491
CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=16
24882492
CONFIG_ESP32_WIFI_CACHE_TX_BUFFER_NUM=32
@@ -2564,7 +2568,6 @@ CONFIG_SEMIHOSTFS_MAX_MOUNT_POINTS=1
25642568
CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=16
25652569
CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=64
25662570
CONFIG_ESP32_WIFI_STATIC_TX_BUFFER=y
2567-
# CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER is not set
25682571
CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=0
25692572
CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=16
25702573
CONFIG_ESP32_WIFI_CACHE_TX_BUFFER_NUM=32

0 commit comments

Comments
 (0)