diff options
| -rw-r--r-- | nuttx/configs/mikroe-stm32f4/scripts/memory.ld | 2 | ||||
| -rw-r--r-- | nuttx/configs/sam3u-ek/scripts/memory.ld | 2 | ||||
| -rw-r--r-- | nuttx/configs/stm3240g-eval/knxwm/defconfig | 6 | ||||
| -rw-r--r-- | nuttx/configs/stm3240g-eval/scripts/memory.ld | 10 | ||||
| -rw-r--r-- | nuttx/configs/stm32f429i-disco/scripts/memory.ld | 2 | ||||
| -rw-r--r-- | nuttx/configs/stm32f4discovery/scripts/memory.ld | 2 | ||||
| -rw-r--r-- | nuttx/fs/mmap/README.txt | 4 |
7 files changed, 15 insertions, 13 deletions
diff --git a/nuttx/configs/mikroe-stm32f4/scripts/memory.ld b/nuttx/configs/mikroe-stm32f4/scripts/memory.ld index ffe8054db..3a7480d87 100644 --- a/nuttx/configs/mikroe-stm32f4/scripts/memory.ld +++ b/nuttx/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/nuttx/configs/sam3u-ek/scripts/memory.ld b/nuttx/configs/sam3u-ek/scripts/memory.ld index 57b97d915..70369776b 100644 --- a/nuttx/configs/sam3u-ek/scripts/memory.ld +++ b/nuttx/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/nuttx/configs/stm3240g-eval/knxwm/defconfig b/nuttx/configs/stm3240g-eval/knxwm/defconfig index b573bcb14..4f2fc623e 100644 --- a/nuttx/configs/stm3240g-eval/knxwm/defconfig +++ b/nuttx/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/nuttx/configs/stm3240g-eval/scripts/memory.ld b/nuttx/configs/stm3240g-eval/scripts/memory.ld index 3ae5e1636..a1b347ccb 100644 --- a/nuttx/configs/stm3240g-eval/scripts/memory.ld +++ b/nuttx/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/nuttx/configs/stm32f429i-disco/scripts/memory.ld b/nuttx/configs/stm32f429i-disco/scripts/memory.ld index 14a9d8db5..df11b9e3d 100644 --- a/nuttx/configs/stm32f429i-disco/scripts/memory.ld +++ b/nuttx/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/nuttx/configs/stm32f4discovery/scripts/memory.ld b/nuttx/configs/stm32f4discovery/scripts/memory.ld index ffe8054db..3a7480d87 100644 --- a/nuttx/configs/stm32f4discovery/scripts/memory.ld +++ b/nuttx/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 } diff --git a/nuttx/fs/mmap/README.txt b/nuttx/fs/mmap/README.txt index 3e97650b3..8fd974a24 100644 --- a/nuttx/fs/mmap/README.txt +++ b/nuttx/fs/mmap/README.txt @@ -36,8 +36,8 @@ conditions where mmap() can be supported: 2. If CONFIG_FS_RAMMAP is defined in the configuration, then mmap() will support simulation of memory mapped files by copying files whole into RAM. These copied files have some of the properties of - standard memory mapped files. There are many, many exceptions - exceptions, however. Some of these include: + standard memory mapped files. There are many, many exceptions, + however. Some of these include: a. The goal is to have a single region of memory that represents a single file and can be shared by many threads. That is, given a filename a |