From dacf6b4b8ffb1881458b1b5e32178ff2b696eb51 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Mon, 17 Oct 2011 17:52:55 +0000
Subject: [PATCH] Fix PIC32 ramfunc logic; add rectangle graphic functions

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4050 42af7a65-404d-4744-a932-0658087f49c3
---
 configs/pcblogic-pic32mx/ostest/defconfig | 5 +++++
 configs/pcblogic-pic32mx/ostest/ld.script | 4 ++--
 configs/pic32-starterkit/ostest/defconfig | 5 +++++
 configs/pic32-starterkit/ostest/ld.script | 4 ++--
 configs/sure-pic32mx/ostest/defconfig     | 5 +++++
 configs/sure-pic32mx/ostest/ld.script     | 4 ++--
 6 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/configs/pcblogic-pic32mx/ostest/defconfig b/configs/pcblogic-pic32mx/ostest/defconfig
index c6057e87501..4c796fa2ef4 100644
--- a/configs/pcblogic-pic32mx/ostest/defconfig
+++ b/configs/pcblogic-pic32mx/ostest/defconfig
@@ -90,6 +90,11 @@ CONFIG_ARCH_BUTTONS=n
 CONFIG_ARCH_CALIBRATION=n
 CONFIG_ARCH_DMA=n
 
+#
+# Enable support for RAM-based functions
+#
+CONFIG_PIC32MX_RAMFUNCS=y
+
 #
 # Identify toolchain and linker options
 #
diff --git a/configs/pcblogic-pic32mx/ostest/ld.script b/configs/pcblogic-pic32mx/ostest/ld.script
index 4e856ac2514..139803c58bf 100644
--- a/configs/pcblogic-pic32mx/ostest/ld.script
+++ b/configs/pcblogic-pic32mx/ostest/ld.script
@@ -189,7 +189,7 @@ SECTIONS
 	/* RAM functions are positioned at the beginning of RAM so that
 	 * they can be guaranteed to satisfy the 2Kb alignment requirement.
 	 */
-/*
+
 	.ramfunc ALIGN(2K) :
 	{
 		_sramfunc =  ABSOLUTE(.);
@@ -202,7 +202,7 @@ SECTIONS
 	_bmxdkpba_address = _sramfunc - ORIGIN(kseg1_datamem) ;
 	_bmxdudba_address = LENGTH(kseg1_datamem) ;
 	_bmxdupba_address = LENGTH(kseg1_datamem) ;
-*/
+
 	.dbg_data (NOLOAD) :
 	{
 		. += (DEFINED (_DEBUGGER) ? 0x200 : 0x0);
diff --git a/configs/pic32-starterkit/ostest/defconfig b/configs/pic32-starterkit/ostest/defconfig
index 7ba6115590f..33e0d703d83 100644
--- a/configs/pic32-starterkit/ostest/defconfig
+++ b/configs/pic32-starterkit/ostest/defconfig
@@ -90,6 +90,11 @@ CONFIG_ARCH_BUTTONS=n
 CONFIG_ARCH_CALIBRATION=n
 CONFIG_ARCH_DMA=n
 
+#
+# Enable support for RAM-based functions
+#
+CONFIG_PIC32MX_RAMFUNCS=y
+
 #
 # Identify toolchain and linker options
 #
diff --git a/configs/pic32-starterkit/ostest/ld.script b/configs/pic32-starterkit/ostest/ld.script
index 35131d9d705..c9e85d05955 100644
--- a/configs/pic32-starterkit/ostest/ld.script
+++ b/configs/pic32-starterkit/ostest/ld.script
@@ -189,7 +189,7 @@ SECTIONS
 	/* RAM functions are positioned at the beginning of RAM so that
 	 * they can be guaranteed to satisfy the 2Kb alignment requirement.
 	 */
-/*
+
 	.ramfunc ALIGN(2K) :
 	{
 		_sramfunc =  ABSOLUTE(.);
@@ -202,7 +202,7 @@ SECTIONS
 	_bmxdkpba_address = _sramfunc - ORIGIN(kseg1_datamem) ;
 	_bmxdudba_address = LENGTH(kseg1_datamem) ;
 	_bmxdupba_address = LENGTH(kseg1_datamem) ;
-*/
+
 	.dbg_data (NOLOAD) :
 	{
 		. += (DEFINED (_DEBUGGER) ? 0x200 : 0x0);
diff --git a/configs/sure-pic32mx/ostest/defconfig b/configs/sure-pic32mx/ostest/defconfig
index 88e4649bab4..ed37cc352a5 100644
--- a/configs/sure-pic32mx/ostest/defconfig
+++ b/configs/sure-pic32mx/ostest/defconfig
@@ -90,6 +90,11 @@ CONFIG_ARCH_BUTTONS=n
 CONFIG_ARCH_CALIBRATION=n
 CONFIG_ARCH_DMA=n
 
+#
+# Enable support for RAM-based functions
+#
+CONFIG_PIC32MX_RAMFUNCS=y
+
 #
 # Identify toolchain and linker options
 #
diff --git a/configs/sure-pic32mx/ostest/ld.script b/configs/sure-pic32mx/ostest/ld.script
index fa6eeada1d8..e1e5cc258a5 100644
--- a/configs/sure-pic32mx/ostest/ld.script
+++ b/configs/sure-pic32mx/ostest/ld.script
@@ -189,7 +189,7 @@ SECTIONS
 	/* RAM functions are positioned at the beginning of RAM so that
 	 * they can be guaranteed to satisfy the 2Kb alignment requirement.
 	 */
-/*
+
 	.ramfunc ALIGN(2K) :
 	{
 		_sramfunc =  ABSOLUTE(.);
@@ -202,7 +202,7 @@ SECTIONS
 	_bmxdkpba_address = _sramfunc - ORIGIN(kseg1_datamem) ;
 	_bmxdudba_address = LENGTH(kseg1_datamem) ;
 	_bmxdupba_address = LENGTH(kseg1_datamem) ;
-*/
+
 	.dbg_data (NOLOAD) :
 	{
 		. += (DEFINED (_DEBUGGER) ? 0x200 : 0x0);