diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-05-14 00:22:31 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-05-14 00:22:31 +0000 |
| commit | 3b8a6dddff146b60cd09d1f3dd3b95cd8042ccd5 (patch) | |
| tree | 66a5ff991fbd784101e2e833d83981c50aca837a /nuttx/configs/compal_e88/nsh_highram | |
| parent | c39c92fb6b3803270215d5552acf6ac6d23a31f8 (diff) | |
| download | px4-nuttx-3b8a6dddff146b60cd09d1f3dd3b95cd8042ccd5.tar.gz px4-nuttx-3b8a6dddff146b60cd09d1f3dd3b95cd8042ccd5.tar.bz2 px4-nuttx-3b8a6dddff146b60cd09d1f3dd3b95cd8042ccd5.zip | |
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
Diffstat (limited to 'nuttx/configs/compal_e88/nsh_highram')
| -rw-r--r-- | nuttx/configs/compal_e88/nsh_highram/Make.defs | 2 | ||||
| -rw-r--r-- | nuttx/configs/compal_e88/nsh_highram/defconfig | 7 |
2 files changed, 6 insertions, 3 deletions
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 # |