diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2015-04-16 06:49:34 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2015-04-16 09:11:47 -0600 |
| commit | e656626b3d8e017309042fb73afe36013fcd843d (patch) | |
| tree | 28e7fec5e3e384a625108c82f34e28705c9c66af /nuttx | |
| parent | 9e19b7708a1811bc0a7aeeba040bbed365b5a041 (diff) | |
| download | px4-nuttx-e656626b3d8e017309042fb73afe36013fcd843d.tar.gz px4-nuttx-e656626b3d8e017309042fb73afe36013fcd843d.tar.bz2 px4-nuttx-e656626b3d8e017309042fb73afe36013fcd843d.zip | |
Calypso/Compal_e86 update from Craig Comstock
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/arch/arm/src/calypso/calypso_spi.c | 7 | ||||
| -rw-r--r-- | nuttx/configs/compal_e86/scripts/ld.script | 4 | ||||
| -rw-r--r-- | nuttx/configs/compal_e86/src/Makefile | 4 |
3 files changed, 9 insertions, 6 deletions
diff --git a/nuttx/arch/arm/src/calypso/calypso_spi.c b/nuttx/arch/arm/src/calypso/calypso_spi.c index a1e0a3f5a..7357ccd67 100644 --- a/nuttx/arch/arm/src/calypso/calypso_spi.c +++ b/nuttx/arch/arm/src/calypso/calypso_spi.c @@ -43,6 +43,7 @@ #include <unistd.h> #include <semaphore.h> #include <debug.h> +#include <errno.h> #include "up_arch.h" #include "calypso_spi.h" @@ -66,8 +67,12 @@ struct calypso_spidev_s }; /* STUBS! */ + #ifndef CONFIG_SPI_OWNBUS -static int spi_lock(FAR struct spi_dev_s *dev, bool lock); +static int spi_lock(FAR struct spi_dev_s *dev, bool lock) +{ + return -ENOSYS; +} #endif static void spi_select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, diff --git a/nuttx/configs/compal_e86/scripts/ld.script b/nuttx/configs/compal_e86/scripts/ld.script index 4bc0fdd3a..429ef2b50 100644 --- a/nuttx/configs/compal_e86/scripts/ld.script +++ b/nuttx/configs/compal_e86/scripts/ld.script @@ -15,8 +15,8 @@ MEMORY /* E86 stacked flash 32mbit flash, 4mbit sram, DBB internal 256kb SRAM */ /* 0x800000-0x87ffff */ /* bump up because we have 32mbit instead of 16mbit */ /* compal-loaded binary: our text, initialized data */ - LRAM (rw) : ORIGIN = 0x00800000, LENGTH = 0x00040000 - TRAM (rw) : ORIGIN = 0x00840000, LENGTH = 0x00020000 + LRAM (rw) : ORIGIN = 0x00800000, LENGTH = 0x00020000 + TRAM (rw) : ORIGIN = 0x00820000, LENGTH = 0x00040000 /* compal-loaded binary: our unitialized data, stacks, heap */ IRAM (rw) : ORIGIN = 0x00860000, LENGTH = 0x00020000 diff --git a/nuttx/configs/compal_e86/src/Makefile b/nuttx/configs/compal_e86/src/Makefile index 0e1e2f43f..9336b10c8 100644 --- a/nuttx/configs/compal_e86/src/Makefile +++ b/nuttx/configs/compal_e86/src/Makefile @@ -60,9 +60,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - @( for obj in $(OBJS) ; do \ - $(call ARCHIVE, $@, $${obj}); \ - done ; ) + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep |