diff --git a/src/omv/boards/ARDUINO_PORTENTA_H7/omv_boardconfig.h b/src/omv/boards/ARDUINO_PORTENTA_H7/omv_boardconfig.h index a7f4d2f0f..e14123995 100644 --- a/src/omv/boards/ARDUINO_PORTENTA_H7/omv_boardconfig.h +++ b/src/omv/boards/ARDUINO_PORTENTA_H7/omv_boardconfig.h @@ -150,7 +150,7 @@ #define OMV_CORE1_MEMORY DRAM #define OMV_CORE1_SIZE (512K) #define OMV_GC_BLOCK0_MEMORY SRAM1 // Main GC block. -#define OMV_GC_BLOCK0_SIZE (192K) +#define OMV_GC_BLOCK0_SIZE (176K) #define OMV_GC_BLOCK1_MEMORY DRAM // Extra GC block 1. #define OMV_GC_BLOCK1_SIZE (2560K) #define OMV_MSC_BUF_SIZE (2K) // USB MSC bot data @@ -165,9 +165,9 @@ #define OMV_SRAM0_ORIGIN 0x24000000 #define OMV_SRAM0_LENGTH 512K #define OMV_SRAM1_ORIGIN 0x30000000 -#define OMV_SRAM1_LENGTH 256K // SRAM1 + SRAM2 +#define OMV_SRAM1_LENGTH 240K // SRAM1 + SRAM2 #define OMV_SRAM3_ORIGIN 0x30040000 // Second half of SRAM3 reserved for M4. -#define OMV_SRAM3_LENGTH 16K +#define OMV_SRAM3_LENGTH 32K #define OMV_SRAM4_ORIGIN 0x38000000 #define OMV_SRAM4_LENGTH 64K #define OMV_DRAM_ORIGIN 0x60000000 diff --git a/src/omv/ports/stm32/omv_mpconfigport.h b/src/omv/ports/stm32/omv_mpconfigport.h index 75f5d1afe..ba6c8f6df 100644 --- a/src/omv/ports/stm32/omv_mpconfigport.h +++ b/src/omv/ports/stm32/omv_mpconfigport.h @@ -23,8 +23,6 @@ * * MicroPython port config. */ -#include - #define MICROPY_NLR_RAISE_HOOK \ do { \ extern void fb_alloc_free_till_mark(); \ @@ -39,5 +37,8 @@ #define MICROPY_BANNER_NAME_AND_VERSION "OpenMV " OPENMV_GIT_TAG "; MicroPython " MICROPY_GIT_TAG #define MICROPY_BOARD_FATAL_ERROR __fatal_error #define MICROPY_HW_DMA_ENABLE_AUTO_TURN_OFF (0) +#define MICROPY_HW_ETH_DMA_ATTRIBUTE __attribute__((aligned(16384), section(".dma_buffer"))); void __fatal_error(const char *); + +#include