Undoing bad ideas. L2 cache can't be in PSRAM I guess

Author: troyhacks

esp32p4/bin/bootloader_qio_80m.elf

@@ -57,7 +57,7 @@ MEMORY
    * Enabling Bluetooth & Trace Memory features in menuconfig will decrease the amount of RAM available.
    */
   sram_low (RWX) : org = 0x4FF00000, len = 0x4FF2CBD0 - 0x4FF00000
-  sram_high (RW) : org = 0x4FF40000, len = 0x80000 - 0x80000
+  sram_high (RW) : org = 0x4FF40000, len = 0x80000 - 0x20000
   /* Flash mapped constant data */
   drom_seg (R) : org = 0x40000020, len = (0x10000 << 10) - 0x20
   /* (See irom_seg for meaning of 0x20 offset in the above.) */

esp32p4/ld/memory.ld

@@ -637,12 +637,14 @@
 #define CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY 1
 #define CONFIG_SPIRAM_BOOT_INIT 1
 #define CONFIG_SPIRAM_IGNORE_NOTFOUND 1
-#define CONFIG_SPIRAM_USE_MEMMAP 1
+#define CONFIG_SPIRAM_USE_MALLOC 1
 #define CONFIG_SPIRAM_MEMTEST 1
+#define CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL 16384
+#define CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL 32768
 #define CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_360 1
 #define CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ 360
-#define CONFIG_CACHE_L2_CACHE_512KB 1
-#define CONFIG_CACHE_L2_CACHE_SIZE 0x80000
+#define CONFIG_CACHE_L2_CACHE_128KB 1
+#define CONFIG_CACHE_L2_CACHE_SIZE 0x20000
 #define CONFIG_CACHE_L2_CACHE_LINE_128B 1
 #define CONFIG_CACHE_L2_CACHE_LINE_SIZE 128
 #define CONFIG_CACHE_L1_CACHE_LINE_SIZE 64
@@ -723,6 +725,7 @@
 #define CONFIG_FATFS_FS_LOCK 0
 #define CONFIG_FATFS_TIMEOUT_MS 10000
 #define CONFIG_FATFS_PER_FILE_CACHE 1
+#define CONFIG_FATFS_ALLOC_PREFER_EXTRAM 1
 #define CONFIG_FATFS_VFS_FSTAT_BLKSIZE 0
 #define CONFIG_FATFS_USE_LABEL 1
 #define CONFIG_FATFS_LINK_LOCK 1

esp32p4/lib/libdriver.a

@@ -1235,10 +1235,13 @@ CONFIG_SPIRAM_SPEED=20
 CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y
 CONFIG_SPIRAM_BOOT_INIT=y
 CONFIG_SPIRAM_IGNORE_NOTFOUND=y
-CONFIG_SPIRAM_USE_MEMMAP=y
+# CONFIG_SPIRAM_USE_MEMMAP is not set
 # CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
-# CONFIG_SPIRAM_USE_MALLOC is not set
+CONFIG_SPIRAM_USE_MALLOC=y
 CONFIG_SPIRAM_MEMTEST=y
+CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=16384
+# CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP is not set
+CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=32768
 # CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
 # CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY is not set
 # end of PSRAM config
@@ -1259,10 +1262,11 @@ CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=360
 #
 # Cache config
 #
-# CONFIG_CACHE_L2_CACHE_128KB is not set
+CONFIG_CACHE_L2_CACHE_128KB=y
 # CONFIG_CACHE_L2_CACHE_256KB is not set
-CONFIG_CACHE_L2_CACHE_512KB=y
-CONFIG_CACHE_L2_CACHE_SIZE=0x80000
+# CONFIG_CACHE_L2_CACHE_512KB is not set
+CONFIG_CACHE_L2_CACHE_SIZE=0x20000
+# CONFIG_CACHE_L2_CACHE_LINE_64B is not set
 CONFIG_CACHE_L2_CACHE_LINE_128B=y
 CONFIG_CACHE_L2_CACHE_LINE_SIZE=128
 CONFIG_CACHE_L1_CACHE_LINE_SIZE=64
@@ -1365,7 +1369,6 @@ CONFIG_ESP_TIMER_IMPL_SYSTIMER=y
 CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=16
 CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=64
 CONFIG_ESP_WIFI_STATIC_TX_BUFFER=y
-# CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER is not set
 CONFIG_ESP_WIFI_TX_BUFFER_TYPE=0
 CONFIG_ESP_WIFI_STATIC_TX_BUFFER_NUM=16
 CONFIG_ESP_WIFI_CACHE_TX_BUFFER_NUM=32
@@ -1453,6 +1456,7 @@ CONFIG_FATFS_API_ENCODING_UTF_8=y
 CONFIG_FATFS_FS_LOCK=0
 CONFIG_FATFS_TIMEOUT_MS=10000
 CONFIG_FATFS_PER_FILE_CACHE=y
+CONFIG_FATFS_ALLOC_PREFER_EXTRAM=y
 # CONFIG_FATFS_USE_FASTSEEK is not set
 CONFIG_FATFS_VFS_FSTAT_BLKSIZE=0
 # CONFIG_FATFS_IMMEDIATE_FSYNC is not set
@@ -1766,6 +1770,7 @@ CONFIG_LWIP_HOOK_IP6_INPUT_CUSTOM=y
 # mbedTLS
 #
 CONFIG_MBEDTLS_INTERNAL_MEM_ALLOC=y
+# CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC is not set
 # CONFIG_MBEDTLS_DEFAULT_MEM_ALLOC is not set
 # CONFIG_MBEDTLS_CUSTOM_MEM_ALLOC is not set
 CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384
@@ -2482,7 +2487,6 @@ CONFIG_TIMER_TASK_STACK_SIZE=4096
 CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=16
 CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=64
 CONFIG_ESP32_WIFI_STATIC_TX_BUFFER=y
-# CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER is not set
 CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=0
 CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=16
 CONFIG_ESP32_WIFI_CACHE_TX_BUFFER_NUM=32
@@ -2564,7 +2568,6 @@ CONFIG_SEMIHOSTFS_MAX_MOUNT_POINTS=1
 CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=16
 CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=64
 CONFIG_ESP32_WIFI_STATIC_TX_BUFFER=y
-# CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER is not set
 CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=0
 CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=16
 CONFIG_ESP32_WIFI_CACHE_TX_BUFFER_NUM=32