diff --git a/configs/mikroe-stm32f4/scripts/memory.ld b/configs/mikroe-stm32f4/scripts/memory.ld index ffe8054dba..3a7480d871 100644 --- a/configs/mikroe-stm32f4/scripts/memory.ld +++ b/configs/mikroe-stm32f4/scripts/memory.ld @@ -96,5 +96,5 @@ MEMORY ksram (rwx) : ORIGIN = 0x20000000, LENGTH = 4K usram (rwx) : ORIGIN = 0x20001000, LENGTH = 4K - xsram (rwx) : ORIGIN = 0x20001000, LENGTH = 104K + xsram (rwx) : ORIGIN = 0x20002000, LENGTH = 104K } diff --git a/configs/sam3u-ek/scripts/memory.ld b/configs/sam3u-ek/scripts/memory.ld index 57b97d9156..70369776b4 100644 --- a/configs/sam3u-ek/scripts/memory.ld +++ b/configs/sam3u-ek/scripts/memory.ld @@ -89,7 +89,7 @@ MEMORY ksram1 (rwx) : ORIGIN = 0x20000000, LENGTH = 4K usram1 (rwx) : ORIGIN = 0x20001000, LENGTH = 4K - xsram1 (rwx) : ORIGIN = 0x20001000, LENGTH = 24K + xsram1 (rwx) : ORIGIN = 0x20002000, LENGTH = 24K /* 16Kb SRAM */ diff --git a/configs/stm3240g-eval/knxwm/defconfig b/configs/stm3240g-eval/knxwm/defconfig index b573bcb148..4f2fc623e7 100644 --- a/configs/stm3240g-eval/knxwm/defconfig +++ b/configs/stm3240g-eval/knxwm/defconfig @@ -26,7 +26,7 @@ CONFIG_PASS1_TARGET="all" CONFIG_PASS1_BUILDIR="configs/stm3240g-eval/kernel" CONFIG_PASS1_OBJECT="" CONFIG_NUTTX_KERNEL=y -CONFIG_NUTTX_USERSPACE=0x08020000 +CONFIG_NUTTX_USERSPACE=0x08040000 # # Binary Output Formats @@ -685,7 +685,9 @@ CONFIG_NXSTART_DEVNO=0 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set +CONFIG_MM_MULTIHEAP=y +CONFIG_MM_KERNEL_HEAP=y +CONFIG_MM_KERNEL_HEAPSIZE=8192 # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_GRAN is not set diff --git a/configs/stm3240g-eval/scripts/memory.ld b/configs/stm3240g-eval/scripts/memory.ld index 3ae5e16366..a1b347ccb4 100644 --- a/configs/stm3240g-eval/scripts/memory.ld +++ b/configs/stm3240g-eval/scripts/memory.ld @@ -44,7 +44,7 @@ * where the code expects to begin execution by jumping to the entry point in * the 0x0800:0000 address range. * - * For MPU support, the kernel-mode NuttX section is assumed to be 128Kb of + * For MPU support, the kernel-mode NuttX section is assumed to be 256Kb of * FLASH and 4Kb of SRAM. That is an excessive amount for the kernel which * should fit into 64KB and, of course, can be optimized as needed (See * also configs/stm3240g-eval/scripts/kernel-space.ld). Allowing the @@ -88,13 +88,13 @@ MEMORY { /* 1024Kb FLASH */ - kflash (rx) : ORIGIN = 0x08000000, LENGTH = 128K - uflash (rx) : ORIGIN = 0x08020000, LENGTH = 128K - xflash (rx) : ORIGIN = 0x08040000, LENGTH = 768K + kflash (rx) : ORIGIN = 0x08000000, LENGTH = 256K + uflash (rx) : ORIGIN = 0x08040000, LENGTH = 256K + xflash (rx) : ORIGIN = 0x08080000, LENGTH = 512K /* 112Kb of contiguous SRAM */ ksram (rwx) : ORIGIN = 0x20000000, LENGTH = 4K usram (rwx) : ORIGIN = 0x20001000, LENGTH = 4K - xsram (rwx) : ORIGIN = 0x20001000, LENGTH = 104K + xsram (rwx) : ORIGIN = 0x20002000, LENGTH = 104K } diff --git a/configs/stm32f429i-disco/scripts/memory.ld b/configs/stm32f429i-disco/scripts/memory.ld index 14a9d8db54..df11b9e3d6 100644 --- a/configs/stm32f429i-disco/scripts/memory.ld +++ b/configs/stm32f429i-disco/scripts/memory.ld @@ -97,5 +97,5 @@ MEMORY ksram (rwx) : ORIGIN = 0x20000000, LENGTH = 4K usram (rwx) : ORIGIN = 0x20001000, LENGTH = 4K - xsram (rwx) : ORIGIN = 0x20001000, LENGTH = 104K + xsram (rwx) : ORIGIN = 0x20002000, LENGTH = 104K } diff --git a/configs/stm32f4discovery/scripts/memory.ld b/configs/stm32f4discovery/scripts/memory.ld index ffe8054dba..3a7480d871 100644 --- a/configs/stm32f4discovery/scripts/memory.ld +++ b/configs/stm32f4discovery/scripts/memory.ld @@ -96,5 +96,5 @@ MEMORY ksram (rwx) : ORIGIN = 0x20000000, LENGTH = 4K usram (rwx) : ORIGIN = 0x20001000, LENGTH = 4K - xsram (rwx) : ORIGIN = 0x20001000, LENGTH = 104K + xsram (rwx) : ORIGIN = 0x20002000, LENGTH = 104K }