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_e99/nsh_compalram | |
| 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_e99/nsh_compalram')
| -rw-r--r-- | nuttx/configs/compal_e99/nsh_compalram/Make.defs | 2 | ||||
| -rw-r--r-- | nuttx/configs/compal_e99/nsh_compalram/defconfig | 9 | ||||
| -rw-r--r-- | nuttx/configs/compal_e99/nsh_compalram/ld.script | 4 |
3 files changed, 10 insertions, 5 deletions
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 { |