boards: adapted Makefiles to cortexm_common folder

- changed naming of cortexm_common in makefiles - included some minor cleanups
8 years ago · 49dcb692d1
parent 97b6c56178
commit 49dcb692d1
23 changed files with 33 additions and 33 deletions
--- a/boards/airfy-beacon/Makefile.include
+++ b/boards/airfy-beacon/Makefile.include
@ -13,4 +13,4 @@ include $(RIOTBOARD)/Makefile.include.serial
 include $(RIOTBOARD)/Makefile.include.openocd

 # include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortex_common
+include $(RIOTBOARD)/Makefile.include.cortexm_common
--- a/boards/arduino-due/Makefile.include
+++ b/boards/arduino-due/Makefile.include
@ -1,15 +1,17 @@
 # define the cpu used by the arduino due board
 export CPU = sam3x8e
-
-export FLASHER = $(RIOTBOARD)/$(BOARD)/dist/flash.sh
-export OFLAGS = -O binary
+export CPU_MODEL = sam3x8e

 # define the default port depending on the host OS
 PORT_LINUX ?= /dev/ttyACM0
 PORT_DARWIN ?= $(shell ls -1 /dev/tty.usbmodem* | head -n 1)

+# define board specific flasher options
+export FLASHER = $(RIOTBOARD)/$(BOARD)/dist/flash.sh
+export OFLAGS = -O binary
+
 # setup serial terminal
 include $(RIOTBOARD)/Makefile.include.serial

 # include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortex_common
+include $(RIOTBOARD)/Makefile.include.cortexm_common
--- a/boards/cc2538dk/Makefile.include
+++ b/boards/cc2538dk/Makefile.include
@ -22,7 +22,6 @@ else ifeq ($(PROGRAMMER),jlink)
  export FFLAGS  = $(BINDIR) $(HEXFILE)
 endif

-export LINKFLAGS += -L$(RIOTCPU)/$(CPU)
 export OFLAGS    = -O binary --gap-fill 0xff
 export HEXFILE = $(ELFFILE:.elf=.bin)
 export DEBUGGER_FLAGS = $(BINDIR) $(ELFFILE)
@ -31,4 +30,4 @@ export RESET_FLAGS = $(BINDIR)
 export OBJDUMPFLAGS += --disassemble --source --disassembler-options=force-thumb

 # include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortex_common
+include $(RIOTBOARD)/Makefile.include.cortexm_common
--- a/boards/f4vi1/Makefile.include
+++ b/boards/f4vi1/Makefile.include
@ -14,10 +14,10 @@ export FLASHER = st-flash
 export DEBUGGER = $(RIOTBOARD)/$(BOARD)/dist/debug.sh
 export DEBUGSERVER = st-util

-#
+# define st-flash parameters
 export OFLAGS = -O binary
 export FFLAGS = write bin/$(BOARD)/$(APPLICATION).hex 0x8000000
 export DEBUGGER_FLAGS = $(RIOTBOARD)/$(BOARD)/dist/gdb.conf $(BINDIR)/$(APPLICATION).elf

 # include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortex_common
+include $(RIOTBOARD)/Makefile.include.cortexm_common
--- a/boards/fox/Makefile.include
+++ b/boards/fox/Makefile.include
@ -16,4 +16,4 @@ include $(RIOTBOARD)/Makefile.include.openocd
 include $(RIOTBOARD)/$(BOARD)/Makefile.dep

 # include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortex_common
+include $(RIOTBOARD)/Makefile.include.cortexm_common
--- a/boards/iot-lab_M3/Makefile.include
+++ b/boards/iot-lab_M3/Makefile.include
@ -13,11 +13,8 @@ include $(RIOTBOARD)/Makefile.include.serial
 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd

-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBASE)/drivers/at86rf231/include -I$(RIOTBASE)/sys/net/include
-
 # include board dependencies
 include $(RIOTBOARD)/$(BOARD)/Makefile.dep

 # include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortex_common
+include $(RIOTBOARD)/Makefile.include.cortexm_common
--- a/boards/mbed_lpc1768/Makefile.include
+++ b/boards/mbed_lpc1768/Makefile.include
@ -1,5 +1,7 @@
 # define the cpu used by the mbed_lpx1768 board
 export CPU = lpc1768
+export CPU_MODEL = lpc1768
+

 export FLASHER = $(RIOTBOARD)/$(BOARD)/dist/flash.sh
 export DEBUGGER =
@ -18,4 +20,4 @@ PORT_DARWIN ?= $(shell ls -1 /dev/tty.SLAB_USBtoUART* | head -n 1)
 include $(RIOTBOARD)/Makefile.include.serial

 # include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortex_common
+include $(RIOTBOARD)/Makefile.include.cortexm_common
--- a/boards/msbiot/Makefile.include
+++ b/boards/msbiot/Makefile.include
@ -20,4 +20,4 @@ include $(RIOTBOARD)/Makefile.include.serial
 include $(RIOTBOARD)/Makefile.include.openocd

 # include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortex_common
+include $(RIOTBOARD)/Makefile.include.cortexm_common
--- a/boards/nucleo-f091/Makefile.include
+++ b/boards/nucleo-f091/Makefile.include
@ -13,4 +13,4 @@ include $(RIOTBOARD)/Makefile.include.serial
 include $(RIOTBOARD)/Makefile.include.openocd

 # include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortex_common
