From 4b8feb03cfca89b18ca88a19079e796b44f6d216 Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Tue, 20 Jan 2015 17:36:55 -1000 Subject: Match the OS build's CONFIG_ARMV7M_STACKCHECK setting by using actual setting in the exported nuttx config.h file to control each board build setting of ENABLE_STACK_CHECKS in toolchain_gnu-arm-eabi.mk --- nuttx-configs/aerocore/nsh/Make.defs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) mode change 100644 => 100755 nuttx-configs/aerocore/nsh/Make.defs (limited to 'nuttx-configs/aerocore') diff --git a/nuttx-configs/aerocore/nsh/Make.defs b/nuttx-configs/aerocore/nsh/Make.defs old mode 100644 new mode 100755 index c1f5a8ac4..3808fc1cf --- a/nuttx-configs/aerocore/nsh/Make.defs +++ b/nuttx-configs/aerocore/nsh/Make.defs @@ -62,8 +62,9 @@ ARCHCPUFLAGS = -mcpu=cortex-m4 \ # enable precise stack overflow tracking -INSTRUMENTATIONDEFINES = -finstrument-functions \ - -ffixed-r10 +ifeq ($(CONFIG_ARMV7M_STACKCHECK),y) +INSTRUMENTATIONDEFINES = -finstrument-functions -ffixed-r10 +endif # pull in *just* libm from the toolchain ... this is grody LIBM = "${shell $(CC) $(ARCHCPUFLAGS) -print-file-name=libm.a}" -- cgit v1.2.3 From 517e1e8d4879c7a2d359b92e2eff89eddb944a16 Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Wed, 21 Jan 2015 03:07:15 -1000 Subject: Fixed permissions --- makefiles/setup.mk | 0 makefiles/toolchain_gnu-arm-eabi.mk | 0 nuttx-configs/aerocore/nsh/Make.defs | 0 nuttx-configs/px4fmu-v1/nsh/Make.defs | 0 nuttx-configs/px4fmu-v2/nsh/Make.defs | 0 nuttx-configs/px4fmu-v2/nsh/defconfig | 0 nuttx-configs/px4io-v1/nsh/Make.defs | 0 nuttx-configs/px4io-v2/nsh/Make.defs | 0 8 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 makefiles/setup.mk mode change 100755 => 100644 makefiles/toolchain_gnu-arm-eabi.mk mode change 100755 => 100644 nuttx-configs/aerocore/nsh/Make.defs mode change 100755 => 100644 nuttx-configs/px4fmu-v1/nsh/Make.defs mode change 100755 => 100644 nuttx-configs/px4fmu-v2/nsh/Make.defs mode change 100755 => 100644 nuttx-configs/px4fmu-v2/nsh/defconfig mode change 100755 => 100644 nuttx-configs/px4io-v1/nsh/Make.defs mode change 100755 => 100644 nuttx-configs/px4io-v2/nsh/Make.defs (limited to 'nuttx-configs/aerocore') diff --git a/makefiles/setup.mk b/makefiles/setup.mk old mode 100755 new mode 100644 diff --git a/makefiles/toolchain_gnu-arm-eabi.mk b/makefiles/toolchain_gnu-arm-eabi.mk old mode 100755 new mode 100644 diff --git a/nuttx-configs/aerocore/nsh/Make.defs b/nuttx-configs/aerocore/nsh/Make.defs old mode 100755 new mode 100644 diff --git a/nuttx-configs/px4fmu-v1/nsh/Make.defs b/nuttx-configs/px4fmu-v1/nsh/Make.defs old mode 100755 new mode 100644 diff --git a/nuttx-configs/px4fmu-v2/nsh/Make.defs b/nuttx-configs/px4fmu-v2/nsh/Make.defs old mode 100755 new mode 100644 diff --git a/nuttx-configs/px4fmu-v2/nsh/defconfig b/nuttx-configs/px4fmu-v2/nsh/defconfig old mode 100755 new mode 100644 diff --git a/nuttx-configs/px4io-v1/nsh/Make.defs b/nuttx-configs/px4io-v1/nsh/Make.defs old mode 100755 new mode 100644 diff --git a/nuttx-configs/px4io-v2/nsh/Make.defs b/nuttx-configs/px4io-v2/nsh/Make.defs old mode 100755 new mode 100644 -- cgit v1.2.3 From 4b27e4029d15e5ae4936252f224ee4275f83cab0 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Wed, 21 Jan 2015 15:32:38 +0100 Subject: Disabled stack checking on aerocore --- nuttx-configs/aerocore/nsh/defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nuttx-configs/aerocore') diff --git a/nuttx-configs/aerocore/nsh/defconfig b/nuttx-configs/aerocore/nsh/defconfig index 317194f68..c44b074f3 100644 --- a/nuttx-configs/aerocore/nsh/defconfig +++ b/nuttx-configs/aerocore/nsh/defconfig @@ -94,7 +94,7 @@ CONFIG_ARCH_HAVE_MPU=y # CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y -CONFIG_ARMV7M_STACKCHECK=y +CONFIG_ARMV7M_STACKCHECK=n CONFIG_SERIAL_TERMIOS=y # -- cgit v1.2.3