Calypso update from Denis Carkiki. Adds UWire driver and support for external memory in NuttX heap

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4733 42af7a65-404d-4744-a932-0658087f49c3

10 files changed, 130 insertions, 115 deletions

diff --git a/nuttx/configs/compal_e88/README.txt b/nuttx/configs/compal_e88/README.txt
index 2d2839b61..05f943100 100755
--- a/nuttx/configs/compal_e88/README.txt
+++ b/nuttx/configs/compal_e88/README.txt
@@ -1,51 +1,52 @@
-compal_e88

-==========

-

-This directory contains the board support for compal e88 phones.

-

-This port is based on patches contributed by Denis Carikli for both the

-compal e99 and e88. At the time of initial check-in, the following phones

-were tested:

-

-* motorolla c155 (compal e99) with the compalram and highram configuration

-* motorolla W220 (compal e88)

-* The openmoko freerunner baseband(compal e88)

-

-The patches were made by Alan Carvalho de Assis and Denis Carikli using

-the Stefan Richter's patches that can be found here:

-

-http://cgit.osmocom.org/cgit/nuttx-bb/log/?h=lputt%2Ftesting

-

-Osmocom-BB Dependencies and Sercomm

-===================================

-

-The build environment assumes that you have the osmocom-bb project

-directory at same level as the nuttx project:

-

-  |- nuttx

-  |- apps

-  `- osmocom-bb

-

-If you attempt to build this configuration without osmocom-bb, you will

-get compilation errors in drivers/sercomm due to header files that are

-needed from the osmocom-bb directory.

-

-By default, NuttX will use sercomm (HDLC protocol) to communicate with the

-host system. Sercomm is the transport used by osmocom-bb that runs on top

-of serial.  See http://bb.osmocom.org/trac/wiki/nuttx-bb/run for detailed

-the usage of nuttx with sercomm.

-

-Loading NuttX

-=============

-

-The osmocom-bb wiki describes how to load NuttX.  See

-http://bb.osmocom.org/trac/wiki/nuttx-bb for detailed information.

-The way that nuttx is loaded depends on the configuration (highram/compalram)

-and phone:

-

-o compalram is for the ramloader(for phone having a bootloader on flash)

-o highram is for phones having the romloader(if the phone has a bootrom)

-  or for loading in the ram trough a special loader(loaded first on ram

-  by talking to the ramloader) when having a ramloader(which can only

-  load 64k).

-

+compal_e88
+==========
+
+This directory contains the board support for compal e88 phones.
+
+This port is based on patches contributed by Denis Carikli for both the
+compal e99 and e88. At the time of initial check-in, the following phones
+were tested:
+
+* motorolla c155 (compal e99) with the compalram and highram configuration
+* motorolla W220 (compal e88)
+* The openmoko freerunner baseband(compal e88)
+
+The patches were made by Alan Carvalho de Assis and Denis Carikli using
+the Stefan Richter's patches that can be found here:
+
+http://cgit.osmocom.org/cgit/nuttx-bb/log/?h=lputt%2Ftesting
+
+Osmocom-BB Dependencies and Sercomm
+===================================
+
+The build environment assumes that you have the osmocom-bb project
+directory at same level as the nuttx project:
+
+  |- nuttx
+  |- apps
+  `- osmocom-bb
+
+If you attempt to build this configuration without osmocom-bb, and that
+you added support for sercomm in your configuration(CONFIG_SERCOMM_CONSOLE=y) 
+you will get compilation errors in drivers/sercomm due to header files that 
+are needed from the osmocom-bb directory.
+
+By default, NuttX will not use sercomm (HDLC protocol) to communicate with 
+the host system. Sercomm is the transport used by osmocom-bb that runs on top
+of serial.  See http://bb.osmocom.org/trac/wiki/nuttx-bb/run for detailed
+the usage of nuttx with sercomm.
+
+Loading NuttX
+=============
+
+The osmocom-bb wiki describes how to load NuttX.  See
+http://bb.osmocom.org/trac/wiki/nuttx-bb for detailed information.
+The way that nuttx is loaded depends on the configuration (highram/compalram)
+and phone:
+
+o compalram is for the ramloader(for phone having a bootloader on flash)
+o highram is for phones having the romloader(if the phone has a bootrom)
+  or for loading in the ram trough a special loader(loaded first on ram
+  by talking to the ramloader) when having a ramloader(which can only
+  load 64k).
+
diff --git a/nuttx/configs/compal_e88/nsh_highram/Make.defs b/nuttx/configs/compal_e88/nsh_highram/Make.defs
index 0af7320a2..1679a13fb 100644
--- a/nuttx/configs/compal_e88/nsh_highram/Make.defs
+++ b/nuttx/configs/compal_e88/nsh_highram/Make.defs
@@ -35,12 +35,14 @@
 
 include ${TOPDIR}/.config
 
