summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nuttx/configs/pcblogic-pic32mx/ostest/defconfig3
-rw-r--r--nuttx/configs/pcblogic-pic32mx/ostest/ld.script6
-rw-r--r--nuttx/configs/pic32-starterkit/ostest/defconfig3
-rw-r--r--nuttx/configs/pic32-starterkit/ostest/ld.script6
-rw-r--r--nuttx/configs/sure-pic32mx/ostest/defconfig3
-rw-r--r--nuttx/configs/sure-pic32mx/ostest/ld.script12
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) :
{