luchianmihai/walnux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

stm32h7: Bug where more than CONFIG_MM_REGIONS would be allocated

Browse source
This commit is contained in:
Brennan Ashton 2020-11-21 17:52:39 -08:00 • committed by Xiang Xiao
parent 10d7d8e9c3
commit a0112eee4f
6 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arch/arm/src/stm32h7/stm32_allocateheap.c
View file

@ -345,10 +345,16 @@ static void addregion (uintptr_t start, uint32_t size, const char *desc)
void arm_addregion(void)
{
addregion (SRAM123_START, SRAM123_END - SRAM123_START, "SRAM1,2,3");
/* At this point there is already one region allocated for "kernel" heap */
unsigned mm_regions = 1;
if (mm_regions < CONFIG_MM_REGIONS)
{
addregion (SRAM123_START, SRAM123_END - SRAM123_START, "SRAM1,2,3");
mm_regions++;
}
if (mm_regions < CONFIG_MM_REGIONS)
{
addregion (SRAM4_START, SRAM4_END - SRAM4_START, "SRAM4");

2
boards/arm/stm32h7/nucleo-h743zi/configs/elf/defconfig
View file

@ -34,7 +34,7 @@ CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_INTELHEX_BINARY=y
CONFIG_MAX_TASKS=16
CONFIG_MM_REGIONS=3
CONFIG_MM_REGIONS=4
CONFIG_NFILE_DESCRIPTORS=8
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y

2
boards/arm/stm32h7/nucleo-h743zi/configs/nsh/defconfig
View file

@ -27,7 +27,7 @@ CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_INTELHEX_BINARY=y
CONFIG_MAX_TASKS=16
CONFIG_MM_REGIONS=3
CONFIG_MM_REGIONS=4
CONFIG_NFILE_DESCRIPTORS=8
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=512

2
boards/arm/stm32h7/nucleo-h743zi/configs/nxlines_oled/defconfig
View file

@ -39,7 +39,7 @@ CONFIG_LCD_MAXCONTRAST=255
CONFIG_LCD_SH1106_OLED_132=y
CONFIG_LCD_SSD1306_I2C=y
CONFIG_MAX_TASKS=16
CONFIG_MM_REGIONS=3
CONFIG_MM_REGIONS=4
CONFIG_MQ_MAXMSGSIZE=128
CONFIG_NFILE_DESCRIPTORS=8
CONFIG_NSH_ARCHINIT=y

2
boards/arm/stm32h7/nucleo-h743zi/configs/pwm/defconfig
View file

@ -27,7 +27,7 @@ CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_INTELHEX_BINARY=y
CONFIG_MAX_TASKS=16
CONFIG_MM_REGIONS=3
CONFIG_MM_REGIONS=4
CONFIG_NFILE_DESCRIPTORS=8
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y

2
boards/arm/stm32h7/stm32h747i-disco/configs/nsh/defconfig
View file

@ -27,7 +27,7 @@ CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_INTELHEX_BINARY=y
CONFIG_MAX_TASKS=16
CONFIG_MM_REGIONS=3
CONFIG_MM_REGIONS=4
CONFIG_NFILE_DESCRIPTORS=8
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=512