diff options
Diffstat (limited to 'nuttx/configs/sam3u-ek')
-rw-r--r-- | nuttx/configs/sam3u-ek/kernel/up_userspace.c | 2 | ||||
-rw-r--r-- | nuttx/configs/sam3u-ek/scripts/memory.ld | 14 |
2 files changed, 11 insertions, 5 deletions
diff --git a/nuttx/configs/sam3u-ek/kernel/up_userspace.c b/nuttx/configs/sam3u-ek/kernel/up_userspace.c index 484cdc2d0..06a4d935e 100644 --- a/nuttx/configs/sam3u-ek/kernel/up_userspace.c +++ b/nuttx/configs/sam3u-ek/kernel/up_userspace.c @@ -111,7 +111,7 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) = /* Signal handler trampoline */ #ifndef CONFIG_DISABLE_SIGNALS - .signal_handler = signal_handler, + .signal_handler = up_signal_handler, #endif /* Memory manager entry points (declared in include/nuttx/mm.h) */ diff --git a/nuttx/configs/sam3u-ek/scripts/memory.ld b/nuttx/configs/sam3u-ek/scripts/memory.ld index 13405f408..43fca9478 100644 --- a/nuttx/configs/sam3u-ek/scripts/memory.ld +++ b/nuttx/configs/sam3u-ek/scripts/memory.ld @@ -51,11 +51,15 @@ * requirement also increases. * * This alignment requirement means that the largest user space FLASH region - * you can have will be 2128KB at it would have to be positioned at - * 0x000a0000. If you change this address, don't forget to chagne the + * you can have will be 128KB at it would have to be positioned at + * 0x000a0000. If you change this address, don't forget to change the * CONFIG_NUTTX_USERSPACE configuration setting to match and to modify * the check in kernel/userspace.c. * + * For the same reasons, the maximum size of the SRAM mapping is limited to + * 4KB. Both of these alignment limitations could be reduced by using + * multiple regions to map the FLASH/SDRAM range. + * * A detailed memory map for the 16Kb SRAM region is as follows: * * 0x20000 0000: Kernel .data region. Typical size: 0.1KB @@ -77,12 +81,14 @@ MEMORY /* 256Kb FLASH */ kflash (rx) : ORIGIN = 0x00080000, LENGTH = 64K - uflash (rx) : ORIGIN = 0x00090000, LENGTH = 192K + uflash (rx) : ORIGIN = 0x00090000, LENGTH = 64K + xflash (rx) : ORIGIN = 0x000a0000, LENGTH = 128K /* 32Kb SRAM */ ksram1 (rwx) : ORIGIN = 0x20000000, LENGTH = 4K - usram1 (rwx) : ORIGIN = 0x20001000, LENGTH = 28K + usram1 (rwx) : ORIGIN = 0x20001000, LENGTH = 4K + xsram1 (rwx) : ORIGIN = 0x20001000, LENGTH = 24K /* 16Kb SRAM */ |