From 2acbaac09151300642309fc97b18b43efbd05bcf Mon Sep 17 00:00:00 2001 From: iabdalkader Date: Mon, 11 Nov 2024 17:32:24 +0100 Subject: [PATCH] boards/all: Rename AXI_SRAM region. --- src/omv/boards/ARDUINO_GIGA/omv_boardconfig.h | 10 +++++----- .../boards/ARDUINO_NICLA_VISION/omv_boardconfig.h | 10 +++++----- src/omv/boards/ARDUINO_PORTENTA_H7/omv_boardconfig.h | 8 ++++---- src/omv/boards/OPENMV4/omv_boardconfig.h | 12 ++++++------ src/omv/boards/OPENMV4P/omv_boardconfig.h | 8 ++++---- src/omv/boards/OPENMVPT/omv_boardconfig.h | 8 ++++---- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/omv/boards/ARDUINO_GIGA/omv_boardconfig.h b/src/omv/boards/ARDUINO_GIGA/omv_boardconfig.h index 0f1ffc5cd..26d1a142c 100644 --- a/src/omv/boards/ARDUINO_GIGA/omv_boardconfig.h +++ b/src/omv/boards/ARDUINO_GIGA/omv_boardconfig.h @@ -127,20 +127,20 @@ // Linker script constants (see the linker script template stm32.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_MAIN_MEMORY AXI_SRAM // Data, BSS memory. +#define OMV_MAIN_MEMORY SRAM0 // Data, BSS memory. #define OMV_STACK_MEMORY DTCM // stack memory #define OMV_STACK_SIZE (64K) #define OMV_FB_MEMORY DRAM // Framebuffer, fb_alloc #define OMV_FB_SIZE (3M) // FB memory: header + VGA/GS image #define OMV_FB_ALLOC_SIZE (1M) // minimum fb alloc size -#define OMV_FB_OVERLAY_MEMORY AXI_SRAM // Fast fb_alloc memory. +#define OMV_FB_OVERLAY_MEMORY SRAM0 // Fast fb_alloc memory. #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 AXI_SRAM // Domain 1 DMA buffers. +#define OMV_DMA_MEMORY_D1 SRAM0 // Domain 1 DMA buffers. #define OMV_DMA_MEMORY_D2 SRAM3 // Domain 2 DMA buffers. #define OMV_OPENAMP_MEMORY SRAM4 #define OMV_OPENAMP_SIZE (64K) @@ -160,14 +160,14 @@ #define OMV_FLASH_LENGTH 2048K #define OMV_DTCM_ORIGIN 0x20000000 // Note accessible by CPU and MDMA only. #define OMV_DTCM_LENGTH 128K +#define OMV_SRAM0_ORIGIN 0x24000000 +#define OMV_SRAM0_LENGTH 512K #define OMV_SRAM1_ORIGIN 0x30000000 #define OMV_SRAM1_LENGTH 256K #define OMV_SRAM3_ORIGIN 0x30040000 #define OMV_SRAM3_LENGTH 32K #define OMV_SRAM4_ORIGIN 0x38000000 #define OMV_SRAM4_LENGTH 64K -#define OMV_AXI_SRAM_ORIGIN 0x24000000 -#define OMV_AXI_SRAM_LENGTH 512K #define OMV_DRAM_ORIGIN 0xC0000000 #define OMV_DRAM_LENGTH 8M diff --git a/src/omv/boards/ARDUINO_NICLA_VISION/omv_boardconfig.h b/src/omv/boards/ARDUINO_NICLA_VISION/omv_boardconfig.h index a7220d9de..7733a4420 100644 --- a/src/omv/boards/ARDUINO_NICLA_VISION/omv_boardconfig.h +++ b/src/omv/boards/ARDUINO_NICLA_VISION/omv_boardconfig.h @@ -121,13 +121,13 @@ #define OMV_MAIN_MEMORY DTCM // Data/BSS memory. #define OMV_STACK_MEMORY DTCM // stack memory #define OMV_STACK_SIZE (32K) -#define OMV_FB_MEMORY AXI_SRAM // Framebuffer, fb_alloc +#define OMV_FB_MEMORY SRAM0 // Framebuffer, fb_alloc #define OMV_FB_SIZE (400K) // FB memory: header + VGA/GS image #define OMV_FB_ALLOC_SIZE (76K) // minimum fb alloc size -#define OMV_JPEG_MEMORY AXI_SRAM // JPEG buffer memory buffer. +#define OMV_JPEG_MEMORY SRAM0 // JPEG buffer memory buffer. #define OMV_JPEG_SIZE (32K) // IDE JPEG buffer (header + data). #define OMV_DMA_MEMORY SRAM2 // DMA buffers memory. -#define OMV_DMA_MEMORY_D1 AXI_SRAM // Domain 1 DMA buffers. +#define OMV_DMA_MEMORY_D1 SRAM0 // Domain 1 DMA buffers. #define OMV_DMA_MEMORY_D2 SRAM2 // Domain 2 DMA buffers. #define OMV_CM4_BOOT_MEMORY SRAM4 // Use to boot CM4 for low-power mode. #define OMV_CM4_BOOT_SIZE 1K @@ -148,14 +148,14 @@ #define OMV_DTCM_LENGTH 128K #define OMV_ITCM_ORIGIN 0x00000000 #define OMV_ITCM_LENGTH 64K +#define OMV_SRAM0_ORIGIN 0x24000000 +#define OMV_SRAM0_LENGTH 512K #define OMV_SRAM1_ORIGIN 0x30000000 #define OMV_SRAM1_LENGTH 276K #define OMV_SRAM2_ORIGIN 0x30045000 #define OMV_SRAM2_LENGTH 12K #define OMV_SRAM4_ORIGIN 0x38000000 #define OMV_SRAM4_LENGTH 64K -#define OMV_AXI_SRAM_ORIGIN 0x24000000 -#define OMV_AXI_SRAM_LENGTH 512K // Flash configuration. #define OMV_FLASH_FFS_ORIGIN 0x08020000 diff --git a/src/omv/boards/ARDUINO_PORTENTA_H7/omv_boardconfig.h b/src/omv/boards/ARDUINO_PORTENTA_H7/omv_boardconfig.h index eddeecfc7..7f91c9d31 100644 --- a/src/omv/boards/ARDUINO_PORTENTA_H7/omv_boardconfig.h +++ b/src/omv/boards/ARDUINO_PORTENTA_H7/omv_boardconfig.h @@ -135,14 +135,14 @@ #define OMV_FB_MEMORY DRAM // Framebuffer, fb_alloc #define OMV_FB_SIZE (3M) // FB memory: header + VGA/GS image #define OMV_FB_ALLOC_SIZE (1M) // minimum fb alloc size -#define OMV_FB_OVERLAY_MEMORY AXI_SRAM // Fast fb_alloc memory. +#define OMV_FB_OVERLAY_MEMORY SRAM0 // Fast fb_alloc memory. #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 AXI_SRAM // Domain 1 DMA buffers. +#define OMV_DMA_MEMORY_D1 SRAM0 // Domain 1 DMA buffers. #define OMV_DMA_MEMORY_D2 SRAM3 // Domain 2 DMA buffers. #define OMV_DMA_MEMORY_D3 SRAM4 // Domain 3 DMA buffers. #define OMV_OPENAMP_MEMORY SRAM1 @@ -163,14 +163,14 @@ #define OMV_FLASH_LENGTH 2048K #define OMV_DTCM_ORIGIN 0x20000000 // Note accessible by CPU and MDMA only. #define OMV_DTCM_LENGTH 128K +#define OMV_SRAM0_ORIGIN 0x24000000 +#define OMV_SRAM0_LENGTH 512K #define OMV_SRAM1_ORIGIN 0x30000000 #define OMV_SRAM1_LENGTH 256K // SRAM1 + SRAM2 #define OMV_SRAM3_ORIGIN 0x30040000 // Second half of SRAM3 reserved for M4. #define OMV_SRAM3_LENGTH 16K #define OMV_SRAM4_ORIGIN 0x38000000 #define OMV_SRAM4_LENGTH 64K -#define OMV_AXI_SRAM_ORIGIN 0x24000000 -#define OMV_AXI_SRAM_LENGTH 512K #define OMV_DRAM_ORIGIN 0xC0000000 #define OMV_DRAM_LENGTH 8M diff --git a/src/omv/boards/OPENMV4/omv_boardconfig.h b/src/omv/boards/OPENMV4/omv_boardconfig.h index 77f02a7ac..7815781ce 100644 --- a/src/omv/boards/OPENMV4/omv_boardconfig.h +++ b/src/omv/boards/OPENMV4/omv_boardconfig.h @@ -136,10 +136,10 @@ #define OMV_FFS_MEMORY DTCM // Flash filesystem cache memory #define OMV_STACK_MEMORY ITCM // stack memory #define OMV_STACK_SIZE (64K) -#define OMV_FB_MEMORY AXI_SRAM // Framebuffer, fb_alloc -#define OMV_FB_SIZE (400K) // FB memory: header + VGA/GS image -#define OMV_FB_ALLOC_SIZE (80K) // minimum fb alloc size -#define OMV_JPEG_MEMORY AXI_SRAM // JPEG buffer memory. +#define OMV_FB_MEMORY SRAM0 // Framebuffer, fb_alloc +#define OMV_FB_SIZE (400K) // FB memory: header + VGA/GS image +#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) @@ -159,14 +159,14 @@ #define OMV_DTCM_LENGTH 128K #define OMV_ITCM_ORIGIN 0x00000000 #define OMV_ITCM_LENGTH 64K +#define OMV_SRAM0_ORIGIN 0x24000000 +#define OMV_SRAM0_LENGTH 512K #define OMV_SRAM1_ORIGIN 0x30000000 #define OMV_SRAM1_LENGTH 280K #define OMV_SRAM2_ORIGIN 0x30046000 #define OMV_SRAM2_LENGTH 8K #define OMV_SRAM4_ORIGIN 0x38000000 #define OMV_SRAM4_LENGTH 64K -#define OMV_AXI_SRAM_ORIGIN 0x24000000 -#define OMV_AXI_SRAM_LENGTH 512K // Flash configuration. #define OMV_FLASH_BOOT_ORIGIN 0x08000000 diff --git a/src/omv/boards/OPENMV4P/omv_boardconfig.h b/src/omv/boards/OPENMV4P/omv_boardconfig.h index 98271bfe3..edd7da61c 100644 --- a/src/omv/boards/OPENMV4P/omv_boardconfig.h +++ b/src/omv/boards/OPENMV4P/omv_boardconfig.h @@ -125,14 +125,14 @@ #define OMV_FB_MEMORY DRAM // Framebuffer, fb_alloc #define OMV_FB_SIZE (16M) // FB memory: header + VGA/GS image #define OMV_FB_ALLOC_SIZE (11M) // minimum fb alloc size -#define OMV_FB_OVERLAY_MEMORY AXI_SRAM // Fast fb_alloc memory. +#define OMV_FB_OVERLAY_MEMORY SRAM0 // Fast fb_alloc memory. #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 AXI_SRAM // Domain 1 DMA buffers. +#define OMV_DMA_MEMORY_D1 SRAM0 // Domain 1 DMA buffers. #define OMV_DMA_MEMORY_D2 SRAM3 // Domain 2 DMA buffers. #define OMV_DMA_MEMORY_D3 SRAM4 // Domain 3 DMA buffers. #define OMV_GC_BLOCK0_MEMORY SRAM1 // Main GC block @@ -151,14 +151,14 @@ #define OMV_DTCM_LENGTH 128K #define OMV_ITCM_ORIGIN 0x00000000 #define OMV_ITCM_LENGTH 64K +#define OMV_SRAM0_ORIGIN 0x24000000 +#define OMV_SRAM0_LENGTH 512K #define OMV_SRAM1_ORIGIN 0x30000000 #define OMV_SRAM1_LENGTH 256K // SRAM1 + SRAM2 + 1/2 SRAM3 #define OMV_SRAM3_ORIGIN 0x30040000 #define OMV_SRAM3_LENGTH 32K #define OMV_SRAM4_ORIGIN 0x38000000 #define OMV_SRAM4_LENGTH 64K -#define OMV_AXI_SRAM_ORIGIN 0x24000000 -#define OMV_AXI_SRAM_LENGTH 512K #define OMV_DRAM_ORIGIN 0xC0000000 #define OMV_DRAM_LENGTH 32M diff --git a/src/omv/boards/OPENMVPT/omv_boardconfig.h b/src/omv/boards/OPENMVPT/omv_boardconfig.h index 6cc7f9640..5e0f6a2b6 100644 --- a/src/omv/boards/OPENMVPT/omv_boardconfig.h +++ b/src/omv/boards/OPENMVPT/omv_boardconfig.h @@ -116,14 +116,14 @@ #define OMV_FB_MEMORY DRAM // Framebuffer, fb_alloc #define OMV_FB_SIZE (32M) // FB memory: header + VGA/GS image #define OMV_FB_ALLOC_SIZE (23M) // minimum fb alloc size -#define OMV_FB_OVERLAY_MEMORY AXI_SRAM // Fast fb_alloc memory. +#define OMV_FB_OVERLAY_MEMORY SRAM0 // Fast fb_alloc memory. #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 AXI_SRAM // Domain 1 DMA buffers. +#define OMV_DMA_MEMORY_D1 SRAM0 // Domain 1 DMA buffers. #define OMV_DMA_MEMORY_D2 SRAM3 // Domain 2 DMA buffers. #define OMV_DMA_MEMORY_D3 SRAM4 // Domain 3 DMA buffers. #define OMV_GC_BLOCK0_MEMORY SRAM1 // Main GC block. @@ -142,14 +142,14 @@ #define OMV_DTCM_LENGTH 128K #define OMV_ITCM_ORIGIN 0x00000000 #define OMV_ITCM_LENGTH 64K +#define OMV_SRAM0_ORIGIN 0x24000000 +#define OMV_SRAM0_LENGTH 512K #define OMV_SRAM1_ORIGIN 0x30000000 #define OMV_SRAM1_LENGTH 272K // SRAM1 + SRAM2 + 1/2 SRAM3 #define OMV_SRAM3_ORIGIN 0x30044000 #define OMV_SRAM3_LENGTH 16K #define OMV_SRAM4_ORIGIN 0x38000000 #define OMV_SRAM4_LENGTH 64K -#define OMV_AXI_SRAM_ORIGIN 0x24000000 -#define OMV_AXI_SRAM_LENGTH 512K #define OMV_DRAM_ORIGIN 0xC0000000 #define OMV_DRAM_LENGTH 64M