diff options
author | px4dev <px4@purgatory.org> | 2013-01-01 19:39:17 -0800 |
---|---|---|
committer | px4dev <px4@purgatory.org> | 2013-01-01 19:39:17 -0800 |
commit | eaf1d8063cc707b1041e8583663d9edd45f42c5d (patch) | |
tree | 0a813a8861af8b5f95c52a90b677d82f1d080308 /nuttx/configs | |
parent | dc50d96b5d8042b6ffd54051f17cca0dc0dbb27d (diff) | |
download | px4-firmware-eaf1d8063cc707b1041e8583663d9edd45f42c5d.tar.gz px4-firmware-eaf1d8063cc707b1041e8583663d9edd45f42c5d.tar.bz2 px4-firmware-eaf1d8063cc707b1041e8583663d9edd45f42c5d.zip |
Build system updates to match the NuttX merge.
Diffstat (limited to 'nuttx/configs')
-rw-r--r-- | nuttx/configs/px4fmu/common/Make.defs | 61 | ||||
-rwxr-xr-x | nuttx/configs/px4fmu/nsh/defconfig | 2 | ||||
-rw-r--r-- | nuttx/configs/px4fmu/src/Makefile | 14 | ||||
-rw-r--r-- | nuttx/configs/px4io/common/Make.defs | 43 | ||||
-rw-r--r-- | nuttx/configs/px4io/src/Makefile | 9 |
5 files changed, 49 insertions, 80 deletions
diff --git a/nuttx/configs/px4fmu/common/Make.defs b/nuttx/configs/px4fmu/common/Make.defs index ff2e4c5fa..8f4928dda 100644 --- a/nuttx/configs/px4fmu/common/Make.defs +++ b/nuttx/configs/px4fmu/common/Make.defs @@ -39,12 +39,15 @@ # Make.defs in the per-config directories. # +include ${TOPDIR}/tools/Config.mk + # # We only support building with the ARM bare-metal toolchain from # https://launchpad.net/gcc-arm-embedded on Windows, Linux or Mac OS. # +CONFIG_ARMV7M_TOOLCHAIN := GNU_EABI -CROSSDEV = arm-none-eabi- +include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs CC = $(CROSSDEV)gcc CXX = $(CROSSDEV)g++ @@ -166,25 +169,34 @@ OBJEXT = .o LIBEXT = .a EXEEXT = -define PREPROCESS - @echo "CPP: $1->$2" - @$(CPP) $(CPPFLAGS) $(abspath $1) -o $2 -endef - -define COMPILE - @echo "CC: $1" - $(Q)$(CC) -c $(CFLAGS) $(abspath $1) -o $2 -endef - -define COMPILEXX - @echo "CXX: $1" - $(Q)$(CXX) -c $(CXXFLAGS) $(abspath $1) -o $2 -endef - -define ASSEMBLE - @echo "AS: $1" - $(Q)$(CC) -c $(AFLAGS) $(abspath $1) -o $2 -endef +#define PREPROCESS +# @echo "CPP: $1->$2" +# @$(CPP) $(CPPFLAGS) $(abspath $1) -o $2 +#endef +# +#define COMPILE +# @echo "CC: $1" +# $(Q)$(CC) -c $(CFLAGS) $(abspath $1) -o $2 +#endef +# +#define COMPILEXX +# @echo "CXX: $1" +# $(Q)$(CXX) -c $(CXXFLAGS) $(abspath $1) -o $2 +#endef +# +#define ASSEMBLE +# @echo "AS: $1" +# $(Q)$(CC) -c $(AFLAGS) $(abspath $1) -o $2 +#endef +# +#define ARCHIVE +# echo "AR: $2"; \ +# $(AR) $1 $2 || { echo "$(AR) $1 $2 FAILED!" ; exit 1 ; } +#endef +# +#define CLEAN +# @rm -f *.o *.a +#endef # produce partially-linked $1 from files in $2 define PRELINK @@ -192,15 +204,6 @@ define PRELINK @$(LD) -Ur -o $1 $2 && $(OBJCOPY) --localize-hidden $1 endef -define ARCHIVE - echo "AR: $2"; \ - $(AR) $1 $2 || { echo "$(AR) $1 $2 FAILED!" ; exit 1 ; } -endef - -define CLEAN - @rm -f *.o *.a -endef - HOSTCC = gcc HOSTINCLUDES = -I. HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -g -pipe diff --git a/nuttx/configs/px4fmu/nsh/defconfig b/nuttx/configs/px4fmu/nsh/defconfig index bc724c006..f17f9c20b 100755 --- a/nuttx/configs/px4fmu/nsh/defconfig +++ b/nuttx/configs/px4fmu/nsh/defconfig @@ -767,6 +767,8 @@ CONFIG_FS_ROMFS=y # CONFIG_MMCSD_SPICLOCK - Maximum SPI clock to drive MMC/SD card. # Default is 20MHz, current setting 24 MHz # +CONFIG_MMCSD=y +CONFIG_MMCSD_SPI=y CONFIG_MMCSD_NSLOTS=1 CONFIG_MMCSD_READONLY=n CONFIG_MMCSD_SPICLOCK=24000000 diff --git a/nuttx/configs/px4fmu/src/Makefile b/nuttx/configs/px4fmu/src/Makefile index c3d6bf543..d4276f7fc 100644 --- a/nuttx/configs/px4fmu/src/Makefile +++ b/nuttx/configs/px4fmu/src/Makefile @@ -64,23 +64,21 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) libboard$(LIBEXT): $(OBJS) - @( for obj in $(OBJS) ; do \ - $(call ARCHIVE, $@, $${obj}); \ - done ; ) - touch $@ + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) - @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep - @touch $@ + $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + $(Q) touch $@ depend: .depend clean: - @rm -f libboard$(LIBEXT) *~ .*.swp + $(call DELFILE, libboard$(LIBEXT)) $(call CLEAN) distclean: clean - @rm -f Make.dep .depend + $(call DELFILE, Make.dep) + $(call DELFILE, .depend) -include Make.dep diff --git a/nuttx/configs/px4io/common/Make.defs b/nuttx/configs/px4io/common/Make.defs index a3996a9ed..d6d52e3d2 100644 --- a/nuttx/configs/px4io/common/Make.defs +++ b/nuttx/configs/px4io/common/Make.defs @@ -39,12 +39,15 @@ # Make.defs in the per-config directories. # +include ${TOPDIR}/tools/Config.mk + # # We only support building with the ARM bare-metal toolchain from # https://launchpad.net/gcc-arm-embedded on Windows, Linux or Mac OS. # +CONFIG_ARMV7M_TOOLCHAIN := GNU_EABI -CROSSDEV = arm-none-eabi- +include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs CC = $(CROSSDEV)gcc CXX = $(CROSSDEV)g++ @@ -160,46 +163,10 @@ OBJEXT = .o LIBEXT = .a EXEEXT = -# If VERBOSE is set, don't hide the compiler invocations. -ifeq ($(VERBOSE),YES) -_v = -else -_v = @ -endif - -define PREPROCESS - @echo "CPP: $1->$2" - @$(CPP) $(CPPFLAGS) $(abspath $1) -o $2 -endef - -define COMPILE - @echo "CC: $1" - $(_v)$(CC) -c $(CFLAGS) $(abspath $1) -o $2 -endef - -define COMPILEXX - @echo "CXX: $1" - $(_v)$(CXX) -c $(CXXFLAGS) $(abspath $1) -o $2 -endef - -define ASSEMBLE - @echo "AS: $1" - $(_v)$(CC) -c $(AFLAGS) $(abspath $1) -o $2 -endef - # produce partially-linked $1 from files in $2 define PRELINK @echo "PRELINK: $1" - @$(LD) -Ur -o $1 $2 && $(OBJCOPY) --localize-hidden $1 -endef - -define ARCHIVE - echo "AR: $2"; \ - $(AR) $1 $2 || { echo "$(AR) $1 $2 FAILED!" ; exit 1 ; } -endef - -define CLEAN - @rm -f *.o *.a + $(Q) $(LD) -Ur -o $1 $2 && $(OBJCOPY) --localize-hidden $1 endef HOSTCC = gcc diff --git a/nuttx/configs/px4io/src/Makefile b/nuttx/configs/px4io/src/Makefile index 144fa8549..bb9539d16 100644 --- a/nuttx/configs/px4io/src/Makefile +++ b/nuttx/configs/px4io/src/Makefile @@ -65,9 +65,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 @@ -76,10 +74,11 @@ libboard$(LIBEXT): $(OBJS) depend: .depend clean: - @rm -f libboard$(LIBEXT) *~ .*.swp + $(call DELFILE, libboard$(LIBEXT)) $(call CLEAN) distclean: clean - @rm -f Make.dep .depend + $(call DELFILE, Make.dep) + $(call DELFILE, .depend) -include Make.dep |