From 2314afd99d2c3f9fc00b4fe7341bb1f25f72cdaa Mon Sep 17 00:00:00 2001 From: iabdalkader Date: Mon, 8 Mar 2021 22:43:38 +0200 Subject: [PATCH] Move stack to DTCM/ITCM on QSPI boards. --- src/omv/boards/BORMIO/omv_boardconfig.h | 7 +++---- src/omv/boards/OPENMV4P/omv_boardconfig.h | 1 - src/omv/boards/OPENMVPT/omv_boardconfig.h | 1 - src/omv/boards/PORTENTA/omv_boardconfig.h | 7 +++---- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/omv/boards/BORMIO/omv_boardconfig.h b/src/omv/boards/BORMIO/omv_boardconfig.h index 1522ff572..5f0a79ae0 100644 --- a/src/omv/boards/BORMIO/omv_boardconfig.h +++ b/src/omv/boards/BORMIO/omv_boardconfig.h @@ -127,9 +127,8 @@ // Linker script constants (see the linker script template stm32fxxx.ld.S). // Note: fb_alloc is a stack-based, dynamically allocated memory on FB. // The maximum available fb_alloc memory = FB_ALLOC_SIZE + FB_SIZE - (w*h*bpp). -#define OMV_FFS_MEMORY DTCM // Flash filesystem cache memory #define OMV_MAIN_MEMORY SRAM1 // data, bss and heap -#define OMV_STACK_MEMORY SRAM1 // stack memory +#define OMV_STACK_MEMORY DTCM // stack memory #define OMV_DMA_MEMORY SRAM2 // DMA buffers memory. #define OMV_FB_MEMORY AXI_SRAM // Framebuffer, fb_alloc #define OMV_JPEG_MEMORY SRAM3 // JPEG buffer memory buffer. @@ -139,8 +138,8 @@ #define OMV_FB_SIZE (400K) // FB memory: header + VGA/GS image #define OMV_FB_ALLOC_SIZE (108K) // minimum fb alloc size -#define OMV_STACK_SIZE (32K) -#define OMV_HEAP_SIZE (172K) +#define OMV_STACK_SIZE (64K) +#define OMV_HEAP_SIZE (200K) #define OMV_LINE_BUF_SIZE (3 * 1024) // Image line buffer round(640 * 2BPP * 2 buffers). #define OMV_MSC_BUF_SIZE (2K) // USB MSC bot data diff --git a/src/omv/boards/OPENMV4P/omv_boardconfig.h b/src/omv/boards/OPENMV4P/omv_boardconfig.h index b3ee6703e..5c69e88d0 100644 --- a/src/omv/boards/OPENMV4P/omv_boardconfig.h +++ b/src/omv/boards/OPENMV4P/omv_boardconfig.h @@ -139,7 +139,6 @@ // Linker script constants (see the linker script template stm32fxxx.ld.S). // Note: fb_alloc is a stack-based, dynamically allocated memory on FB. // The maximum available fb_alloc memory = FB_ALLOC_SIZE + FB_SIZE - (w*h*bpp). -#define OMV_FFS_MEMORY DTCM // Flash filesystem cache memory #define OMV_MAIN_MEMORY SRAM1 // data, bss and heap #define OMV_STACK_MEMORY ITCM // stack memory #define OMV_DMA_MEMORY SRAM3 // Misc DMA buffers memory. diff --git a/src/omv/boards/OPENMVPT/omv_boardconfig.h b/src/omv/boards/OPENMVPT/omv_boardconfig.h index 824e0237a..43064ca97 100644 --- a/src/omv/boards/OPENMVPT/omv_boardconfig.h +++ b/src/omv/boards/OPENMVPT/omv_boardconfig.h @@ -136,7 +136,6 @@ // Linker script constants (see the linker script template stm32fxxx.ld.S). // Note: fb_alloc is a stack-based, dynamically allocated memory on FB. // The maximum available fb_alloc memory = FB_ALLOC_SIZE + FB_SIZE - (w*h*bpp). -#define OMV_FFS_MEMORY DTCM // Flash filesystem cache memory #define OMV_MAIN_MEMORY SRAM1 // data, bss and heap #define OMV_STACK_MEMORY ITCM // stack memory #define OMV_DMA_MEMORY SRAM3 // DMA buffers memory. diff --git a/src/omv/boards/PORTENTA/omv_boardconfig.h b/src/omv/boards/PORTENTA/omv_boardconfig.h index 903643a66..224cd55d1 100644 --- a/src/omv/boards/PORTENTA/omv_boardconfig.h +++ b/src/omv/boards/PORTENTA/omv_boardconfig.h @@ -137,9 +137,8 @@ // Linker script constants (see the linker script template stm32fxxx.ld.S). // Note: fb_alloc is a stack-based, dynamically allocated memory on FB. // The maximum available fb_alloc memory = FB_ALLOC_SIZE + FB_SIZE - (w*h*bpp). -#define OMV_FFS_MEMORY DTCM // Flash filesystem cache memory #define OMV_MAIN_MEMORY SRAM1 // data, bss and heap -#define OMV_STACK_MEMORY SRAM1 // stack memory +#define OMV_STACK_MEMORY DTCM // stack memory #define OMV_DMA_MEMORY SRAM3 // DMA buffers memory. #define OMV_FB_MEMORY DRAM // Framebuffer, fb_alloc #define OMV_JPEG_MEMORY DRAM // JPEG buffer memory buffer. @@ -152,8 +151,8 @@ #define OMV_FB_SIZE (4M) // FB memory: header + VGA/GS image #define OMV_FB_ALLOC_SIZE (3M) // minimum fb alloc size -#define OMV_STACK_SIZE (32K) -#define OMV_HEAP_SIZE (164K) +#define OMV_STACK_SIZE (64K) +#define OMV_HEAP_SIZE (196K) #define OMV_SDRAM_SIZE (8 * 1024 * 1024) // This needs to be here for UVC firmware. #define OMV_LINE_BUF_SIZE (11 * 1024) // Image line buffer round(2592 * 2BPP * 2 buffers).