diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-03-23 14:46:02 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-03-23 14:46:02 +0000 |
| commit | a8cb02138ce460fbd66d242d34dda71082062538 (patch) | |
| tree | 85f69dab32369af97249168fb8eb32b976ceeb40 /nuttx/configs/open1788 | |
| parent | f4a74d79f3111b79f408eb4070e125cad78e9082 (diff) | |
| download | px4-nuttx-a8cb02138ce460fbd66d242d34dda71082062538.tar.gz px4-nuttx-a8cb02138ce460fbd66d242d34dda71082062538.tar.bz2 px4-nuttx-a8cb02138ce460fbd66d242d34dda71082062538.zip | |
Rework of kernel build signal dispatch to user-space handlers
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5778 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs/open1788')
| -rw-r--r-- | nuttx/configs/open1788/kernel/up_userspace.c | 2 | ||||
| -rw-r--r-- | nuttx/configs/open1788/scripts/memory.ld | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/nuttx/configs/open1788/kernel/up_userspace.c b/nuttx/configs/open1788/kernel/up_userspace.c index b6a9e3df6..bd0703b98 100644 --- a/nuttx/configs/open1788/kernel/up_userspace.c +++ b/nuttx/configs/open1788/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/open1788/scripts/memory.ld b/nuttx/configs/open1788/scripts/memory.ld index a43318279..690c7d3d6 100644 --- a/nuttx/configs/open1788/scripts/memory.ld +++ b/nuttx/configs/open1788/scripts/memory.ld @@ -51,10 +51,14 @@ * * This alignment requirement means that the largest user space FLASH region * you can have will be 256KB at it would have to be positioned at - * 0x00400000. If you change this address, don't forget to chagne the + * 0x00400000. 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 64KB CPU SRAM region is as follows: * * 0x10000 0000: Kernel .data region. Typical size: 0.1KB @@ -76,12 +80,14 @@ MEMORY /* 256Kb FLASH */ kflash (rx) : ORIGIN = 0x00000000, LENGTH = 64K - uflash (rx) : ORIGIN = 0x00010000, LENGTH = 448K + uflash (rx) : ORIGIN = 0x00010000, LENGTH = 64K + xflash (rx) : ORIGIN = 0x00010000, LENGTH = 384K /* 64Kb of SRAM in the CPU block */ ksram (rwx) : ORIGIN = 0x10000000, LENGTH = 4K - usram (rwx) : ORIGIN = 0x10001000, LENGTH = 60K + usram (rwx) : ORIGIN = 0x10001000, LENGTH = 4K + xsram (rwx) : ORIGIN = 0x10001000, LENGTH = 56K /* Other peripheral memory (free, nothing is linked here) */ |