Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-05 15:58:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4733 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2012-05-14 00:22:31 +00:00
parent 20ef82d544
commit 20da6afdbd
10 changed files with 130 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configs/compal_e88/README.txt
+6 -5
View File
@@ -26,12 +26,13 @@ directory at same level as the nuttx project:
|- apps |- apps
`- osmocom-bb `- osmocom-bb
If you attempt to build this configuration without osmocom-bb, you will If you attempt to build this configuration without osmocom-bb, and that
get compilation errors in drivers/sercomm due to header files that are you added support for sercomm in your configuration(CONFIG_SERCOMM_CONSOLE=y)
needed from the osmocom-bb directory. 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 By default, NuttX will not use sercomm (HDLC protocol) to communicate with
host system. Sercomm is the transport used by osmocom-bb that runs on top 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 of serial. See http://bb.osmocom.org/trac/wiki/nuttx-bb/run for detailed
the usage of nuttx with sercomm. the usage of nuttx with sercomm.
configs/compal_e88/nsh_highram/Make.defs
+2
View File
@@ -35,12 +35,14 @@
include ${TOPDIR}/.config include ${TOPDIR}/.config
ifeq ("${CONFIG_SERCOMM_CONSOLE}","y")
OSMODIR = $(TOPDIR)/../../osmocom-bb OSMODIR = $(TOPDIR)/../../osmocom-bb
EXTRA_LIBS = $(OSMODIR)/src/target/firmware/comm/libcomm.a \ EXTRA_LIBS = $(OSMODIR)/src/target/firmware/comm/libcomm.a \
$(OSMODIR)/src/shared/libosmocore/build-target/src/.libs/libosmocore.a \ $(OSMODIR)/src/shared/libosmocore/build-target/src/.libs/libosmocore.a \
$(OSMODIR)/src/target/firmware/calypso/libcalypso.a \ $(OSMODIR)/src/target/firmware/calypso/libcalypso.a \
$(OSMODIR)/src/target/firmware/comm/libcomm.a $(OSMODIR)/src/target/firmware/comm/libcomm.a
# ^^^ Stupid hack! Why do I have to put it twice??? # ^^^ Stupid hack! Why do I have to put it twice???
endif
CROSSDEV = arm-elf- CROSSDEV = arm-elf-
CC = $(CROSSDEV)gcc CC = $(CROSSDEV)gcc
configs/compal_e88/nsh_highram/defconfig
+4 -3
View File
@@ -88,7 +88,7 @@ CONFIG_ARCH_STACKDUMP=y
# CONFIG_UART_*_PARTIY - 0=no parity, 1=odd parity, 2=even parity # CONFIG_UART_*_PARTIY - 0=no parity, 1=odd parity, 2=even parity
# CONFIG_UART_*_2STOP - Two stop bits # CONFIG_UART_*_2STOP - Two stop bits
# #
CONFIG_SERCOMM_CONSOLE=y CONFIG_SERCOMM_CONSOLE=n
CONFIG_SERIAL_IRDA_CONSOLE=n CONFIG_SERIAL_IRDA_CONSOLE=n
CONFIG_UART_IRDA_HWFLOWCONTROL=n CONFIG_UART_IRDA_HWFLOWCONTROL=n
CONFIG_UART_MODEM_HWFLOWCONTROL=n CONFIG_UART_MODEM_HWFLOWCONTROL=n
@@ -104,6 +104,7 @@ CONFIG_UART_IRDA_PARITY=0
CONFIG_UART_MODEM_PARITY=0 CONFIG_UART_MODEM_PARITY=0
CONFIG_UART_IRDA_2STOP=0 CONFIG_UART_IRDA_2STOP=0
CONFIG_UART_MODEM_2STOP=0 CONFIG_UART_MODEM_2STOP=0
CONFIG_STDIO_LINE_BUFFER=y
# #
# C5471 Ethernet Driver settings # C5471 Ethernet Driver settings
@@ -205,7 +206,7 @@ CONFIG_HAVE_LIBM=n
CONFIG_DEBUG=n CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n CONFIG_DEBUG_SYMBOLS=n
CONFIG_MM_REGIONS=2 CONFIG_MM_REGIONS=1
CONFIG_ARCH_LOWPUTC=y CONFIG_ARCH_LOWPUTC=y
CONFIG_RR_INTERVAL=200 CONFIG_RR_INTERVAL=200
CONFIG_SCHED_INSTRUMENTATION=n CONFIG_SCHED_INSTRUMENTATION=n
@@ -246,7 +247,7 @@ CONFIG_DISABLE_PTHREAD=n
CONFIG_DISABLE_SIGNALS=n CONFIG_DISABLE_SIGNALS=n
CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_MQUEUE=y
CONFIG_DISABLE_MOUNTPOINT=n CONFIG_DISABLE_MOUNTPOINT=n
CONFIG_DISABLE_ENVIRON=y CONFIG_DISABLE_ENVIRON=n
CONFIG_DISABLE_POLL=y CONFIG_DISABLE_POLL=y
# #
configs/compal_e99/README.txt
+6 -5
View File
@@ -26,12 +26,13 @@ directory at same level as the nuttx project:
|- apps |- apps
`- osmocom-bb `- osmocom-bb
If you attempt to build this configuration without osmocom-bb, you will If you attempt to build this configuration without osmocom-bb, and that
get compilation errors in drivers/sercomm due to header files that are you added support for sercomm in your configuration(CONFIG_SERCOMM_CONSOLE=y)
needed from the osmocom-bb directory. 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 By default, NuttX will not use sercomm (HDLC protocol) to communicate with
host system. Sercomm is the transport used by osmocom-bb that runs on top 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 of serial. See http://bb.osmocom.org/trac/wiki/nuttx-bb/run for detailed
the usage of nuttx with sercomm. the usage of nuttx with sercomm.
configs/compal_e99/nsh_compalram/Make.defs
+2
View File
@@ -35,12 +35,14 @@
include ${TOPDIR}/.config include ${TOPDIR}/.config
ifeq ("${CONFIG_SERCOMM_CONSOLE}","y")
OSMODIR = $(TOPDIR)/../../osmocom-bb OSMODIR = $(TOPDIR)/../../osmocom-bb
EXTRA_LIBS = $(OSMODIR)/src/target/firmware/comm/libcomm.a \ EXTRA_LIBS = $(OSMODIR)/src/target/firmware/comm/libcomm.a \
$(OSMODIR)/src/shared/libosmocore/build-target/src/.libs/libosmocore.a \ $(OSMODIR)/src/shared/libosmocore/build-target/src/.libs/libosmocore.a \
$(OSMODIR)/src/target/firmware/calypso/libcalypso.a \ $(OSMODIR)/src/target/firmware/calypso/libcalypso.a \
$(OSMODIR)/src/target/firmware/comm/libcomm.a $(OSMODIR)/src/target/firmware/comm/libcomm.a
# ^^^ Stupid hack! Why do I have to put it twice??? # ^^^ Stupid hack! Why do I have to put it twice???
endif
CROSSDEV = arm-elf- CROSSDEV = arm-elf-
CC = $(CROSSDEV)gcc CC = $(CROSSDEV)gcc
configs/compal_e99/nsh_compalram/defconfig
+6 -3
View File
@@ -69,6 +69,9 @@ CONFIG_ARCH_BOARD_COMPALE99=y
CONFIG_BOARD_LOOPSPERMSEC=1250 CONFIG_BOARD_LOOPSPERMSEC=1250
CONFIG_ROM_VECTORS=n CONFIG_ROM_VECTORS=n
CONFIG_DRAM_END=0x00840000 CONFIG_DRAM_END=0x00840000
CONFIG_MM_REGIONS=2
CONFIG_HEAP2_START=0x01000000
CONFIG_HEAP2_END=0x01200000
CONFIG_ARCH_LEDS=n CONFIG_ARCH_LEDS=n
CONFIG_ARCH_INTERRUPTSTACK=1024 CONFIG_ARCH_INTERRUPTSTACK=1024
CONFIG_ARCH_STACKDUMP=y 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_*_PARTIY - 0=no parity, 1=odd parity, 2=even parity
# CONFIG_UART_*_2STOP - Two stop bits # CONFIG_UART_*_2STOP - Two stop bits
# #
CONFIG_SERCOMM_CONSOLE=y CONFIG_SERCOMM_CONSOLE=n
CONFIG_SERIAL_IRDA_CONSOLE=n CONFIG_SERIAL_IRDA_CONSOLE=n
CONFIG_UART_IRDA_HWFLOWCONTROL=n CONFIG_UART_IRDA_HWFLOWCONTROL=n
CONFIG_UART_MODEM_HWFLOWCONTROL=n CONFIG_UART_MODEM_HWFLOWCONTROL=n
@@ -104,6 +107,7 @@ CONFIG_UART_IRDA_PARITY=0
CONFIG_UART_MODEM_PARITY=0 CONFIG_UART_MODEM_PARITY=0
CONFIG_UART_IRDA_2STOP=0 CONFIG_UART_IRDA_2STOP=0
CONFIG_UART_MODEM_2STOP=0 CONFIG_UART_MODEM_2STOP=0
CONFIG_STDIO_LINE_BUFFER=y
# #
# C5471 Ethernet Driver settings # C5471 Ethernet Driver settings
@@ -205,7 +209,6 @@ CONFIG_HAVE_LIBM=n
CONFIG_DEBUG=n CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n CONFIG_DEBUG_SYMBOLS=n
CONFIG_MM_REGIONS=2
CONFIG_ARCH_LOWPUTC=y CONFIG_ARCH_LOWPUTC=y
CONFIG_RR_INTERVAL=200 CONFIG_RR_INTERVAL=200
CONFIG_SCHED_INSTRUMENTATION=n CONFIG_SCHED_INSTRUMENTATION=n
@@ -246,7 +249,7 @@ CONFIG_DISABLE_PTHREAD=n
CONFIG_DISABLE_SIGNALS=n CONFIG_DISABLE_SIGNALS=n
CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_MQUEUE=y
CONFIG_DISABLE_MOUNTPOINT=n CONFIG_DISABLE_MOUNTPOINT=n
CONFIG_DISABLE_ENVIRON=y CONFIG_DISABLE_ENVIRON=n
CONFIG_DISABLE_POLL=y CONFIG_DISABLE_POLL=y
# #
configs/compal_e99/nsh_compalram/ld.script
+2 -2
View File
@@ -12,9 +12,9 @@ ENTRY(__start)
MEMORY MEMORY
{ {
/* compal-loaded binary: our text, initialized data */ /* 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 */ /* compal-loaded binary: our unitialized data, stacks, heap */
IRAM (rw) : ORIGIN = 0x00810000, LENGTH = 0x00010000 IRAM (rw) : ORIGIN = 0x00820000, LENGTH = 0x00020000
} }
SECTIONS SECTIONS
{ {
configs/compal_e99/nsh_highram/Make.defs
+2
View File
@@ -35,12 +35,14 @@
include ${TOPDIR}/.config include ${TOPDIR}/.config
ifeq ("${CONFIG_SERCOMM_CONSOLE}","y")
OSMODIR = $(TOPDIR)/../../osmocom-bb OSMODIR = $(TOPDIR)/../../osmocom-bb
EXTRA_LIBS = $(OSMODIR)/src/target/firmware/comm/libcomm.a \ EXTRA_LIBS = $(OSMODIR)/src/target/firmware/comm/libcomm.a \
$(OSMODIR)/src/shared/libosmocore/build-target/src/.libs/libosmocore.a \ $(OSMODIR)/src/shared/libosmocore/build-target/src/.libs/libosmocore.a \
$(OSMODIR)/src/target/firmware/calypso/libcalypso.a \ $(OSMODIR)/src/target/firmware/calypso/libcalypso.a \
$(OSMODIR)/src/target/firmware/comm/libcomm.a $(OSMODIR)/src/target/firmware/comm/libcomm.a
# ^^^ Stupid hack! Why do I have to put it twice??? # ^^^ Stupid hack! Why do I have to put it twice???
endif
CROSSDEV = arm-elf- CROSSDEV = arm-elf-
CC = $(CROSSDEV)gcc CC = $(CROSSDEV)gcc
configs/compal_e99/nsh_highram/defconfig
+6 -3
View File
@@ -69,6 +69,9 @@ CONFIG_ARCH_BOARD_COMPALE99=y
CONFIG_BOARD_LOOPSPERMSEC=1250 CONFIG_BOARD_LOOPSPERMSEC=1250
CONFIG_ROM_VECTORS=n CONFIG_ROM_VECTORS=n
CONFIG_DRAM_END=0x00840000 CONFIG_DRAM_END=0x00840000
CONFIG_MM_REGIONS=2
CONFIG_HEAP2_START=0x01000000
CONFIG_HEAP2_END=0x01200000
CONFIG_ARCH_LEDS=n CONFIG_ARCH_LEDS=n
CONFIG_ARCH_INTERRUPTSTACK=1024 CONFIG_ARCH_INTERRUPTSTACK=1024
CONFIG_ARCH_STACKDUMP=y 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_*_PARTIY - 0=no parity, 1=odd parity, 2=even parity
# CONFIG_UART_*_2STOP - Two stop bits # CONFIG_UART_*_2STOP - Two stop bits
# #
CONFIG_SERCOMM_CONSOLE=y CONFIG_SERCOMM_CONSOLE=n
CONFIG_SERIAL_IRDA_CONSOLE=n CONFIG_SERIAL_IRDA_CONSOLE=n
CONFIG_UART_IRDA_HWFLOWCONTROL=n CONFIG_UART_IRDA_HWFLOWCONTROL=n
CONFIG_UART_MODEM_HWFLOWCONTROL=n CONFIG_UART_MODEM_HWFLOWCONTROL=n
@@ -104,6 +107,7 @@ CONFIG_UART_IRDA_PARITY=0
CONFIG_UART_MODEM_PARITY=0 CONFIG_UART_MODEM_PARITY=0
CONFIG_UART_IRDA_2STOP=0 CONFIG_UART_IRDA_2STOP=0
CONFIG_UART_MODEM_2STOP=0 CONFIG_UART_MODEM_2STOP=0
CONFIG_STDIO_LINE_BUFFER=y
# #
# C5471 Ethernet Driver settings # C5471 Ethernet Driver settings
@@ -205,7 +209,6 @@ CONFIG_HAVE_LIBM=n
CONFIG_DEBUG=n CONFIG_DEBUG=n
CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_VERBOSE=n
CONFIG_DEBUG_SYMBOLS=n CONFIG_DEBUG_SYMBOLS=n
CONFIG_MM_REGIONS=2
CONFIG_ARCH_LOWPUTC=y CONFIG_ARCH_LOWPUTC=y
CONFIG_RR_INTERVAL=200 CONFIG_RR_INTERVAL=200
CONFIG_SCHED_INSTRUMENTATION=n CONFIG_SCHED_INSTRUMENTATION=n
@@ -246,7 +249,7 @@ CONFIG_DISABLE_PTHREAD=n
CONFIG_DISABLE_SIGNALS=n CONFIG_DISABLE_SIGNALS=n
CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_MQUEUE=y
CONFIG_DISABLE_MOUNTPOINT=n CONFIG_DISABLE_MOUNTPOINT=n
CONFIG_DISABLE_ENVIRON=y CONFIG_DISABLE_ENVIRON=n
CONFIG_DISABLE_POLL=y CONFIG_DISABLE_POLL=y
# #
configs/compal_e99/nsh_highram/ld.script
+2 -2
View File
@@ -14,9 +14,9 @@ MEMORY
/* 0x800000-0xa00000 */ /* 0x800000-0xa00000 */
/* compal-loaded binary: our text, initialized data */ /* compal-loaded binary: our text, initialized data */
LRAM (rw) : ORIGIN = 0x00800000, LENGTH = 0x00020000 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 */ /* compal-loaded binary: our unitialized data, stacks, heap */
IRAM (rw) : ORIGIN = 0x00840000, LENGTH = 0x00010000 IRAM (rw) : ORIGIN = 0x00839000, LENGTH = 0x00006000
} }
SECTIONS SECTIONS
{ {