diff options
| author | px4dev <px4@purgatory.org> | 2013-01-07 23:03:57 -0800 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2013-01-07 23:03:57 -0800 |
| commit | c137ceba7d8c6d0ed2a65def5d206e30d83411bd (patch) | |
| tree | 64221143aaa6fd900ae6ff0294412ac2fe137278 | |
| parent | 2169e1f808db498c5d8b45c80a7d5e1ea0943ee6 (diff) | |
| download | px4-firmware-c137ceba7d8c6d0ed2a65def5d206e30d83411bd.tar.gz px4-firmware-c137ceba7d8c6d0ed2a65def5d206e30d83411bd.tar.bz2 px4-firmware-c137ceba7d8c6d0ed2a65def5d206e30d83411bd.zip | |
Remove more redundant CMSIS pieces from here.
| -rw-r--r-- | nuttx/configs/px4fmu/common/Make.defs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/nuttx/configs/px4fmu/common/Make.defs b/nuttx/configs/px4fmu/common/Make.defs index 53407f0bb..75df4c4c9 100644 --- a/nuttx/configs/px4fmu/common/Make.defs +++ b/nuttx/configs/px4fmu/common/Make.defs @@ -55,7 +55,7 @@ NM = $(CROSSDEV)nm OBJCOPY = $(CROSSDEV)objcopy OBJDUMP = $(CROSSDEV)objdump -MAXOPTIMIZATION = -O3 # disable for debugging +MAXOPTIMIZATION = -O3 ARCHCPUFLAGS = -mcpu=cortex-m4 \ -mthumb \ -march=armv7e-m \ @@ -79,8 +79,8 @@ ifeq ($(WINTOOL),y) DIRLINK = $(TOPDIR)/tools/winlink.sh DIRUNLINK = $(TOPDIR)/tools/unlink.sh MKDEP = $(TOPDIR)/tools/mknulldeps.sh - ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(CMSIS_INCLUDE)}" - ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" -isystem "${shell cygpath -w $(CMSIS_INCLUDE)}" + ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" + ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/common/$(LDSCRIPT)}" else ifeq ($(PX4_WINTOOL),y) @@ -88,14 +88,14 @@ else DIRLINK = $(TOPDIR)/tools/winlink.sh DIRUNLINK = $(TOPDIR)/tools/unlink.sh MKDEP = $(TOPDIR)/tools/mknulldeps.sh - ARCHINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(CMSIS_INCLUDE) - ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx -isystem $(CMSIS_INCLUDE) + ARCHINCLUDES = -I. -isystem $(TOPDIR)/include + ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/common/$(LDSCRIPT) else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh - ARCHINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(CMSIS_INCLUDE) - ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx -isystem $(CMSIS_INCLUDE) + ARCHINCLUDES = -I. -isystem $(TOPDIR)/include + ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/common/$(LDSCRIPT) endif endif @@ -144,7 +144,7 @@ ARCHCWARNINGS = $(ARCHWARNINGS) \ -Wnested-externs \ -Wunsuffixed-float-constants ARCHWARNINGSXX = $(ARCHWARNINGS) -ARCHDEFINES = -DARM_MATH_CM4 -D__FPU_PRESENT +ARCHDEFINES = ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10 # this seems to be the only way to add linker flags |