diff --git a/src/omv/boards/NICLAV/omv_boardconfig.h b/src/omv/boards/NICLAV/omv_boardconfig.h index eafc1bb88..8758db9f5 100644 --- a/src/omv/boards/NICLAV/omv_boardconfig.h +++ b/src/omv/boards/NICLAV/omv_boardconfig.h @@ -136,7 +136,8 @@ #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. -#define OMV_VOSPI_MEMORY SRAM4 // VoSPI buffer memory. +#define OMV_VOSPI_MEMORY SRAM4 // VoSPI frame buffer memory. +#define OMV_VOSPI_MEMORY_OFFSET (20K) // SRAM4 reserves 16K for CM4 + 4K D3 DMA buffers. #define OMV_CYW43_MEMORY FLASH_EXT // CYW43 firmware in external flash mmap'd flash. #define OMV_CYW43_MEMORY_OFFSET (0x90F00000)// Last Mbyte. @@ -168,6 +169,8 @@ #define OMV_SRAM4_LENGTH 64K #define OMV_AXI_SRAM_ORIGIN 0x24000000 #define OMV_AXI_SRAM_LENGTH 512K +#define OMV_CM4_RAM_ORIGIN 0x38000000 // Cortex-M4 memory @SRAM4. +#define OMV_CM4_RAM_LENGTH 16K // Flash configuration. #define OMV_FLASH_FFS_ORIGIN 0x08020000 @@ -176,6 +179,8 @@ #define OMV_FLASH_TXT_LENGTH 1792K #define OMV_FLASH_EXT_ORIGIN 0x90000000 #define OMV_FLASH_EXT_LENGTH 16M +#define OMV_CM4_FLASH_ORIGIN 0x08020000 +#define OMV_CM4_FLASH_LENGTH 128K // Domain 1 DMA buffers region. #define OMV_DMA_MEMORY_D1 AXI_SRAM @@ -190,9 +195,10 @@ #define OMV_DMA_REGION_D2_SIZE MPU_REGION_SIZE_16KB // Domain 3 DMA buffers region. -//#define OMV_DMA_MEMORY_D3 SRAM4 -//#define OMV_DMA_REGION_D3_BASE (OMV_SRAM4_ORIGIN+(0*1024)) -//#define OMV_DMA_REGION_D3_SIZE MPU_REGION_SIZE_64KB +#define OMV_DMA_MEMORY_D3 SRAM4 +#define OMV_DMA_MEMORY_D3_SIZE (4*1024) // Reserved memory for DMA buffers +#define OMV_DMA_REGION_D3_BASE (OMV_SRAM4_ORIGIN+(16*1024)) +#define OMV_DMA_REGION_D3_SIZE MPU_REGION_SIZE_4KB // AXI QoS - Low-High (0:15) - default 0 #define OMV_AXI_QOS_MDMA_R_PRI 15 // Max pri to move data. diff --git a/src/omv/boards/NICLAV/omv_boardconfig.mk b/src/omv/boards/NICLAV/omv_boardconfig.mk index 25e88c9cc..40d41b66e 100755 --- a/src/omv/boards/NICLAV/omv_boardconfig.mk +++ b/src/omv/boards/NICLAV/omv_boardconfig.mk @@ -8,11 +8,14 @@ HAL_INC='' CFLAGS_MCU=MCU_SERIES_H7 VECT_TAB_OFFSET=0x40000 MAIN_APP_ADDR=0x08040000 +M4_VECT_TAB_OFFSET=0x20000 +M4_APP_ADDR=0x08020000 OMV_HSE_VALUE=25000000 DFU_DEVICE=0x2341:0x035b OMV_BOARD_EXTRA_CFLAGS = -DCORE_CM7 -DUSE_USB_HS -OMV_ENABLE_BL=0 -OMV_ENABLE_UVC=1 +OMV_ENABLE_BL = 0 +OMV_ENABLE_UVC = 1 +OMV_ENABLE_CM4 = 0 MICROPY_PY_SENSOR = 1 MICROPY_PY_ULAB = 1 MICROPY_PY_WINC1500 = 0 @@ -23,6 +26,6 @@ MICROPY_PY_BLUETOOTH = 1 MICROPY_BLUETOOTH_NIMBLE = 1 MICROPY_PY_AUDIO = 1 MICROPY_PY_MICRO_SPEECH = 1 -MICROPY_PY_LCD = 1 -MICROPY_PY_TV = 1 +MICROPY_PY_LCD = 0 +MICROPY_PY_TV = 0 MICROPY_PY_BUZZER = 0