+ifeq ("${CONFIG_SERCOMM_CONSOLE}","y")
 OSMODIR			= $(TOPDIR)/../../osmocom-bb
 EXTRA_LIBS		= $(OSMODIR)/src/target/firmware/comm/libcomm.a \
 			  $(OSMODIR)/src/shared/libosmocore/build-target/src/.libs/libosmocore.a \
 			  $(OSMODIR)/src/target/firmware/calypso/libcalypso.a \
 			  $(OSMODIR)/src/target/firmware/comm/libcomm.a
 			# ^^^ Stupid hack! Why do I have to put it twice???
+endif
 
 CROSSDEV		= arm-elf-
 CC			= $(CROSSDEV)gcc
diff --git a/nuttx/configs/compal_e88/nsh_highram/defconfig b/nuttx/configs/compal_e88/nsh_highram/defconfig
index 63d46440e..1e63f5a1d 100644
--- a/nuttx/configs/compal_e88/nsh_highram/defconfig
+++ b/nuttx/configs/compal_e88/nsh_highram/defconfig
@@ -88,7 +88,7 @@ CONFIG_ARCH_STACKDUMP=y
 # CONFIG_UART_*_PARTIY - 0=no parity, 1=odd parity, 2=even parity
 # CONFIG_UART_*_2STOP - Two stop bits
 #
-CONFIG_SERCOMM_CONSOLE=y
+CONFIG_SERCOMM_CONSOLE=n
 CONFIG_SERIAL_IRDA_CONSOLE=n
 CONFIG_UART_IRDA_HWFLOWCONTROL=n
 CONFIG_UART_MODEM_HWFLOWCONTROL=n
@@ -104,6 +104,7 @@ CONFIG_UART_IRDA_PARITY=0
 CONFIG_UART_MODEM_PARITY=0
 CONFIG_UART_IRDA_2STOP=0
 CONFIG_UART_MODEM_2STOP=0
+CONFIG_STDIO_LINE_BUFFER=y
 
 #
 # C5471 Ethernet Driver settings
@@ -205,7 +206,7 @@ CONFIG_HAVE_LIBM=n
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
-CONFIG_MM_REGIONS=2
+CONFIG_MM_REGIONS=1
 CONFIG_ARCH_LOWPUTC=y
 CONFIG_RR_INTERVAL=200
 CONFIG_SCHED_INSTRUMENTATION=n
@@ -246,7 +247,7 @@ CONFIG_DISABLE_PTHREAD=n
 CONFIG_DISABLE_SIGNALS=n
 CONFIG_DISABLE_MQUEUE=y
 CONFIG_DISABLE_MOUNTPOINT=n
-CONFIG_DISABLE_ENVIRON=y
+CONFIG_DISABLE_ENVIRON=n
 CONFIG_DISABLE_POLL=y
 
 #
diff --git a/nuttx/configs/compal_e99/README.txt b/nuttx/configs/compal_e99/README.txt
index 7126e5f12..e35e1234a 100755
--- a/nuttx/configs/compal_e99/README.txt
+++ b/nuttx/configs/compal_e99/README.txt
@@ -1,51 +1,52 @@
-compal_e99

-==========

-

-This directory contains the board support for compal e99 phones.

-

-This port is based on patches contributed by Denis Carikli for both the

-compal e99 and e88. At the time of initial check-in, the following phones

-were tested:

-

-* motorolla c155 (compal e99) with the compalram and highram configuration

-* motorolla W220 (compal e88)

-* The openmoko freerunner baseband(compal e88)

-

-The patches were made by Alan Carvalho de Assis and Denis Carikli using

-the Stefan Richter's patches that can be found here:

-

-http://cgit.osmocom.org/cgit/nuttx-bb/log/?h=lputt%2Ftesting

-

-Osmocom-BB Dependencies and Sercomm

