diff --git a/src/omv/boards/OPENMV4P/omv_boardconfig.h b/src/omv/boards/OPENMV4P/omv_boardconfig.h index b7da69b8c..bc7c7c97e 100644 --- a/src/omv/boards/OPENMV4P/omv_boardconfig.h +++ b/src/omv/boards/OPENMV4P/omv_boardconfig.h @@ -148,10 +148,10 @@ #define OMV_JPEG_MEMORY_OFFSET (31M) // JPEG buffer is placed after FB/fballoc memory. #define OMV_VOSPI_MEMORY SRAM4 // VoSPI buffer memory. #define OMV_FB_OVERLAY_MEMORY AXI_SRAM // Fast fb_alloc memory. -#define OMV_FB_OVERLAY_MEMORY_OFFSET (496*1024) // Fast fb_alloc memory size. #define OMV_FB_SIZE (20M) // FB memory: header + VGA/GS image #define OMV_FB_ALLOC_SIZE (11M) // minimum fb alloc size +#define OMV_FB_OVERLAY_SIZE (496*1024) // Fast fb_alloc memory size. #define OMV_STACK_SIZE (64K) #define OMV_HEAP_SIZE (240K) #define OMV_SDRAM_SIZE (32 * 1024 * 1024) // This needs to be here for UVC firmware. @@ -189,7 +189,7 @@ // Domain 1 DMA buffers region. #define OMV_DMA_MEMORY_D1 AXI_SRAM #define OMV_DMA_MEMORY_D1_SIZE (16*1024) // Reserved memory for DMA buffers -#define OMV_DMA_REGION_D1_BASE (OMV_AXI_SRAM_ORIGIN+OMV_FB_OVERLAY_MEMORY_OFFSET) +#define OMV_DMA_REGION_D1_BASE (OMV_AXI_SRAM_ORIGIN+OMV_FB_OVERLAY_SIZE) #define OMV_DMA_REGION_D1_SIZE MPU_REGION_SIZE_16KB // Domain 2 DMA buffers region. diff --git a/src/omv/boards/OPENMV4_PRO/omv_boardconfig.h b/src/omv/boards/OPENMV4_PRO/omv_boardconfig.h index 22d0773ad..720a7cf4e 100644 --- a/src/omv/boards/OPENMV4_PRO/omv_boardconfig.h +++ b/src/omv/boards/OPENMV4_PRO/omv_boardconfig.h @@ -157,12 +157,12 @@ #define OMV_VOSPI_MEMORY SRAM4 // VoSPI buffer memory. #define OMV_VOSPI_MEMORY_OFFSET (4K) // First 4K reserved for D3 DMA buffers. #define OMV_FB_OVERLAY_MEMORY AXI_SRAM // Fast fb_alloc memory. -#define OMV_FB_OVERLAY_MEMORY_OFFSET (496*1024) // Fast fb_alloc memory size. #define OMV_CYW43_MEMORY FLASH_EXT // CYW43 firmware in external flash mmap'd flash. #define OMV_CYW43_MEMORY_OFFSET (0x90F00000)// Last Mbyte. #define OMV_FB_SIZE (20M) // FB memory: header + VGA/GS image #define OMV_FB_ALLOC_SIZE (11M) // minimum fb alloc size +#define OMV_FB_OVERLAY_SIZE (496*1024) // Fast fb_alloc memory size. #define OMV_STACK_SIZE (64K) #define OMV_HEAP_SIZE (197K) #define OMV_SDRAM_SIZE (32 * 1024 * 1024) // This needs to be here for UVC firmware. @@ -202,7 +202,7 @@ // Domain 1 DMA buffers region. #define OMV_DMA_MEMORY_D1 AXI_SRAM #define OMV_DMA_MEMORY_D1_SIZE (8*1024) // Reserved memory for DMA buffers -#define OMV_DMA_REGION_D1_BASE (OMV_AXI_SRAM_ORIGIN+OMV_FB_OVERLAY_MEMORY_OFFSET) +#define OMV_DMA_REGION_D1_BASE (OMV_AXI_SRAM_ORIGIN+OMV_FB_OVERLAY_SIZE) #define OMV_DMA_REGION_D1_SIZE MPU_REGION_SIZE_8KB // Domain 2 DMA buffers region. diff --git a/src/omv/boards/OPENMVPT/omv_boardconfig.h b/src/omv/boards/OPENMVPT/omv_boardconfig.h index 6fc43e991..83abcb8e4 100644 --- a/src/omv/boards/OPENMVPT/omv_boardconfig.h +++ b/src/omv/boards/OPENMVPT/omv_boardconfig.h @@ -151,10 +151,10 @@ #define OMV_JPEG_MEMORY_OFFSET (63M) // JPEG buffer is placed after FB/fballoc memory. #define OMV_VOSPI_MEMORY SRAM4 // VoSPI buffer memory. #define OMV_FB_OVERLAY_MEMORY AXI_SRAM // Fast fb_alloc memory. -#define OMV_FB_OVERLAY_MEMORY_OFFSET (496*1024) // Fast fb_alloc memory size. #define OMV_FB_SIZE (32M) // FB memory: header + VGA/GS image #define OMV_FB_ALLOC_SIZE (31M) // minimum fb alloc size +#define OMV_FB_OVERLAY_SIZE (496*1024) // Fast fb_alloc memory size. #define OMV_STACK_SIZE (64K) #define OMV_HEAP_SIZE (250K) #define OMV_SDRAM_SIZE (64 * 1024 * 1024) // This needs to be here for UVC firmware. @@ -192,7 +192,7 @@ // Domain 1 DMA buffers region. #define OMV_DMA_MEMORY_D1 AXI_SRAM #define OMV_DMA_MEMORY_D1_SIZE (16*1024) // Reserved memory for DMA buffers -#define OMV_DMA_REGION_D1_BASE (OMV_AXI_SRAM_ORIGIN+OMV_FB_OVERLAY_MEMORY_OFFSET) +#define OMV_DMA_REGION_D1_BASE (OMV_AXI_SRAM_ORIGIN+OMV_FB_OVERLAY_SIZE) #define OMV_DMA_REGION_D1_SIZE MPU_REGION_SIZE_16KB // Domain 2 DMA buffers region. diff --git a/src/omv/boards/PORTENTA/omv_boardconfig.h b/src/omv/boards/PORTENTA/omv_boardconfig.h index 98ff24dd7..679c638d1 100644 --- a/src/omv/boards/PORTENTA/omv_boardconfig.h +++ b/src/omv/boards/PORTENTA/omv_boardconfig.h @@ -155,12 +155,12 @@ #define OMV_JPEG_MEMORY_OFFSET (7M) // JPEG buffer is placed after FB/fballoc memory. #define OMV_VOSPI_MEMORY SRAM4 // VoSPI buffer memory. #define OMV_FB_OVERLAY_MEMORY AXI_SRAM // Fast fb_alloc memory. -#define OMV_FB_OVERLAY_MEMORY_OFFSET (480*1024) // Fast fb_alloc memory size. #define OMV_CYW43_MEMORY FLASH_EXT // CYW43 firmware in external flash mmap'd flash. #define OMV_CYW43_MEMORY_OFFSET (0x90F00000)// Last Mbyte. -#define OMV_FB_SIZE (4M) // FB memory: header + VGA/GS image -#define OMV_FB_ALLOC_SIZE (3M) // minimum fb alloc size +#define OMV_FB_SIZE (4M) // FB memory: header + VGA/GS image +#define OMV_FB_ALLOC_SIZE (3M) // minimum fb alloc size +#define OMV_FB_OVERLAY_SIZE (480*1024) // Fast fb_alloc memory size. #define OMV_STACK_SIZE (64K) #define OMV_HEAP_SIZE (160K) #define OMV_SDRAM_SIZE (8 * 1024 * 1024) // This needs to be here for UVC firmware. @@ -202,7 +202,7 @@ // Domain 1 DMA buffers region. #define OMV_DMA_MEMORY_D1 AXI_SRAM #define OMV_DMA_MEMORY_D1_SIZE (16*1024) // Reserved memory for DMA buffers -#define OMV_DMA_REGION_D1_BASE (OMV_AXI_SRAM_ORIGIN+OMV_FB_OVERLAY_MEMORY_OFFSET) +#define OMV_DMA_REGION_D1_BASE (OMV_AXI_SRAM_ORIGIN+OMV_FB_OVERLAY_SIZE) #define OMV_DMA_REGION_D1_SIZE MPU_REGION_SIZE_32KB // Domain 2 DMA buffers region. diff --git a/src/omv/ports/stm32/stm32fxxx.ld.S b/src/omv/ports/stm32/stm32fxxx.ld.S index cd8a73e31..4cf0b7cf6 100755 --- a/src/omv/ports/stm32/stm32fxxx.ld.S +++ b/src/omv/ports/stm32/stm32fxxx.ld.S @@ -146,7 +146,7 @@ SECTIONS { . = ALIGN(4); _fballoc_overlay_start = .; - . = . + OMV_FB_OVERLAY_MEMORY_OFFSET; + . = . + OMV_FB_OVERLAY_SIZE; _fballoc_overlay_end = .; } >OMV_FB_OVERLAY_MEMORY #endif diff --git a/src/uvc/stm32fxxx.ld.S b/src/uvc/stm32fxxx.ld.S index 58c3af73c..551421a95 100755 --- a/src/uvc/stm32fxxx.ld.S +++ b/src/uvc/stm32fxxx.ld.S @@ -108,7 +108,7 @@ SECTIONS { . = ALIGN(4); _fballoc_overlay_start = .; - . = . + OMV_FB_OVERLAY_MEMORY_OFFSET; + . = . + OMV_FB_OVERLAY_SIZE; _fballoc_overlay_end = .; } >OMV_FB_OVERLAY_MEMORY #endif