diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-10-17 19:07:20 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-10-17 19:07:20 +0000 |
| commit | 225165e72cdd19b741bac642d2bddce9882c50d5 (patch) | |
| tree | c8dccd76701ea46b83e6b27c391a747ea9bbd19a | |
| parent | 7e2a9480386b598282aee7c5135a545da0b839d9 (diff) | |
| download | nuttx-225165e72cdd19b741bac642d2bddce9882c50d5.tar.gz nuttx-225165e72cdd19b741bac642d2bddce9882c50d5.tar.bz2 nuttx-225165e72cdd19b741bac642d2bddce9882c50d5.zip | |
Re-disable PIC32 ramfuncs
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4051 42af7a65-404d-4744-a932-0658087f49c3
| -rw-r--r-- | nuttx/configs/pcblogic-pic32mx/ostest/defconfig | 3 | ||||
| -rw-r--r-- | nuttx/configs/pcblogic-pic32mx/ostest/ld.script | 6 | ||||
| -rw-r--r-- | nuttx/configs/pic32-starterkit/ostest/defconfig | 3 | ||||
| -rw-r--r-- | nuttx/configs/pic32-starterkit/ostest/ld.script | 6 | ||||
| -rw-r--r-- | nuttx/configs/sure-pic32mx/ostest/defconfig | 3 | ||||
| -rw-r--r-- | nuttx/configs/sure-pic32mx/ostest/ld.script | 12 |
6 files changed, 21 insertions, 12 deletions
diff --git a/nuttx/configs/pcblogic-pic32mx/ostest/defconfig b/nuttx/configs/pcblogic-pic32mx/ostest/defconfig index 4c796fa2e..1f29f0e32 100644 --- a/nuttx/configs/pcblogic-pic32mx/ostest/defconfig +++ b/nuttx/configs/pcblogic-pic32mx/ostest/defconfig @@ -92,8 +92,9 @@ CONFIG_ARCH_DMA=n # # Enable support for RAM-based functions +# (If selected, then modifications are needed in ld.script as well) # -CONFIG_PIC32MX_RAMFUNCS=y +CONFIG_PIC32MX_RAMFUNCS=n # # Identify toolchain and linker options diff --git a/nuttx/configs/pcblogic-pic32mx/ostest/ld.script b/nuttx/configs/pcblogic-pic32mx/ostest/ld.script index 139803c58..25df40f0a 100644 --- a/nuttx/configs/pcblogic-pic32mx/ostest/ld.script +++ b/nuttx/configs/pcblogic-pic32mx/ostest/ld.script @@ -190,7 +190,8 @@ SECTIONS * they can be guaranteed to satisfy the 2Kb alignment requirement. */ - .ramfunc ALIGN(2K) : +/* This causes failures if there are no RAM functions + .ramfunc /* ALIGN(2K) */ : { _sramfunc = ABSOLUTE(.); *(.ramfunc .ramfunc.*) @@ -198,10 +199,11 @@ SECTIONS } > kseg1_datamem AT > kseg0_progmem _ramfunc_loadaddr = LOADADDR(.ramfunc); - _ramfunc_sizeof = SIZEOF(.ramfunc); + _ramfunc_sizeof = SIZEOF(.ramfunc); _bmxdkpba_address = _sramfunc - ORIGIN(kseg1_datamem) ; _bmxdudba_address = LENGTH(kseg1_datamem) ; _bmxdupba_address = LENGTH(kseg1_datamem) ; +*/ .dbg_data (NOLOAD) : { diff --git a/nuttx/configs/pic32-starterkit/ostest/defconfig b/nuttx/configs/pic32-starterkit/ostest/defconfig index 33e0d703d..64eaf5fe2 100644 --- a/nuttx/configs/pic32-starterkit/ostest/defconfig +++ b/nuttx/configs/pic32-starterkit/ostest/defconfig @@ -92,8 +92,9 @@ CONFIG_ARCH_DMA=n # # Enable support for RAM-based functions +# (If selected, then modifications are needed in ld.script as well) # -CONFIG_PIC32MX_RAMFUNCS=y +CONFIG_PIC32MX_RAMFUNCS=n # # Identify toolchain and linker options diff --git a/nuttx/configs/pic32-starterkit/ostest/ld.script b/nuttx/configs/pic32-starterkit/ostest/ld.script index c9e85d059..9bdd45175 100644 --- a/nuttx/configs/pic32-starterkit/ostest/ld.script +++ b/nuttx/configs/pic32-starterkit/ostest/ld.script @@ -190,7 +190,8 @@ SECTIONS * they can be guaranteed to satisfy the 2Kb alignment requirement. */ - .ramfunc ALIGN(2K) : +/* This causes failures if there are no RAM functions + .ramfunc /* ALIGN(2K) */ : { _sramfunc = ABSOLUTE(.); *(.ramfunc .ramfunc.*) @@ -198,10 +199,11 @@ SECTIONS } > kseg1_datamem AT > kseg0_progmem _ramfunc_loadaddr = LOADADDR(.ramfunc); - _ramfunc_sizeof = SIZEOF(.ramfunc); + _ramfunc_sizeof = SIZEOF(.ramfunc); _bmxdkpba_address = _sramfunc - ORIGIN(kseg1_datamem) ; _bmxdudba_address = LENGTH(kseg1_datamem) ; _bmxdupba_address = LENGTH(kseg1_datamem) ; +*/ .dbg_data (NOLOAD) : { diff --git a/nuttx/configs/sure-pic32mx/ostest/defconfig b/nuttx/configs/sure-pic32mx/ostest/defconfig index ed37cc352..6ee48fd5f 100644 --- a/nuttx/configs/sure-pic32mx/ostest/defconfig +++ b/nuttx/configs/sure-pic32mx/ostest/defconfig @@ -92,8 +92,9 @@ CONFIG_ARCH_DMA=n # # Enable support for RAM-based functions +# (If selected, then modifications are needed in ld.script as well) # -CONFIG_PIC32MX_RAMFUNCS=y +CONFIG_PIC32MX_RAMFUNCS=n # # Identify toolchain and linker options diff --git a/nuttx/configs/sure-pic32mx/ostest/ld.script b/nuttx/configs/sure-pic32mx/ostest/ld.script index e1e5cc258..2da162586 100644 --- a/nuttx/configs/sure-pic32mx/ostest/ld.script +++ b/nuttx/configs/sure-pic32mx/ostest/ld.script @@ -190,18 +190,20 @@ SECTIONS * they can be guaranteed to satisfy the 2Kb alignment requirement. */ - .ramfunc ALIGN(2K) : +/* This causes failures if there are no RAM functions + .ramfunc /* ALIGN(2K) */ : { - _sramfunc = ABSOLUTE(.); - *(.ramfunc .ramfunc.*) - _eramfunc = ABSOLUTE(.); + _sramfunc = ABSOLUTE(.); + *(.ramfunc .ramfunc.*) + _eramfunc = ABSOLUTE(.); } > kseg1_datamem AT > kseg0_progmem _ramfunc_loadaddr = LOADADDR(.ramfunc); - _ramfunc_sizeof = SIZEOF(.ramfunc); + _ramfunc_sizeof = SIZEOF(.ramfunc); _bmxdkpba_address = _sramfunc - ORIGIN(kseg1_datamem) ; _bmxdudba_address = LENGTH(kseg1_datamem) ; _bmxdupba_address = LENGTH(kseg1_datamem) ; +*/ .dbg_data (NOLOAD) : { |