-===================================

-

-The build environment assumes that you have the osmocom-bb project

-directory at same level as the nuttx project:

-

-  |- nuttx

-  |- apps

-  `- osmocom-bb

-

-If you attempt to build this configuration without osmocom-bb, you will

-get compilation errors in drivers/sercomm due to header files that are

-needed from the osmocom-bb directory.

-

-By default, NuttX will use sercomm (HDLC protocol) to communicate with the

-host system. Sercomm is the transport used by osmocom-bb that runs on top

-of serial.  See http://bb.osmocom.org/trac/wiki/nuttx-bb/run for detailed

-the usage of nuttx with sercomm.

-

-Loading NuttX

-=============

-

-The osmocom-bb wiki describes how to load NuttX.  See

-http://bb.osmocom.org/trac/wiki/nuttx-bb for detailed information.

-The way that nuttx is loaded depends on the configuration (highram/compalram)

-and phone:

-

-o compalram is for the ramloader(for phone having a bootloader on flash)

-o highram is for phones having the romloader(if the phone has a bootrom)

-  or for loading in the ram trough a special loader(loaded first on ram

-  by talking to the ramloader) when having a ramloader(which can only

-  load 64k).

-

+compal_e99
+==========
+
+This directory contains the board support for compal e99 phones.
+
+This port is based on patches contributed by Denis Carikli for both the
+compal e99 and e88. At the time of initial check-in, the following phones
+were tested:
+
+* motorolla c155 (compal e99) with the compalram and highram configuration
+* motorolla W220 (compal e88)
+* The openmoko freerunner baseband(compal e88)
+
+The patches were made by Alan Carvalho de Assis and Denis Carikli using
+the Stefan Richter's patches that can be found here:
+
+http://cgit.osmocom.org/cgit/nuttx-bb/log/?h=lputt%2Ftesting
+
+Osmocom-BB Dependencies and Sercomm
+===================================
+
+The build environment assumes that you have the osmocom-bb project
+directory at same level as the nuttx project:
+
+  |- nuttx
+  |- apps
+  `- osmocom-bb
+
+If you attempt to build this configuration without osmocom-bb, and that
+you added support for sercomm in your configuration(CONFIG_SERCOMM_CONSOLE=y) 
+you will get compilation errors in drivers/sercomm due to header files that 
+are needed from the osmocom-bb directory.
+
+By default, NuttX will not use sercomm (HDLC protocol) to communicate with 
+the host system. Sercomm is the transport used by osmocom-bb that runs on top
+of serial.  See http://bb.osmocom.org/trac/wiki/nuttx-bb/run for detailed
+the usage of nuttx with sercomm.
+
+Loading NuttX
+=============
+
+The osmocom-bb wiki describes how to load NuttX.  See
+http://bb.osmocom.org/trac/wiki/nuttx-bb for detailed information.
+The way that nuttx is loaded depends on the configuration (highram/compalram)
+and phone:
+
+o compalram is for the ramloader(for phone having a bootloader on flash)
+o highram is for phones having the romloader(if the phone has a bootrom)
+  or for loading in the ram trough a special loader(loaded first on ram
+  by talking to the ramloader) when having a ramloader(which can only
+  load 64k).
+
diff --git a/nuttx/configs/compal_e99/nsh_compalram/Make.defs b/nuttx/configs/compal_e99/nsh_compalram/Make.defs
index ef5636a9f..9ff9a66ca 100644
--- a/nuttx/configs/compal_e99/nsh_compalram/Make.defs
+++ b/nuttx/configs/compal_e99/nsh_compalram/Make.defs
@@ -35,12 +35,14 @@
 
 include ${TOPDIR}/.config
 
+ifeq ("${CONFIG_SERCOMM_CONSOLE}","y")
 OSMODIR			= $(TOPDIR)/../../osmocom-bb
 EXTRA_LIBS		= $(OSMODIR)/src/target/firmware/comm/libcomm.a \
 			  $(OSMODIR)/src/shared/libosmocore/build-target/src/.libs/libosmocore.a \
 			  $(OSMODIR)/src/target/firmware/calypso/libcalypso.a \
 			  $(OSMODIR)/src/target/firmware/comm/libcomm.a
 			# ^^^ Stupid hack! Why do I have to put it twice???
+endif
 
 CROSSDEV		= arm-elf-
 CC			= $(CROSSDEV)gcc
