diff --git a/arch/arm/src/calypso/calypso_spi.c b/arch/arm/src/calypso/calypso_spi.c index a1e0a3f5a1..7357ccd67a 100644 --- a/arch/arm/src/calypso/calypso_spi.c +++ b/arch/arm/src/calypso/calypso_spi.c @@ -43,6 +43,7 @@ #include #include #include +#include #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/configs/compal_e86/scripts/ld.script b/configs/compal_e86/scripts/ld.script index 4bc0fdd3a4..429ef2b502 100644 --- a/configs/compal_e86/scripts/ld.script +++ b/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/configs/compal_e86/src/Makefile b/configs/compal_e86/src/Makefile index 0e1e2f43fa..9336b10c85 100644 --- a/configs/compal_e86/src/Makefile +++ b/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