From 6f984c452bd3ce1718e2446bcd50b65154937708 Mon Sep 17 00:00:00 2001 From: schneider <schneider@blinkenlichts.net> Date: Fri, 4 Aug 2023 00:44:40 +0200 Subject: [PATCH] Revert "recovery: disable external RAM" This reverts commit 4f0a4b80b4137e1a192111fd330eb819d45c8764. --- components/st3m/st3m_gfx.h | 6 ------ recovery/sdkconfig.defaults | 7 +++++++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/components/st3m/st3m_gfx.h b/components/st3m/st3m_gfx.h index 23eb69c25d..398d01f3f3 100644 --- a/components/st3m/st3m_gfx.h +++ b/components/st3m/st3m_gfx.h @@ -9,13 +9,7 @@ // Each buffer takes ~116kB SPIRAM. While one framebuffer is being blitted, the // other one is being written to by the rasterizer. -#if defined(CONFIG_FLOW3R_CTX_FLAVOUR_FULL) #define ST3M_GFX_NBUFFERS 2 -#else -// Reduce frame buffer count for the bootloader so they fit inside internal RAM -#define ST3M_GFX_NBUFFERS 1 -#endif - // More ctx drawlists than buffers so that micropython doesn't get starved when // pipeline runs in lockstep. #define ST3M_GFX_NCTX 2 diff --git a/recovery/sdkconfig.defaults b/recovery/sdkconfig.defaults index 3f4555a544..836679a291 100644 --- a/recovery/sdkconfig.defaults +++ b/recovery/sdkconfig.defaults @@ -8,6 +8,13 @@ CONFIG_PARTITION_TABLE_CUSTOM=y CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv" CONFIG_COMPILER_OPTIMIZATION_PERF=y CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y +CONFIG_SPIRAM=y +CONFIG_SPIRAM_MODE_OCT=y +CONFIG_SPIRAM_TYPE_ESPPSRAM64=y +CONFIG_SPIRAM_SPEED_80M=y +CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y +CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=65536 +CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y CONFIG_ESP32S3_INSTRUCTION_CACHE_32KB=y CONFIG_ESP32S3_DATA_CACHE_64KB=y -- GitLab