summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2019-05-14 09:04:05 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2019-05-14 09:09:02 +0200
commitb446457f1c0a159863e770458b1373604f7050fe (patch)
tree542c2d10f9489329fb9a0a3b808b583d4d6d15a0
parentlibdl: Fix size bug in loading symbols. (diff)
downloadrtems-b446457f1c0a159863e770458b1373604f7050fe.tar.bz2
bsps/arm: Adjust machine flags for ARMv7-M
Update machine flags for Cortex-M3 and Cortex-M4 based BSPs to account for Cortex-M3 Errata 602117 which required GCC multilib changes. Update #3747.
-rw-r--r--bsps/arm/lm3s69xx/config/lm3s69xx.inc2
-rw-r--r--bsps/arm/lpc176x/config/lpc1768_mbed.cfg2
-rw-r--r--bsps/arm/lpc24xx/config/lpc17xx.inc2
-rw-r--r--bsps/arm/lpc24xx/config/lpc40xx.inc2
-rw-r--r--bsps/arm/stm32f4/config/stm32f105rc.cfg11
-rw-r--r--bsps/arm/stm32f4/config/stm32f4.cfg2
6 files changed, 15 insertions, 6 deletions
diff --git a/bsps/arm/lm3s69xx/config/lm3s69xx.inc b/bsps/arm/lm3s69xx/config/lm3s69xx.inc
index 954a43c1bb..f050b3a5fa 100644
--- a/bsps/arm/lm3s69xx/config/lm3s69xx.inc
+++ b/bsps/arm/lm3s69xx/config/lm3s69xx.inc
@@ -6,7 +6,7 @@ include $(RTEMS_ROOT)/make/custom/default.cfg
RTEMS_CPU = arm
-CPU_CFLAGS = -march=armv7-m -mthumb
+CPU_CFLAGS = -mthumb -mcpu=cortex-m3
CFLAGS_OPTIMIZE_V = -O2 -g
diff --git a/bsps/arm/lpc176x/config/lpc1768_mbed.cfg b/bsps/arm/lpc176x/config/lpc1768_mbed.cfg
index 3e9255e88f..f6aacf33b1 100644
--- a/bsps/arm/lpc176x/config/lpc1768_mbed.cfg
+++ b/bsps/arm/lpc176x/config/lpc1768_mbed.cfg
@@ -6,7 +6,7 @@ include $(RTEMS_ROOT)/make/custom/default.cfg
RTEMS_CPU = arm
-CPU_CFLAGS = -march=armv7-m -mthumb
+CPU_CFLAGS = -mthumb -mcpu=cortex-m3
CFLAGS_OPTIMIZE_V = -O2 -ggdb3
CFLAGS_OPTIMIZE_V += -ffunction-sections -fdata-sections
diff --git a/bsps/arm/lpc24xx/config/lpc17xx.inc b/bsps/arm/lpc24xx/config/lpc17xx.inc
index e877959e1d..3ecef90db9 100644
--- a/bsps/arm/lpc24xx/config/lpc17xx.inc
+++ b/bsps/arm/lpc24xx/config/lpc17xx.inc
@@ -6,7 +6,7 @@ include $(RTEMS_ROOT)/make/custom/default.cfg
RTEMS_CPU = arm
-CPU_CFLAGS = -march=armv7-m -mthumb
+CPU_CFLAGS = -mthumb -mcpu=cortex-m3
CFLAGS_OPTIMIZE_V = -O2 -g
CFLAGS_OPTIMIZE_V += -ffunction-sections -fdata-sections
diff --git a/bsps/arm/lpc24xx/config/lpc40xx.inc b/bsps/arm/lpc24xx/config/lpc40xx.inc
index 5460a95f54..a3fb48a4b9 100644
--- a/bsps/arm/lpc24xx/config/lpc40xx.inc
+++ b/bsps/arm/lpc24xx/config/lpc40xx.inc
@@ -6,7 +6,7 @@ include $(RTEMS_ROOT)/make/custom/default.cfg
RTEMS_CPU = arm
-CPU_CFLAGS = -mthumb -march=armv7-m -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mtune=cortex-m4
+CPU_CFLAGS = -mthumb -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard
CFLAGS_OPTIMIZE_V = -O2 -g
CFLAGS_OPTIMIZE_V += -ffunction-sections -fdata-sections
diff --git a/bsps/arm/stm32f4/config/stm32f105rc.cfg b/bsps/arm/stm32f4/config/stm32f105rc.cfg
index b0a522e08f..750ade24e4 100644
--- a/bsps/arm/stm32f4/config/stm32f105rc.cfg
+++ b/bsps/arm/stm32f4/config/stm32f105rc.cfg
@@ -1 +1,10 @@
-include $(RTEMS_ROOT)/make/custom/stm32f4.cfg
+include $(RTEMS_ROOT)/make/custom/default.cfg
+
+RTEMS_CPU = arm
+
+CPU_CFLAGS = -mthumb -mcpu=cortex-m3
+
+CFLAGS_OPTIMIZE_V = -O2 -g
+CFLAGS_OPTIMIZE_V += -ffunction-sections -fdata-sections
+
+LDFLAGS = -Wl,--gc-sections
diff --git a/bsps/arm/stm32f4/config/stm32f4.cfg b/bsps/arm/stm32f4/config/stm32f4.cfg
index edca4bfa32..3a6982b23c 100644
--- a/bsps/arm/stm32f4/config/stm32f4.cfg
+++ b/bsps/arm/stm32f4/config/stm32f4.cfg
@@ -2,7 +2,7 @@ include $(RTEMS_ROOT)/make/custom/default.cfg
RTEMS_CPU = arm
-CPU_CFLAGS = -march=armv7-m -mthumb
+CPU_CFLAGS = -mthumb -mcpu=cortex-m4
CFLAGS_OPTIMIZE_V = -O2 -g
CFLAGS_OPTIMIZE_V += -ffunction-sections -fdata-sections