aboutsummaryrefslogtreecommitdiff
path: root/nuttx-configs
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2014-11-23 12:06:46 +0100
committerLorenz Meier <lm@inf.ethz.ch>2014-11-23 12:06:46 +0100
commit461e9889b334865f1eec0c1d7a20067ff5a647ea (patch)
tree2ebcd3c57679153676a6674f60911c28f40c6031 /nuttx-configs
parent4030b20de7921d5e9673ce18215f76f0820c1ec7 (diff)
parent138c25ec74f08db6f6759053d0200058a794c196 (diff)
downloadpx4-firmware-461e9889b334865f1eec0c1d7a20067ff5a647ea.tar.gz
px4-firmware-461e9889b334865f1eec0c1d7a20067ff5a647ea.tar.bz2
px4-firmware-461e9889b334865f1eec0c1d7a20067ff5a647ea.zip
Merged master
Diffstat (limited to 'nuttx-configs')
-rw-r--r--nuttx-configs/px4fmu-v1/nsh/Make.defs2
-rw-r--r--nuttx-configs/px4fmu-v2/nsh/Make.defs2
-rw-r--r--nuttx-configs/px4fmu-v2/scripts/ld.script3
-rw-r--r--nuttx-configs/px4io-v1/nsh/Make.defs2
-rw-r--r--nuttx-configs/px4io-v2/nsh/Make.defs6
5 files changed, 7 insertions, 8 deletions
diff --git a/nuttx-configs/px4fmu-v1/nsh/Make.defs b/nuttx-configs/px4fmu-v1/nsh/Make.defs
index 181112fed..7305ea7fd 100644
--- a/nuttx-configs/px4fmu-v1/nsh/Make.defs
+++ b/nuttx-configs/px4fmu-v1/nsh/Make.defs
@@ -54,7 +54,7 @@ NM = $(CROSSDEV)nm
OBJCOPY = $(CROSSDEV)objcopy
OBJDUMP = $(CROSSDEV)objdump
-MAXOPTIMIZATION = -O3
+MAXOPTIMIZATION = -Os
ARCHCPUFLAGS = -mcpu=cortex-m4 \
-mthumb \
-march=armv7e-m \
diff --git a/nuttx-configs/px4fmu-v2/nsh/Make.defs b/nuttx-configs/px4fmu-v2/nsh/Make.defs
index bf6dee333..1c9c9a5ee 100644
--- a/nuttx-configs/px4fmu-v2/nsh/Make.defs
+++ b/nuttx-configs/px4fmu-v2/nsh/Make.defs
@@ -48,6 +48,8 @@ NM = $(CROSSDEV)nm
OBJCOPY = $(CROSSDEV)objcopy
OBJDUMP = $(CROSSDEV)objdump
+MAXOPTIMIZATION = -Os
+
ARCHCPUFLAGS = -mcpu=cortex-m4 \
-mthumb \
-march=armv7e-m \
diff --git a/nuttx-configs/px4fmu-v2/scripts/ld.script b/nuttx-configs/px4fmu-v2/scripts/ld.script
index 1017c649a..c78db47e2 100644
--- a/nuttx-configs/px4fmu-v2/scripts/ld.script
+++ b/nuttx-configs/px4fmu-v2/scripts/ld.script
@@ -50,7 +50,8 @@
MEMORY
{
- flash (rx) : ORIGIN = 0x08004000, LENGTH = 2032K
+ /* disabled due to silicon errata flash (rx) : ORIGIN = 0x08004000, LENGTH = 2032K */
+ flash (rx) : ORIGIN = 0x08004000, LENGTH = 1008K
sram (rwx) : ORIGIN = 0x20000000, LENGTH = 192K
ccsram (rwx) : ORIGIN = 0x10000000, LENGTH = 64K
}
diff --git a/nuttx-configs/px4io-v1/nsh/Make.defs b/nuttx-configs/px4io-v1/nsh/Make.defs
index c0f4f07f8..0565606f7 100644
--- a/nuttx-configs/px4io-v1/nsh/Make.defs
+++ b/nuttx-configs/px4io-v1/nsh/Make.defs
@@ -54,7 +54,7 @@ NM = $(CROSSDEV)nm
OBJCOPY = $(CROSSDEV)objcopy
OBJDUMP = $(CROSSDEV)objdump
-MAXOPTIMIZATION = -O3
+MAXOPTIMIZATION = -Os
ARCHCPUFLAGS = -mcpu=cortex-m3 \
-mthumb \
-march=armv7-m
diff --git a/nuttx-configs/px4io-v2/nsh/Make.defs b/nuttx-configs/px4io-v2/nsh/Make.defs
index 996f1bc79..439847702 100644
--- a/nuttx-configs/px4io-v2/nsh/Make.defs
+++ b/nuttx-configs/px4io-v2/nsh/Make.defs
@@ -54,15 +54,11 @@ NM = $(CROSSDEV)nm
OBJCOPY = $(CROSSDEV)objcopy
OBJDUMP = $(CROSSDEV)objdump
-MAXOPTIMIZATION = -O3
+MAXOPTIMIZATION = -Os
ARCHCPUFLAGS = -mcpu=cortex-m3 \
-mthumb \
-march=armv7-m
-# enable precise stack overflow tracking
-#INSTRUMENTATIONDEFINES = -finstrument-functions \
-# -ffixed-r10
-
# use our linker script
LDSCRIPT = ld.script