+include $(RIOTBOARD)/Makefile.include.cortexm_common
--- a/boards/nucleo-f334/Makefile.include
+++ b/boards/nucleo-f334/Makefile.include
@ -13,4 +13,4 @@ include $(RIOTBOARD)/Makefile.include.serial
 include $(RIOTBOARD)/Makefile.include.openocd

 # include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortex_common
+include $(RIOTBOARD)/Makefile.include.cortexm_common
--- a/boards/nucleo-l1/Makefile.include
+++ b/boards/nucleo-l1/Makefile.include
@ -13,4 +13,4 @@ include $(RIOTBOARD)/Makefile.include.serial
 include $(RIOTBOARD)/Makefile.include.openocd

 # include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortex_common
+include $(RIOTBOARD)/Makefile.include.cortexm_common
--- a/boards/openmote/Makefile.include
+++ b/boards/openmote/Makefile.include
@ -25,4 +25,4 @@ include $(RIOTBOARD)/Makefile.include.serial
 include $(RIOTBOARD)/Makefile.include.openocd

 # include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortex_common
+include $(RIOTBOARD)/Makefile.include.cortexm_common
--- a/boards/pca10000/Makefile.include
+++ b/boards/pca10000/Makefile.include
@ -22,4 +22,4 @@ export RESET_FLAGS = $(BINDIR)
 include $(RIOTBOARD)/Makefile.include.serial

 # include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortex_common
+include $(RIOTBOARD)/Makefile.include.cortexm_common
--- a/boards/pca10005/Makefile.include
+++ b/boards/pca10005/Makefile.include
@ -23,4 +23,4 @@ export RESET_FLAGS = $(BINDIR)
 include $(RIOTBOARD)/Makefile.include.serial

 # include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortex_common
+include $(RIOTBOARD)/Makefile.include.cortexm_common
--- a/boards/saml21-xpro/Makefile.include
+++ b/boards/saml21-xpro/Makefile.include
@ -14,4 +14,4 @@ include $(RIOTBOARD)/Makefile.include.serial
 include $(RIOTBOARD)/Makefile.include.openocd

 # include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortex_common
+include $(RIOTBOARD)/Makefile.include.cortexm_common
--- a/boards/samr21-xpro/Makefile
+++ b/boards/samr21-xpro/Makefile
@ -1,5 +1,4 @@
 # tell the Makefile.base which module to build
 MODULE = $(BOARD)_base

-
 include $(RIOTBASE)/Makefile.base
--- a/boards/samr21-xpro/Makefile.include
+++ b/boards/samr21-xpro/Makefile.include
@ -2,13 +2,13 @@
 export CPU = samd21
 export CPU_MODEL = samr21g18a

-#
+# TODO: remove once the CPU implementation is stable with -Os
 CFLAGS_OPT = -O0

 # set default port depending on operating system
 PORT_LINUX ?= /dev/ttyACM0

-#
+# setup the boards dependencies
 include $(RIOTBOARD)/$(BOARD)/Makefile.dep

 # setup serial terminal
@ -18,4 +18,4 @@ include $(RIOTBOARD)/Makefile.include.serial
 include $(RIOTBOARD)/Makefile.include.openocd

 # include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortex_common
+include $(RIOTBOARD)/Makefile.include.cortexm_common
--- a/boards/spark-core/Makefile.include
+++ b/boards/spark-core/Makefile.include
@ -26,4 +26,4 @@ include $(RIOTBOARD)/Makefile.include.serial
 include $(RIOTBOARD)/Makefile.include.openocd

 # include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortex_common
+include $(RIOTBOARD)/Makefile.include.cortexm_common
--- a/boards/stm32f0discovery/Makefile.include
+++ b/boards/stm32f0discovery/Makefile.include
@ -13,4 +13,4 @@ include $(RIOTBOARD)/Makefile.include.serial
 include $(RIOTBOARD)/Makefile.include.openocd

 # include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortex_common
+include $(RIOTBOARD)/Makefile.include.cortexm_common
--- a/boards/stm32f3discovery/Makefile.include
+++ b/boards/stm32f3discovery/Makefile.include
@ -13,4 +13,4 @@ include $(RIOTBOARD)/Makefile.include.serial
 include $(RIOTBOARD)/Makefile.include.openocd

 # include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortex_common
+include $(RIOTBOARD)/Makefile.include.cortexm_common
--- a/boards/stm32f4discovery/Makefile.include
+++ b/boards/stm32f4discovery/Makefile.include
@ -13,4 +13,4 @@ include $(RIOTBOARD)/Makefile.include.serial
 include $(RIOTBOARD)/Makefile.include.openocd

 # include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortex_common
+include $(RIOTBOARD)/Makefile.include.cortexm_common
--- a/boards/udoo/Makefile.include
+++ b/boards/udoo/Makefile.include
@ -1,5 +1,6 @@
 # define the cpu used by the udoo board
 export CPU = sam3x8e
+export CPU_MODEL = sam3x8e

 #define the flash-tool and default port depending on the host operating system
 OS := $(shell uname)
@ -23,4 +24,4 @@ export FFLAGS = -R -e -w -v -b bin/$(BOARD)/$(APPLICATION).hex
 include $(RIOTBOARD)/Makefile.include.serial

 # include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortex_common
+include $(RIOTBOARD)/Makefile.include.cortexm_common
--- a/boards/yunjia-nrf51822/Makefile.include
+++ b/boards/yunjia-nrf51822/Makefile.include
@ -13,4 +13,4 @@ include $(RIOTBOARD)/Makefile.include.serial
 include $(RIOTBOARD)/Makefile.include.openocd

 # include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortex_common
+include $(RIOTBOARD)/Makefile.include.cortexm_common