diff --git a/nuttx/configs/compal_e99/nsh_compalram/defconfig b/nuttx/configs/compal_e99/nsh_compalram/defconfig
index 7dfc465fb..f391e2a65 100644
--- a/nuttx/configs/compal_e99/nsh_compalram/defconfig
+++ b/nuttx/configs/compal_e99/nsh_compalram/defconfig
@@ -69,6 +69,9 @@ CONFIG_ARCH_BOARD_COMPALE99=y
 CONFIG_BOARD_LOOPSPERMSEC=1250
 CONFIG_ROM_VECTORS=n
 CONFIG_DRAM_END=0x00840000
+CONFIG_MM_REGIONS=2
+CONFIG_HEAP2_START=0x01000000
+CONFIG_HEAP2_END=0x01200000
 CONFIG_ARCH_LEDS=n
 CONFIG_ARCH_INTERRUPTSTACK=1024
 CONFIG_ARCH_STACKDUMP=y
@@ -88,7 +91,7 @@ CONFIG_ARCH_STACKDUMP=y
 # CONFIG_UART_*_PARTIY - 0=no parity, 1=odd parity, 2=even parity
 # CONFIG_UART_*_2STOP - Two stop bits
 #
-CONFIG_SERCOMM_CONSOLE=y
+CONFIG_SERCOMM_CONSOLE=n
 CONFIG_SERIAL_IRDA_CONSOLE=n
 CONFIG_UART_IRDA_HWFLOWCONTROL=n
 CONFIG_UART_MODEM_HWFLOWCONTROL=n
@@ -104,6 +107,7 @@ CONFIG_UART_IRDA_PARITY=0
 CONFIG_UART_MODEM_PARITY=0
 CONFIG_UART_IRDA_2STOP=0
 CONFIG_UART_MODEM_2STOP=0
+CONFIG_STDIO_LINE_BUFFER=y
 
 #
 # C5471 Ethernet Driver settings
@@ -205,7 +209,6 @@ CONFIG_HAVE_LIBM=n
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
-CONFIG_MM_REGIONS=2
 CONFIG_ARCH_LOWPUTC=y
 CONFIG_RR_INTERVAL=200
 CONFIG_SCHED_INSTRUMENTATION=n
@@ -246,7 +249,7 @@ CONFIG_DISABLE_PTHREAD=n
 CONFIG_DISABLE_SIGNALS=n
 CONFIG_DISABLE_MQUEUE=y
 CONFIG_DISABLE_MOUNTPOINT=n
-CONFIG_DISABLE_ENVIRON=y
+CONFIG_DISABLE_ENVIRON=n
 CONFIG_DISABLE_POLL=y
 
 #
