From 1321c5d1a153bc47db039895b6bdf03eda60c9ac Mon Sep 17 00:00:00 2001 From: "Kwabena W. Agyeman" Date: Fri, 20 Jun 2025 22:41:49 -0700 Subject: [PATCH] common: Remove legacy fixed vospi memory. --- boards/ARDUINO_GIGA/omv_boardconfig.h | 2 -- boards/ARDUINO_PORTENTA_H7/omv_boardconfig.h | 2 -- boards/OPENMV4/omv_boardconfig.h | 4 +--- boards/OPENMV4P/omv_boardconfig.h | 2 -- boards/OPENMVPT/omv_boardconfig.h | 2 -- boards/OPENMV_N6/omv_boardconfig.h | 2 -- boards/OPENMV_RT1060/omv_boardconfig.h | 4 +--- common/common.ld.S | 11 ----------- 8 files changed, 2 insertions(+), 27 deletions(-) diff --git a/boards/ARDUINO_GIGA/omv_boardconfig.h b/boards/ARDUINO_GIGA/omv_boardconfig.h index cbf379a2b..1df679c13 100644 --- a/boards/ARDUINO_GIGA/omv_boardconfig.h +++ b/boards/ARDUINO_GIGA/omv_boardconfig.h @@ -141,8 +141,6 @@ #define OMV_FB_OVERLAY_SIZE (448K) // Fast fb_alloc memory size. #define OMV_JPEG_MEMORY DRAM // JPEG buffer memory buffer. #define OMV_JPEG_SIZE (1M) // IDE JPEG buffer (header + data). -#define OMV_VOSPI_MEMORY DTCM // VoSPI buffer memory. -#define OMV_VOSPI_SIZE (38K) #define OMV_DMA_MEMORY SRAM3 // Misc DMA buffers memory. #define OMV_DMA_MEMORY_D1 SRAM0 // Domain 1 DMA buffers. #define OMV_DMA_MEMORY_D2 SRAM3 // Domain 2 DMA buffers. diff --git a/boards/ARDUINO_PORTENTA_H7/omv_boardconfig.h b/boards/ARDUINO_PORTENTA_H7/omv_boardconfig.h index 35d42a800..cd5c20860 100644 --- a/boards/ARDUINO_PORTENTA_H7/omv_boardconfig.h +++ b/boards/ARDUINO_PORTENTA_H7/omv_boardconfig.h @@ -139,8 +139,6 @@ #define OMV_FB_OVERLAY_SIZE (480K) // Fast fb_alloc memory size. #define OMV_JPEG_MEMORY DRAM // JPEG buffer memory buffer. #define OMV_JPEG_SIZE (1M) // IDE JPEG buffer (header + data). -#define OMV_VOSPI_MEMORY SRAM4 // VoSPI buffer memory. -#define OMV_VOSPI_SIZE (38K) #define OMV_DMA_MEMORY SRAM3 // Misc DMA buffers memory. #define OMV_DMA_MEMORY_D1 SRAM0 // Domain 1 DMA buffers. #define OMV_DMA_MEMORY_D2 SRAM3 // Domain 2 DMA buffers. diff --git a/boards/OPENMV4/omv_boardconfig.h b/boards/OPENMV4/omv_boardconfig.h index a1121e51a..3bdc15d6f 100644 --- a/boards/OPENMV4/omv_boardconfig.h +++ b/boards/OPENMV4/omv_boardconfig.h @@ -138,11 +138,9 @@ #define OMV_FB_ALLOC_SIZE (80K) // minimum fb alloc size #define OMV_JPEG_MEMORY SRAM0 // JPEG buffer memory. #define OMV_JPEG_SIZE (32K) // IDE JPEG buffer (header + data). -#define OMV_VOSPI_MEMORY SRAM4 // VoSPI buffer memory. -#define OMV_VOSPI_SIZE (38K) #define OMV_DMA_MEMORY SRAM2 // Misc DMA buffers memory. #define OMV_GC_BLOCK0_MEMORY SRAM4 // Main GC block. -#define OMV_GC_BLOCK0_SIZE (26K) +#define OMV_GC_BLOCK0_SIZE (64K) #define OMV_GC_BLOCK1_MEMORY SRAM1 // Extra GC block 0. #define OMV_GC_BLOCK1_SIZE (267K) #define OMV_MSC_BUF_SIZE (2K) // USB MSC bot data diff --git a/boards/OPENMV4P/omv_boardconfig.h b/boards/OPENMV4P/omv_boardconfig.h index c664d2a81..5f7de326f 100644 --- a/boards/OPENMV4P/omv_boardconfig.h +++ b/boards/OPENMV4P/omv_boardconfig.h @@ -126,8 +126,6 @@ #define OMV_FB_OVERLAY_SIZE (496K) // Fast fb_alloc memory size. #define OMV_JPEG_MEMORY DRAM // JPEG buffer memory buffer. #define OMV_JPEG_SIZE (1M) // IDE JPEG buffer (header + data). -#define OMV_VOSPI_MEMORY SRAM4 // VoSPI buffer memory. -#define OMV_VOSPI_SIZE (38K) #define OMV_DMA_MEMORY SRAM3 // Misc DMA buffers memory. #define OMV_DMA_MEMORY_D1 SRAM0 // Domain 1 DMA buffers. #define OMV_DMA_MEMORY_D2 SRAM3 // Domain 2 DMA buffers. diff --git a/boards/OPENMVPT/omv_boardconfig.h b/boards/OPENMVPT/omv_boardconfig.h index f95daf25c..c933513ad 100644 --- a/boards/OPENMVPT/omv_boardconfig.h +++ b/boards/OPENMVPT/omv_boardconfig.h @@ -117,8 +117,6 @@ #define OMV_FB_OVERLAY_SIZE (496K) // Fast fb_alloc memory size. #define OMV_JPEG_MEMORY DRAM // JPEG buffer memory buffer. #define OMV_JPEG_SIZE (1M) // IDE JPEG buffer (header + data). -#define OMV_VOSPI_MEMORY SRAM4 // VoSPI buffer memory. -#define OMV_VOSPI_SIZE (38K) #define OMV_DMA_MEMORY SRAM3 // DMA buffers memory. #define OMV_DMA_MEMORY_D1 SRAM0 // Domain 1 DMA buffers. #define OMV_DMA_MEMORY_D2 SRAM3 // Domain 2 DMA buffers. diff --git a/boards/OPENMV_N6/omv_boardconfig.h b/boards/OPENMV_N6/omv_boardconfig.h index 875fdfeab..52a06419d 100644 --- a/boards/OPENMV_N6/omv_boardconfig.h +++ b/boards/OPENMV_N6/omv_boardconfig.h @@ -153,8 +153,6 @@ #define OMV_FB_ALLOC_SIZE (11M) // minimum fb_alloc size #define OMV_JPEG_MEMORY DRAM // JPEG buffer memory buffer. #define OMV_JPEG_SIZE (1M) // IDE JPEG buffer (header + data). -#define OMV_VOSPI_MEMORY SRAM1 // VoSPI buffer memory. -#define OMV_VOSPI_SIZE (64K) #define OMV_DMA_MEMORY SRAM1 // Misc DMA buffers memory. #define OMV_GC_BLOCK0_MEMORY SRAM2 // Main GC block #define OMV_GC_BLOCK0_SIZE (1M) diff --git a/boards/OPENMV_RT1060/omv_boardconfig.h b/boards/OPENMV_RT1060/omv_boardconfig.h index 687be0dc3..9f40f21ed 100644 --- a/boards/OPENMV_RT1060/omv_boardconfig.h +++ b/boards/OPENMV_RT1060/omv_boardconfig.h @@ -84,11 +84,9 @@ #define OMV_FB_ALLOC_SIZE (10M) // minimum fb alloc size #define OMV_FB_OVERLAY_MEMORY OCRM1 // Fast fb_alloc memory. #define OMV_FB_OVERLAY_SIZE (512K) -#define OMV_VOSPI_MEMORY OCRM2 // VoSPI buffer memory. -#define OMV_VOSPI_SIZE (38K) #define OMV_DMA_MEMORY DTCM // Misc DMA buffers memory. #define OMV_GC_BLOCK0_MEMORY OCRM2 // Extra GC block 0. -#define OMV_GC_BLOCK0_SIZE (26K) +#define OMV_GC_BLOCK0_SIZE (64K) #define OMV_GC_BLOCK1_MEMORY DTCM // Main GC block #define OMV_GC_BLOCK1_SIZE (288K) #define OMV_GC_BLOCK2_MEMORY DRAM // Extra GC block 1. diff --git a/common/common.ld.S b/common/common.ld.S index 7ac266baf..e048dbf0a 100644 --- a/common/common.ld.S +++ b/common/common.ld.S @@ -133,17 +133,6 @@ PROVIDE(__stack = __StackTop); } >OMV_JPEG_MEMORY #endif -/* VOSPI framebuffer memory */ -#if defined(OMV_VOSPI_MEMORY) -.vospi_memory (NOLOAD) : -{ - . = ALIGN(4); - _vospi_buf = .; - . = . + OMV_VOSPI_SIZE; - . = ALIGN(4); -} >OMV_VOSPI_MEMORY -#endif - /* GPU memory */ #if defined(OMV_GPU_MEMORY) .gpu_memory (NOLOAD) :