diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-08-29 14:27:58 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-08-29 14:27:58 +0000 |
commit | 3701c8c5e72d862fcec6c3ee4419215622418237 (patch) | |
tree | 57283df037129ab49ab6c4155ae6d6383ec2fccb /nuttx/configs/ea3131/pgnsh | |
parent | b31aeb387646c04061abf1e0544d39c92744f1f1 (diff) | |
download | px4-nuttx-3701c8c5e72d862fcec6c3ee4419215622418237.tar.gz px4-nuttx-3701c8c5e72d862fcec6c3ee4419215622418237.tar.bz2 px4-nuttx-3701c8c5e72d862fcec6c3ee4419215622418237.zip |
Two pass build for on-demand paging now works
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2896 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs/ea3131/pgnsh')
-rwxr-xr-x | nuttx/configs/ea3131/pgnsh/defconfig | 4 | ||||
-rwxr-xr-x | nuttx/configs/ea3131/pgnsh/ld.script | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/nuttx/configs/ea3131/pgnsh/defconfig b/nuttx/configs/ea3131/pgnsh/defconfig index db542a647..58480f875 100755 --- a/nuttx/configs/ea3131/pgnsh/defconfig +++ b/nuttx/configs/ea3131/pgnsh/defconfig @@ -202,8 +202,8 @@ CONFIG_HAVE_LIBM=n # Setup for a two-pass build # CONFIG_BUILD_2PASS=y -CONFIG_PASS1_DIR=configs/ea3131/locked -CONFIG_PASS1_LIB=locked.r +CONFIG_PASS1_BUILDIR=configs/ea3131/locked +CONFIG_PASS1_OBJECT=locked.r # # General OS setup diff --git a/nuttx/configs/ea3131/pgnsh/ld.script b/nuttx/configs/ea3131/pgnsh/ld.script index 0dc768257..131ee62f9 100755 --- a/nuttx/configs/ea3131/pgnsh/ld.script +++ b/nuttx/configs/ea3131/pgnsh/ld.script @@ -32,7 +32,7 @@ * POSSIBILITY OF SUCH DAMAGE. * ****************************************************************************/ - + /* The LPC3131 has 192Kb of ISRAM beginning at virtual address 0x1102:8000. * LPC313x boot ROM expects the boot image be compiled with entry point at * 0x1102:9000. A 128b header will appear at this address (applied by @@ -45,6 +45,10 @@ * locked - Pages locked in memory. Start: 0x1102 8000 Size: 36Kb * paged - Pages in nonvolatile store. Start: 0x1103 1000 Size: 384Kb * data - .data/.bss/heap. Start: 0x1109 1000 Size: 44Kb + * + * These region sizes must match the size in pages specified for each region + * in the NuttX configuration file: CONFIG_PAGING_NLOCKED, CONFIG_PAGING_NVPAGED, + * and CONFIG_PAGING_NDATA. */ MEMORY @@ -61,10 +65,10 @@ SECTIONS .locked : { _slocked = ABSOLUTE(.); *(.vectors) - *(.locked) + locked.r (.text) _elocked = ABSOLUTE(.); } >locked - _eronly = ABSOLUTE(.); /* See below */ + _eronly = ABSOLUTE(.); .paged : { _spaged = ABSOLUTE(.); |