diff --git a/nuttx/configs/compal_e99/nsh_compalram/ld.script b/nuttx/configs/compal_e99/nsh_compalram/ld.script
index 07f1ab001..52554ddac 100644
--- a/nuttx/configs/compal_e99/nsh_compalram/ld.script
+++ b/nuttx/configs/compal_e99/nsh_compalram/ld.script
@@ -12,9 +12,9 @@ ENTRY(__start)
 MEMORY
 {
     /* compal-loaded binary: our text, initialized data */
-    LRAM (rw) : ORIGIN = 0x00800000, LENGTH = 0x00010000
+    LRAM (rw) : ORIGIN = 0x00800000, LENGTH = 0x00020000
     /* compal-loaded binary: our unitialized data, stacks, heap */
-    IRAM (rw) : ORIGIN = 0x00810000, LENGTH = 0x00010000
+    IRAM (rw) : ORIGIN = 0x00820000, LENGTH = 0x00020000
 }
 SECTIONS
 {
diff --git a/nuttx/configs/compal_e99/nsh_highram/Make.defs b/nuttx/configs/compal_e99/nsh_highram/Make.defs
index 0af7320a2..1679a13fb 100644
--- a/nuttx/configs/compal_e99/nsh_highram/Make.defs
+++ b/nuttx/configs/compal_e99/nsh_highram/Make.defs
@@ -35,12 +35,14 @@
 
 include ${TOPDIR}/.config
 
+ifeq ("${CONFIG_SERCOMM_CONSOLE}","y")
 OSMODIR			= $(TOPDIR)/../../osmocom-bb
 EXTRA_LIBS		= $(OSMODIR)/src/target/firmware/comm/libcomm.a \
 			  $(OSMODIR)/src/shared/libosmocore/build-target/src/.libs/libosmocore.a \
 			  $(OSMODIR)/src/target/firmware/calypso/libcalypso.a \
 			  $(OSMODIR)/src/target/firmware/comm/libcomm.a
 			# ^^^ Stupid hack! Why do I have to put it twice???
+endif
 
 CROSSDEV		= arm-elf-
 CC			= $(CROSSDEV)gcc
diff --git a/nuttx/configs/compal_e99/nsh_highram/defconfig b/nuttx/configs/compal_e99/nsh_highram/defconfig
index 919cfc3e3..dea94f8a3 100644
--- a/nuttx/configs/compal_e99/nsh_highram/defconfig
+++ b/nuttx/configs/compal_e99/nsh_highram/defconfig
@@ -69,6 +69,9 @@ CONFIG_ARCH_BOARD_COMPALE99=y
 CONFIG_BOARD_LOOPSPERMSEC=1250
 CONFIG_ROM_VECTORS=n
 CONFIG_DRAM_END=0x00840000
+CONFIG_MM_REGIONS=2
+CONFIG_HEAP2_START=0x01000000
+CONFIG_HEAP2_END=0x01200000
 CONFIG_ARCH_LEDS=n
 CONFIG_ARCH_INTERRUPTSTACK=1024
 CONFIG_ARCH_STACKDUMP=y
@@ -88,7 +91,7 @@ CONFIG_ARCH_STACKDUMP=y
 # CONFIG_UART_*_PARTIY - 0=no parity, 1=odd parity, 2=even parity
 # CONFIG_UART_*_2STOP - Two stop bits
 #
-CONFIG_SERCOMM_CONSOLE=y
+CONFIG_SERCOMM_CONSOLE=n
 CONFIG_SERIAL_IRDA_CONSOLE=n
 CONFIG_UART_IRDA_HWFLOWCONTROL=n
 CONFIG_UART_MODEM_HWFLOWCONTROL=n
@@ -104,6 +107,7 @@ CONFIG_UART_IRDA_PARITY=0
 CONFIG_UART_MODEM_PARITY=0
 CONFIG_UART_IRDA_2STOP=0
 CONFIG_UART_MODEM_2STOP=0
+CONFIG_STDIO_LINE_BUFFER=y
 
 #
 # C5471 Ethernet Driver settings
@@ -205,7 +209,6 @@ CONFIG_HAVE_LIBM=n
 CONFIG_DEBUG=n
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_DEBUG_SYMBOLS=n
-CONFIG_MM_REGIONS=2
 CONFIG_ARCH_LOWPUTC=y
 CONFIG_RR_INTERVAL=200
 CONFIG_SCHED_INSTRUMENTATION=n
@@ -246,7 +249,7 @@ CONFIG_DISABLE_PTHREAD=n
 CONFIG_DISABLE_SIGNALS=n
 CONFIG_DISABLE_MQUEUE=y
 CONFIG_DISABLE_MOUNTPOINT=n
-CONFIG_DISABLE_ENVIRON=y
+CONFIG_DISABLE_ENVIRON=n
 CONFIG_DISABLE_POLL=y
 
 #
diff --git a/nuttx/configs/compal_e99/nsh_highram/ld.script b/nuttx/configs/compal_e99/nsh_highram/ld.script
index 7096a61bb..8295e052c 100644
--- a/nuttx/configs/compal_e99/nsh_highram/ld.script
+++ b/nuttx/configs/compal_e99/nsh_highram/ld.script
@@ -14,9 +14,9 @@ MEMORY
     /* 0x800000-0xa00000 */
     /* compal-loaded binary: our text, initialized data */
     LRAM (rw) : ORIGIN = 0x00800000, LENGTH = 0x00020000
-    TRAM (rw) : ORIGIN = 0x00820000, LENGTH = 0x00020000
+    TRAM (rw) : ORIGIN = 0x00820000, LENGTH = 0x00019000
     /* compal-loaded binary: our unitialized data, stacks, heap */
-    IRAM (rw) : ORIGIN = 0x00840000, LENGTH = 0x00010000
+    IRAM (rw) : ORIGIN = 0x00839000, LENGTH = 0x00006000
 }
 SECTIONS
 {