From b9215594be99bc56d27ea2330cc91d585caf16ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Nohlg=C3=A5rd?= Date: Wed, 27 Jan 2016 10:47:12 +0100 Subject: [PATCH 01/11] Makefiles: move to new directory /makefiles --- Makefile | 2 +- Makefile.include | 41 +++++++++++++------ boards/airfy-beacon/Makefile.include | 4 +- boards/arduino-due/Makefile.include | 2 +- boards/arduino-zero/Makefile.include | 4 +- boards/calliope-mini/Makefile.include | 4 +- boards/cc2538dk/Makefile.include | 2 +- boards/cc2650stk/Makefile.include | 2 +- boards/ek-lm4f120xl/Makefile.include | 4 +- boards/f4vi1/Makefile.include | 2 +- boards/fox/Makefile.include | 6 +-- boards/frdm-k64f/Makefile.include | 4 +- boards/iotlab-common/Makefile.include | 4 +- boards/limifrog-v1/Makefile.include | 4 +- boards/maple-mini/Makefile.include | 4 +- boards/mbed_lpc1768/Makefile.include | 2 +- boards/microbit/Makefile.include | 4 +- boards/msb-430-common/Makefile.include | 2 +- boards/msbiot/Makefile.include | 4 +- boards/mulle/Makefile.include | 4 +- boards/nrf51dongle/Makefile.include | 4 +- boards/nrf52dk/Makefile.include | 4 +- boards/nrf6310/Makefile.include | 2 +- boards/nucleo-common/Makefile.include.serial | 4 +- boards/opencm904/Makefile.include | 2 +- boards/openmote-cc2538/Makefile.include | 4 +- boards/pba-d-01-kw2x/Makefile.include | 4 +- boards/pca10000/Makefile.include | 4 +- boards/pca10005/Makefile.include | 4 +- boards/remote-common/Makefile.include | 2 +- boards/saml21-xpro/Makefile.include | 4 +- boards/samr21-xpro/Makefile.include | 4 +- boards/seeeduino_arch-pro/Makefile.include | 4 +- boards/slwstk6220a/Makefile.include | 4 +- boards/sodaq-autonomo/Makefile.include | 4 +- boards/spark-core/Makefile.include | 4 +- boards/stm32f0discovery/Makefile.include | 4 +- boards/stm32f3discovery/Makefile.include | 4 +- boards/stm32f4discovery/Makefile.include | 4 +- boards/telosb/Makefile.include | 2 +- boards/udoo/Makefile.include | 2 +- boards/weio/Makefile.include | 2 +- boards/wsn430-common/Makefile.include | 2 +- boards/yunjia-nrf51822/Makefile.include | 4 +- boards/z1/Makefile.include | 2 +- cpu/cc2538/Makefile.include | 2 +- cpu/cc26x0/Makefile.include | 2 +- cpu/ezr32wg/Makefile.include | 2 +- cpu/k60/Makefile.include | 2 +- cpu/k64f/Makefile.include | 2 +- cpu/kw2x/Makefile.include | 2 +- cpu/lm4f120/Makefile.include | 2 +- cpu/lpc11u34/Makefile.include | 2 +- cpu/lpc1768/Makefile.include | 2 +- cpu/msp430_common/Makefile.include | 2 +- cpu/nrf51/Makefile.include | 2 +- cpu/nrf52/Makefile.include | 2 +- cpu/sam3/Makefile.include | 2 +- cpu/samd21/Makefile.include | 2 +- cpu/saml21/Makefile.include | 2 +- cpu/stm32f0/Makefile.include | 2 +- cpu/stm32f1/Makefile.include | 2 +- cpu/stm32f2/Makefile.include | 2 +- cpu/stm32f3/Makefile.include | 2 +- cpu/stm32f4/Makefile.include | 3 +- cpu/stm32l0/Makefile.include | 2 +- cpu/stm32l1/Makefile.include | 2 +- .../application.mk | 0 .../arch/cortexm.mk | 0 .../arch/msp430.mk | 3 -- Makefile.bindist => makefiles/bindist.mk | 0 .../buildtests.mk | 0 Makefile.cflags => makefiles/cflags.mk | 0 .../defaultmodules.mk | 0 Makefile.docker => makefiles/docker.mk | 2 + Makefile.features => makefiles/features.mk | 0 Makefile.modules => makefiles/modules.mk | 0 .../pseudomodules.mk | 0 .../scan-build.mk | 0 Makefile.tests => makefiles/tests.mk | 0 .../toolchain/gnu.mk | 0 .../toolchain/llvm.mk | 0 .../tools/jlink.mk | 0 .../tools/openocd.mk | 0 .../tools/serial.mk | 0 Makefile.vars => makefiles/vars.mk | 1 + 86 files changed, 127 insertions(+), 113 deletions(-) rename Makefile.application => makefiles/application.mk (100%) rename cpu/Makefile.include.cortexm_common => makefiles/arch/cortexm.mk (100%) rename cpu/Makefile.include.msp430_common => makefiles/arch/msp430.mk (88%) rename Makefile.bindist => makefiles/bindist.mk (100%) rename Makefile.buildtests => makefiles/buildtests.mk (100%) rename Makefile.cflags => makefiles/cflags.mk (100%) rename Makefile.defaultmodules => makefiles/defaultmodules.mk (100%) rename Makefile.docker => makefiles/docker.mk (97%) rename Makefile.features => makefiles/features.mk (100%) rename Makefile.modules => makefiles/modules.mk (100%) rename Makefile.pseudomodules => makefiles/pseudomodules.mk (100%) rename Makefile.scan-build => makefiles/scan-build.mk (100%) rename Makefile.tests => makefiles/tests.mk (100%) rename cpu/Makefile.include.gnu => makefiles/toolchain/gnu.mk (100%) rename cpu/Makefile.include.llvm => makefiles/toolchain/llvm.mk (100%) rename boards/Makefile.include.jlink => makefiles/tools/jlink.mk (100%) rename boards/Makefile.include.openocd => makefiles/tools/openocd.mk (100%) rename boards/Makefile.include.serial => makefiles/tools/serial.mk (100%) rename Makefile.vars => makefiles/vars.mk (98%) diff --git a/Makefile b/Makefile index ca0ccbee60f7..d7181c19d789 100644 --- a/Makefile +++ b/Makefile @@ -37,4 +37,4 @@ welcome: @echo "Or ask questions on our mailing list:" @echo " users@riot-os.org (http://lists.riot-os.org/mailman/listinfo/users)" --include Makefile.tests +-include makefiles/tests.mk diff --git a/Makefile.include b/Makefile.include index 3c19baad5d82..e2e226f4e202 100644 --- a/Makefile.include +++ b/Makefile.include @@ -8,6 +8,7 @@ RIOTBASE ?= $(dir $(lastword $(MAKEFILE_LIST))) CCACHE_BASEDIR ?= $(RIOTBASE) RIOTCPU ?= $(RIOTBASE)/cpu RIOTBOARD ?= $(RIOTBASE)/boards +RIOTMAKE ?= $(RIOTBASE)/makefiles RIOTPKG ?= $(RIOTBASE)/pkg RIOTPROJECT ?= $(shell git rev-parse --show-toplevel 2>/dev/null || pwd) GITCACHE ?= $(RIOTBASE)/dist/tools/git/git-cache @@ -16,13 +17,27 @@ BINDIRBASE ?= $(APPDIR)/bin BINDIR ?= $(BINDIRBASE)/$(BOARD) PKGDIRBASE ?= $(BINDIRBASE)/pkg/$(BOARD) -__DIRECTORY_VARIABLES := RIOTBASE CCACHE_BASEDIR RIOTCPU RIOTBOARD RIOTPKG GITCACHE RIOTPROJECT APPDIR BINDIRBASE BINDIR PKGDIRBASE +__DIRECTORY_VARIABLES := \ + RIOTBASE \ + RIOTCPU \ + RIOTBOARD \ + RIOTMAKE \ + RIOTPKG \ + RIOTPROJECT \ + APPDIR \ + BINDIRBASE \ + BINDIR \ + CCACHE_BASEDIR \ + GITCACHE \ + PKGDIRBASE \ + # # Make all paths absolute. override RIOTBASE := $(abspath $(RIOTBASE)) override CCACHE_BASEDIR := $(abspath $(CCACHE_BASEDIR)) override RIOTCPU := $(abspath $(RIOTCPU)) override RIOTBOARD := $(abspath $(RIOTBOARD)) +override RIOTMAKE := $(abspath $(RIOTMAKE)) override RIOTPKG := $(abspath $(RIOTPKG)) override RIOTPROJECT := $(abspath $(RIOTPROJECT)) override GITCACHE := $(abspath $(GITCACHE)) @@ -47,10 +62,10 @@ BUILDRELPATH ?= ${PWD:${RIOTPROJECT}/%=%}/ # Include Docker settings near the top because we need to build the environment # command line before some of the variable origins are overwritten below when # using abspath, strip etc. -include $(RIOTBASE)/Makefile.docker +include $(RIOTMAKE)/docker.mk # Static code analysis tools provided by LLVM -include $(RIOTBASE)/Makefile.scan-build +include $(RIOTMAKE)/scan-build.mk export RIOTBUILD_CONFIG_HEADER_C = $(BINDIR)/riotbuild/riotbuild.h @@ -190,13 +205,13 @@ INCLUDES += -I$(RIOTCPU)/$(CPU)/include INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include # mandatory includes! -include $(RIOTBASE)/Makefile.pseudomodules -include $(RIOTBASE)/Makefile.defaultmodules +include $(RIOTMAKE)/pseudomodules.mk +include $(RIOTMAKE)/defaultmodules.mk include $(RIOTBOARD)/$(BOARD)/Makefile.include include $(RIOTCPU)/$(CPU)/Makefile.include # Import all toolchain settings -include $(RIOTCPU)/Makefile.include.$(TOOLCHAIN) +include $(RIOTMAKE)/toolchain/$(TOOLCHAIN).mk # get number of interfaces straight before resolving dependencies GNRC_NETIF_NUMOF ?= 1 @@ -239,7 +254,7 @@ ifneq (0, $(shell mkdir -p $(BINDIR); $(AR) rc $(BINDIR)/empty-archive.a 2> /dev endif # Feature test default CFLAGS and LINKFLAGS for the set compiled. -include $(RIOTBASE)/Makefile.cflags +include $(RIOTMAKE)/cflags.mk # make the RIOT version available to the program ifeq ($(origin RIOT_VERSION), undefined) @@ -279,7 +294,7 @@ all: ..in-docker-container else ## make script for your application. Build RIOT-base here! all: ..compiler-check ..build-message $(RIOTBUILD_CONFIG_HEADER_C) $(USEPKG:%=${BINDIR}/%.a) $(APPDEPS) - $(Q)DIRS="$(DIRS)" "$(MAKE)" -C $(APPDIR) -f $(RIOTBASE)/Makefile.application + $(Q)DIRS="$(DIRS)" "$(MAKE)" -C $(APPDIR) -f $(RIOTMAKE)/application.mk ifeq (,$(RIOTNOLINK)) ifeq ($(BUILDOSXNATIVE),1) $(Q)$(if $(CPPMIX),$(CXX),$(LINK)) $(UNDEF) -o $(ELFFILE) $$(find $(BASELIBS) -size +8c) $(LINKFLAGS) $(LINKFLAGPREFIX)-no_pie @@ -407,13 +422,13 @@ $(CURDIR)/eclipsesym.xml: $(RIOTBASE)/dist/tools/eclipsesym/cmdline2xml.sh > $@ # Extra make goals for testing and comparing changes. -include $(RIOTBASE)/Makefile.buildtests +include $(RIOTMAKE)/buildtests.mk # process provided features -include $(RIOTBASE)/Makefile.features +include $(RIOTMAKE)/features.mk # Export variables used throughout the whole make system: -include $(RIOTBASE)/Makefile.vars +include $(RIOTMAKE)/vars.mk # Warn if the selected board and drivers don't provide all needed features: ifneq (, $(filter all, $(if $(MAKECMDGOALS), $(MAKECMDGOALS), all))) @@ -517,10 +532,10 @@ endif include $(RIOTBASE)/dist/tools/desvirt/Makefile.desvirt # include bindist target -include $(RIOTBASE)/Makefile.bindist +include $(RIOTMAKE)/bindist.mk # Add all USEMODULE modules to CFLAGS -include $(RIOTBASE)/Makefile.modules +include $(RIOTMAKE)/modules.mk # Build a header file with all common macro definitions and undefinitions # make it phony to force re-run of the script every time even if the file exists diff --git a/boards/airfy-beacon/Makefile.include b/boards/airfy-beacon/Makefile.include index 14eaf5001406..35898c26e244 100644 --- a/boards/airfy-beacon/Makefile.include +++ b/boards/airfy-beacon/Makefile.include @@ -7,7 +7,7 @@ PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) # setup serial terminal -include $(RIOTBOARD)/Makefile.include.serial +include $(RIOTMAKE)/tools/serial.mk # this board uses openocd -include $(RIOTBOARD)/Makefile.include.openocd +include $(RIOTMAKE)/tools/openocd.mk diff --git a/boards/arduino-due/Makefile.include b/boards/arduino-due/Makefile.include index 08c0eefea7ca..7c3e20cba774 100644 --- a/boards/arduino-due/Makefile.include +++ b/boards/arduino-due/Makefile.include @@ -11,4 +11,4 @@ export FLASHER = $(RIOTBOARD)/$(BOARD)/dist/flash.sh export OFLAGS = -O binary # setup serial terminal -include $(RIOTBOARD)/Makefile.include.serial +include $(RIOTMAKE)/tools/serial.mk diff --git a/boards/arduino-zero/Makefile.include b/boards/arduino-zero/Makefile.include index 83a0716a484f..4114b6394c01 100644 --- a/boards/arduino-zero/Makefile.include +++ b/boards/arduino-zero/Makefile.include @@ -7,7 +7,7 @@ export PORT_LINUX ?= /dev/ttyACM0 export PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) # setup serial terminal -include $(RIOTBOARD)/Makefile.include.serial +include $(RIOTMAKE)/tools/serial.mk # Add board selector (USB serial) to OpenOCD options if specified. # Use /dist/tools/usb-serial/list-ttys.sh to find out serial number. @@ -22,4 +22,4 @@ ifneq (,$(SERIAL)) endif # this board uses openocd -include $(RIOTBOARD)/Makefile.include.openocd +include $(RIOTMAKE)/tools/openocd.mk diff --git a/boards/calliope-mini/Makefile.include b/boards/calliope-mini/Makefile.include index d9c05ab559bc..fcb96e678fe4 100644 --- a/boards/calliope-mini/Makefile.include +++ b/boards/calliope-mini/Makefile.include @@ -7,7 +7,7 @@ PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) # setup serial terminal -include $(RIOTBOARD)/Makefile.include.serial +include $(RIOTMAKE)/tools/serial.mk # we support flashing through plain fscopy or using JLink FLASHTOOL ?= fscopy @@ -22,7 +22,7 @@ ifeq (fscopy,$(FLASHTOOL)) export DEBUGSERVER = else ifeq (jlink,$(FLASHTOOL)) export JLINK_DEVICE := nrf51822 - include $(RIOTBOARD)/Makefile.include.jlink + include $(RIOTMAKE)/tools/jlink.mk else $(info ERROR: invalid flash tool specified) endif diff --git a/boards/cc2538dk/Makefile.include b/boards/cc2538dk/Makefile.include index d1352658650f..43430c70cea7 100644 --- a/boards/cc2538dk/Makefile.include +++ b/boards/cc2538dk/Makefile.include @@ -9,7 +9,7 @@ export PROGRAMMER_SERIAL ?= 06EB # the debug UART is always the second tty with the matching serial number: PORT_LINUX ?= $(word 2,$(shell $(RIOTBASE)/dist/tools/usb-serial/find-tty.sh '^$(PROGRAMMER_SERIAL)')) PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbserial*))) -include $(RIOTBOARD)/Makefile.include.serial +include $(RIOTMAKE)/tools/serial.mk # debugger config export DEBUGGER = $(RIOTBOARD)/$(BOARD)/dist/debug.sh diff --git a/boards/cc2650stk/Makefile.include b/boards/cc2650stk/Makefile.include index aecba3b4f00c..c73882a279f9 100644 --- a/boards/cc2650stk/Makefile.include +++ b/boards/cc2650stk/Makefile.include @@ -7,7 +7,7 @@ PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) # setup serial terminal -include $(RIOTBOARD)/Makefile.include.serial +include $(RIOTMAKE)/tools/serial.mk # configure the flash tool export UNIFLASH_PATH ?= "UNIFLASH_PATH unconfigured" diff --git a/boards/ek-lm4f120xl/Makefile.include b/boards/ek-lm4f120xl/Makefile.include index 373406db2e4a..1086e70ba30a 100644 --- a/boards/ek-lm4f120xl/Makefile.include +++ b/boards/ek-lm4f120xl/Makefile.include @@ -7,7 +7,7 @@ PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) # setup serial terminal -include $(RIOTBOARD)/Makefile.include.serial +include $(RIOTMAKE)/tools/serial.mk # this board uses openocd -include $(RIOTBOARD)/Makefile.include.openocd +include $(RIOTMAKE)/tools/openocd.mk diff --git a/boards/f4vi1/Makefile.include b/boards/f4vi1/Makefile.include index 19d12fd50ec9..3e334eeca547 100644 --- a/boards/f4vi1/Makefile.include +++ b/boards/f4vi1/Makefile.include @@ -7,7 +7,7 @@ PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) # setup serial terminal -include $(RIOTBOARD)/Makefile.include.serial +include $(RIOTMAKE)/tools/serial.mk # st-flash export FLASHER = st-flash diff --git a/boards/fox/Makefile.include b/boards/fox/Makefile.include index d7955baeaa0e..04abd7bb8523 100644 --- a/boards/fox/Makefile.include +++ b/boards/fox/Makefile.include @@ -4,10 +4,10 @@ export CPU_MODEL = stm32f103re # set default port depending on operating system PORT_LINUX ?= /dev/ttyUSB1 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbserial*B))) +PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbserial*))) # setup serial terminal -include $(RIOTBOARD)/Makefile.include.serial +include $(RIOTMAKE)/tools/serial.mk # this board uses openocd -include $(RIOTBOARD)/Makefile.include.openocd +include $(RIOTMAKE)/tools/openocd.mk diff --git a/boards/frdm-k64f/Makefile.include b/boards/frdm-k64f/Makefile.include index 8e063b292efd..15d01d401efe 100644 --- a/boards/frdm-k64f/Makefile.include +++ b/boards/frdm-k64f/Makefile.include @@ -24,7 +24,7 @@ export OPENOCD_EXTRA_INIT export PRE_FLASH_CHECK_SCRIPT = $(RIOTCPU)/kinetis_common/dist/check-fcfield-elf.sh # setup serial terminal -include $(RIOTBOARD)/Makefile.include.serial +include $(RIOTMAKE)/tools/serial.mk # this board uses openocd -include $(RIOTBOARD)/Makefile.include.openocd +include $(RIOTMAKE)/tools/openocd.mk diff --git a/boards/iotlab-common/Makefile.include b/boards/iotlab-common/Makefile.include index 43974f6d6e5a..3b9ae5695097 100644 --- a/boards/iotlab-common/Makefile.include +++ b/boards/iotlab-common/Makefile.include @@ -8,10 +8,10 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbserial*B))) # setup serial terminal export BAUD = 500000 -include $(RIOTBOARD)/Makefile.include.serial +include $(RIOTMAKE)/tools/serial.mk # this board uses openocd -include $(RIOTBOARD)/Makefile.include.openocd +include $(RIOTMAKE)/tools/openocd.mk # add the common header files to the include path INCLUDES += -I$(RIOTBOARD)/iotlab-common/include diff --git a/boards/limifrog-v1/Makefile.include b/boards/limifrog-v1/Makefile.include index 40636539362b..31282715743e 100644 --- a/boards/limifrog-v1/Makefile.include +++ b/boards/limifrog-v1/Makefile.include @@ -7,7 +7,7 @@ PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) # setup serial terminal -include $(RIOTBOARD)/Makefile.include.serial +include $(RIOTMAKE)/tools/serial.mk # this board uses openocd -include $(RIOTBOARD)/Makefile.include.openocd +include $(RIOTMAKE)/tools/openocd.mk diff --git a/boards/maple-mini/Makefile.include b/boards/maple-mini/Makefile.include index 9ca99b8298e2..2196cf5a7e22 100644 --- a/boards/maple-mini/Makefile.include +++ b/boards/maple-mini/Makefile.include @@ -7,7 +7,7 @@ PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) # setup serial terminal -include $(RIOTBOARD)/Makefile.include.serial +include $(RIOTMAKE)/tools/serial.mk # this board uses openocd -include $(RIOTBOARD)/Makefile.include.openocd +include $(RIOTMAKE)/tools/openocd.mk diff --git a/boards/mbed_lpc1768/Makefile.include b/boards/mbed_lpc1768/Makefile.include index e6c64263cb4c..425ff3c8dca0 100644 --- a/boards/mbed_lpc1768/Makefile.include +++ b/boards/mbed_lpc1768/Makefile.include @@ -15,4 +15,4 @@ PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) # setup serial terminal -include $(RIOTBOARD)/Makefile.include.serial +include $(RIOTMAKE)/tools/serial.mk diff --git a/boards/microbit/Makefile.include b/boards/microbit/Makefile.include index 57822ccd2a7c..ad12746fbb8e 100644 --- a/boards/microbit/Makefile.include +++ b/boards/microbit/Makefile.include @@ -7,7 +7,7 @@ PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) # setup serial terminal -include $(RIOTBOARD)/Makefile.include.serial +include $(RIOTMAKE)/tools/serial.mk # we support flashing through plain fscopy or using JLink FLASHTOOL ?= fscopy @@ -22,7 +22,7 @@ ifeq (fscopy,$(FLASHTOOL)) export DEBUGSERVER = else ifeq (jlink,$(FLASHTOOL)) export JLINK_DEVICE := nrf51822 - include $(RIOTBOARD)/Makefile.include.jlink + include $(RIOTMAKE)/tools/jlink.mk else $(info ERROR: invalid flash tool specified) endif diff --git a/boards/msb-430-common/Makefile.include b/boards/msb-430-common/Makefile.include index 71bc5200b909..1e13f262ae65 100644 --- a/boards/msb-430-common/Makefile.include +++ b/boards/msb-430-common/Makefile.include @@ -6,7 +6,7 @@ export CPU_MODEL = msp430f1612 PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) # setup serial terminal -include $(RIOTBOARD)/Makefile.include.serial +include $(RIOTMAKE)/tools/serial.mk # setup flash tool export OFLAGS = -O ihex diff --git a/boards/msbiot/Makefile.include b/boards/msbiot/Makefile.include index 1df898f14cf5..4f351401c33d 100644 --- a/boards/msbiot/Makefile.include +++ b/boards/msbiot/Makefile.include @@ -7,7 +7,7 @@ PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) # setup serial terminal -include $(RIOTBOARD)/Makefile.include.serial +include $(RIOTMAKE)/tools/serial.mk # this board uses openocd -include $(RIOTBOARD)/Makefile.include.openocd +include $(RIOTMAKE)/tools/openocd.mk diff --git a/boards/mulle/Makefile.include b/boards/mulle/Makefile.include index 67890b37f596..6616383d0cf3 100644 --- a/boards/mulle/Makefile.include +++ b/boards/mulle/Makefile.include @@ -111,7 +111,7 @@ flash: $(RIOTCPU)/kinetis_common/dist/wdog-disable.bin .DEFAULT_GOAL := # this board uses openocd -include $(RIOTBOARD)/Makefile.include.openocd +include $(RIOTMAKE)/tools/openocd.mk # setup serial terminal -include $(RIOTBOARD)/Makefile.include.serial +include $(RIOTMAKE)/tools/serial.mk diff --git a/boards/nrf51dongle/Makefile.include b/boards/nrf51dongle/Makefile.include index 53810879fd45..f7d42fda7e34 100644 --- a/boards/nrf51dongle/Makefile.include +++ b/boards/nrf51dongle/Makefile.include @@ -8,7 +8,7 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) # setup JLink for flashing export JLINK_DEVICE := nrf51822 -include $(RIOTBOARD)/Makefile.include.jlink +include $(RIOTMAKE)/tools/jlink.mk # setup serial terminal -include $(RIOTBOARD)/Makefile.include.serial +include $(RIOTMAKE)/tools/serial.mk diff --git a/boards/nrf52dk/Makefile.include b/boards/nrf52dk/Makefile.include index b646f3e6fd8f..3256a8f19a68 100644 --- a/boards/nrf52dk/Makefile.include +++ b/boards/nrf52dk/Makefile.include @@ -15,7 +15,7 @@ export JLINK_PRE_FLASH := erase\nloadfile $(BINDIR)/softdevice.hex export JLINK_FLASH_ADDR := 0x1f000 export LINKER_SCRIPT ?= $(RIOTCPU)/$(CPU)/ldscripts/$(CPU_MODEL)_sd.ld endif -include $(RIOTBOARD)/Makefile.include.jlink +include $(RIOTMAKE)/tools/jlink.mk # setup serial terminal -include $(RIOTBOARD)/Makefile.include.serial +include $(RIOTMAKE)/tools/serial.mk diff --git a/boards/nrf6310/Makefile.include b/boards/nrf6310/Makefile.include index 6db9e3a7bd61..1c8625f61b8c 100644 --- a/boards/nrf6310/Makefile.include +++ b/boards/nrf6310/Makefile.include @@ -20,4 +20,4 @@ export DEBUGGER_FLAGS = $(BINDIR) $(ELFFILE) export RESET_FLAGS = $(BINDIR) # setup serial terminal -include $(RIOTBOARD)/Makefile.include.serial +include $(RIOTMAKE)/tools/serial.mk diff --git a/boards/nucleo-common/Makefile.include.serial b/boards/nucleo-common/Makefile.include.serial index 781d8d0a46b2..0859ef061cde 100644 --- a/boards/nucleo-common/Makefile.include.serial +++ b/boards/nucleo-common/Makefile.include.serial @@ -3,7 +3,7 @@ PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) # setup serial terminal -include $(RIOTBOARD)/Makefile.include.serial +include $(RIOTMAKE)/tools/serial.mk # this board uses openocd -include $(RIOTBOARD)/Makefile.include.openocd +include $(RIOTMAKE)/tools/openocd.mk diff --git a/boards/opencm904/Makefile.include b/boards/opencm904/Makefile.include index 4c1dfda5de64..d0ee0e174098 100755 --- a/boards/opencm904/Makefile.include +++ b/boards/opencm904/Makefile.include @@ -20,4 +20,4 @@ PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) # setup serial terminal -include $(RIOTBOARD)/Makefile.include.serial +include $(RIOTMAKE)/tools/serial.mk diff --git a/boards/openmote-cc2538/Makefile.include b/boards/openmote-cc2538/Makefile.include index f4eb8415a48c..98070e81aad7 100644 --- a/boards/openmote-cc2538/Makefile.include +++ b/boards/openmote-cc2538/Makefile.include @@ -15,7 +15,7 @@ ifeq ($(PROGRAMMER),jlink) export JLINK_FLASH_ADDR := 200000 export JLINK_IF := JTAG export TUI := 1 - include $(RIOTBOARD)/Makefile.include.jlink + include $(RIOTMAKE)/tools/jlink.mk else export OFLAGS = -O binary export HEXFILE = $(ELFFILE:.elf=.bin) @@ -24,4 +24,4 @@ else endif # setup serial terminal -include $(RIOTBOARD)/Makefile.include.serial +include $(RIOTMAKE)/tools/serial.mk diff --git a/boards/pba-d-01-kw2x/Makefile.include b/boards/pba-d-01-kw2x/Makefile.include index 3340ebf4196b..00acec222a26 100644 --- a/boards/pba-d-01-kw2x/Makefile.include +++ b/boards/pba-d-01-kw2x/Makefile.include @@ -40,7 +40,7 @@ ifneq (,$(SERIAL)) endif # setup serial terminal -include $(RIOTBOARD)/Makefile.include.serial +include $(RIOTMAKE)/tools/serial.mk # this board uses openocd -include $(RIOTBOARD)/Makefile.include.openocd +include $(RIOTMAKE)/tools/openocd.mk diff --git a/boards/pca10000/Makefile.include b/boards/pca10000/Makefile.include index 7b11716814e5..fd1c53c8addb 100644 --- a/boards/pca10000/Makefile.include +++ b/boards/pca10000/Makefile.include @@ -9,7 +9,7 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) # setup JLink for flashing export JLINK_DEVICE := nrf51822 export JLINK_PRE_FLASH := w4 4001e504 1 -include $(RIOTBOARD)/Makefile.include.jlink +include $(RIOTMAKE)/tools/jlink.mk # setup serial terminal -include $(RIOTBOARD)/Makefile.include.serial +include $(RIOTMAKE)/tools/serial.mk diff --git a/boards/pca10005/Makefile.include b/boards/pca10005/Makefile.include index 202562d2d316..df7deccfa24a 100644 --- a/boards/pca10005/Makefile.include +++ b/boards/pca10005/Makefile.include @@ -9,7 +9,7 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) # setup JLink for flashing export JLINK_DEVICE := nrf51822 export JLINK_PRE_FLASH := w4 4001e504 1 -include $(RIOTBOARD)/Makefile.include.jlink +include $(RIOTMAKE)/tools/jlink.mk # setup serial terminal -include $(RIOTBOARD)/Makefile.include.serial +include $(RIOTMAKE)/tools/serial.mk diff --git a/boards/remote-common/Makefile.include b/boards/remote-common/Makefile.include index b6901b8d89dc..a4f541d0a6dd 100644 --- a/boards/remote-common/Makefile.include +++ b/boards/remote-common/Makefile.include @@ -32,4 +32,4 @@ export OBJDUMPFLAGS += --disassemble --source --disassembler-options=force-thumb export INCLUDES += -I$(RIOTBOARD)/remote-common/include # setup serial terminal -include $(RIOTBOARD)/Makefile.include.serial +include $(RIOTMAKE)/tools/serial.mk diff --git a/boards/saml21-xpro/Makefile.include b/boards/saml21-xpro/Makefile.include index fb6a6119fce8..127ec7180c97 100644 --- a/boards/saml21-xpro/Makefile.include +++ b/boards/saml21-xpro/Makefile.include @@ -5,7 +5,7 @@ export CFLAGS += -D__SAML21J18A__ # setup serial terminal PORT_LINUX ?= /dev/ttyACM0 -include $(RIOTBOARD)/Makefile.include.serial +include $(RIOTMAKE)/tools/serial.mk # this board uses openocd -include $(RIOTBOARD)/Makefile.include.openocd +include $(RIOTMAKE)/tools/openocd.mk diff --git a/boards/samr21-xpro/Makefile.include b/boards/samr21-xpro/Makefile.include index 3502134f1a63..94f1f3b8cb7a 100644 --- a/boards/samr21-xpro/Makefile.include +++ b/boards/samr21-xpro/Makefile.include @@ -7,7 +7,7 @@ PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) # setup serial terminal -include $(RIOTBOARD)/Makefile.include.serial +include $(RIOTMAKE)/tools/serial.mk # Add board selector (USB serial) to OpenOCD options if specified. # Use /dist/tools/usb-serial/list-ttys.sh to find out serial number. @@ -22,4 +22,4 @@ ifneq (,$(SERIAL)) endif # this board uses openocd -include $(RIOTBOARD)/Makefile.include.openocd +include $(RIOTMAKE)/tools/openocd.mk diff --git a/boards/seeeduino_arch-pro/Makefile.include b/boards/seeeduino_arch-pro/Makefile.include index ae3f48f8e764..49f80858ce83 100644 --- a/boards/seeeduino_arch-pro/Makefile.include +++ b/boards/seeeduino_arch-pro/Makefile.include @@ -6,10 +6,10 @@ PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) # setup serial terminal -include $(RIOTBOARD)/Makefile.include.serial +include $(RIOTMAKE)/tools/serial.mk # this board uses openocd -include $(RIOTBOARD)/Makefile.include.openocd +include $(RIOTMAKE)/tools/openocd.mk # generate image checksum from hex file export PRE_FLASH_CHECK_SCRIPT = lpc_checksum --format hex diff --git a/boards/slwstk6220a/Makefile.include b/boards/slwstk6220a/Makefile.include index 991661748adf..0e827fa798e8 100644 --- a/boards/slwstk6220a/Makefile.include +++ b/boards/slwstk6220a/Makefile.include @@ -8,7 +8,7 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) # setup JLink for flashing export JLINK_DEVICE := ezr32wg330f256 -include $(RIOTBOARD)/Makefile.include.jlink +include $(RIOTMAKE)/tools/jlink.mk # setup serial terminal -include $(RIOTBOARD)/Makefile.include.serial +include $(RIOTMAKE)/tools/serial.mk diff --git a/boards/sodaq-autonomo/Makefile.include b/boards/sodaq-autonomo/Makefile.include index 8949df181a61..00b26e5b9653 100644 --- a/boards/sodaq-autonomo/Makefile.include +++ b/boards/sodaq-autonomo/Makefile.include @@ -9,7 +9,7 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) export OFLAGS = -O binary # setup serial terminal -include $(RIOTBOARD)/Makefile.include.serial +include $(RIOTMAKE)/tools/serial.mk # Add board selector (USB serial) to OpenOCD options if specified. # Use /dist/tools/usb-serial/list-ttys.sh to find out serial number. @@ -24,4 +24,4 @@ ifneq (,$(SERIAL)) endif # this board uses openocd -include $(RIOTBOARD)/Makefile.include.openocd +include $(RIOTMAKE)/tools/openocd.mk diff --git a/boards/spark-core/Makefile.include b/boards/spark-core/Makefile.include index 7ff46a018372..9d94535fc14d 100644 --- a/boards/spark-core/Makefile.include +++ b/boards/spark-core/Makefile.include @@ -22,7 +22,7 @@ export TERMFLAGS = -p $(PORT) export INCLUDES += -I$(RIOTCPU)/$(CPU)/include/ -I$(RIOTBOARD)/$(BOARD)/include/ # setup serial terminal -include $(RIOTBOARD)/Makefile.include.serial +include $(RIOTMAKE)/tools/serial.mk # this board uses openocd -include $(RIOTBOARD)/Makefile.include.openocd +include $(RIOTMAKE)/tools/openocd.mk diff --git a/boards/stm32f0discovery/Makefile.include b/boards/stm32f0discovery/Makefile.include index f0a04d1444c6..bce4ae29eba6 100644 --- a/boards/stm32f0discovery/Makefile.include +++ b/boards/stm32f0discovery/Makefile.include @@ -7,7 +7,7 @@ PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) # setup serial terminal -include $(RIOTBOARD)/Makefile.include.serial +include $(RIOTMAKE)/tools/serial.mk # this board uses openocd -include $(RIOTBOARD)/Makefile.include.openocd +include $(RIOTMAKE)/tools/openocd.mk diff --git a/boards/stm32f3discovery/Makefile.include b/boards/stm32f3discovery/Makefile.include index 4389d6e7d918..0a21c889bbf2 100644 --- a/boards/stm32f3discovery/Makefile.include +++ b/boards/stm32f3discovery/Makefile.include @@ -7,7 +7,7 @@ PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) # setup serial terminal -include $(RIOTBOARD)/Makefile.include.serial +include $(RIOTMAKE)/tools/serial.mk # this board uses openocd -include $(RIOTBOARD)/Makefile.include.openocd +include $(RIOTMAKE)/tools/openocd.mk diff --git a/boards/stm32f4discovery/Makefile.include b/boards/stm32f4discovery/Makefile.include index 221cfa97578b..2623e1713424 100644 --- a/boards/stm32f4discovery/Makefile.include +++ b/boards/stm32f4discovery/Makefile.include @@ -7,7 +7,7 @@ PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) # setup serial terminal -include $(RIOTBOARD)/Makefile.include.serial +include $(RIOTMAKE)/tools/serial.mk # this board uses openocd -include $(RIOTBOARD)/Makefile.include.openocd +include $(RIOTMAKE)/tools/openocd.mk diff --git a/boards/telosb/Makefile.include b/boards/telosb/Makefile.include index c84cacd0bd53..e589f4142326 100644 --- a/boards/telosb/Makefile.include +++ b/boards/telosb/Makefile.include @@ -7,7 +7,7 @@ PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbserial-MXV*))) # setup serial terminal export BAUD ?= 9600 -include $(RIOTBOARD)/Makefile.include.serial +include $(RIOTMAKE)/tools/serial.mk # flash tool configuration export OFLAGS = -O ihex diff --git a/boards/udoo/Makefile.include b/boards/udoo/Makefile.include index c73286148526..e9a488345dcb 100644 --- a/boards/udoo/Makefile.include +++ b/boards/udoo/Makefile.include @@ -21,4 +21,4 @@ export OFLAGS = -O binary export FFLAGS = -R -e -w -v -b bin/$(BOARD)/$(APPLICATION).hex # setup serial terminal -include $(RIOTBOARD)/Makefile.include.serial +include $(RIOTMAKE)/tools/serial.mk diff --git a/boards/weio/Makefile.include b/boards/weio/Makefile.include index 766053b7ca91..50ba7fbaf0fc 100644 --- a/boards/weio/Makefile.include +++ b/boards/weio/Makefile.include @@ -15,4 +15,4 @@ PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) # setup serial terminal -include $(RIOTBOARD)/Makefile.include.serial +include $(RIOTMAKE)/tools/serial.mk diff --git a/boards/wsn430-common/Makefile.include b/boards/wsn430-common/Makefile.include index 9daf460eb24a..a45c06ac167e 100644 --- a/boards/wsn430-common/Makefile.include +++ b/boards/wsn430-common/Makefile.include @@ -6,7 +6,7 @@ export CPU_MODEL = msp430f1611 PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) # setup serial terminal -include $(RIOTBOARD)/Makefile.include.serial +include $(RIOTMAKE)/tools/serial.mk # setup flash tool export OFLAGS = -O ihex diff --git a/boards/yunjia-nrf51822/Makefile.include b/boards/yunjia-nrf51822/Makefile.include index 14eaf5001406..35898c26e244 100644 --- a/boards/yunjia-nrf51822/Makefile.include +++ b/boards/yunjia-nrf51822/Makefile.include @@ -7,7 +7,7 @@ PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) # setup serial terminal -include $(RIOTBOARD)/Makefile.include.serial +include $(RIOTMAKE)/tools/serial.mk # this board uses openocd -include $(RIOTBOARD)/Makefile.include.openocd +include $(RIOTMAKE)/tools/openocd.mk diff --git a/boards/z1/Makefile.include b/boards/z1/Makefile.include index fa3dea543cba..4fdaf59b18c1 100644 --- a/boards/z1/Makefile.include +++ b/boards/z1/Makefile.include @@ -6,7 +6,7 @@ export CPU_MODEL = msp430f2617 PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) # setup serial terminal -include $(RIOTBOARD)/Makefile.include.serial +include $(RIOTMAKE)/tools/serial.mk # setup flash tool export OFLAGS = -O ihex diff --git a/cpu/cc2538/Makefile.include b/cpu/cc2538/Makefile.include index 3c829bccf014..85640133132f 100644 --- a/cpu/cc2538/Makefile.include +++ b/cpu/cc2538/Makefile.include @@ -3,4 +3,4 @@ export CPU_ARCH := cortex-m3 # include common SPI functions USEMODULE += periph_common -include $(RIOTCPU)/Makefile.include.cortexm_common +include $(RIOTMAKE)/arch/cortexm.mk diff --git a/cpu/cc26x0/Makefile.include b/cpu/cc26x0/Makefile.include index 507f47d21b0d..d99699fe9666 100644 --- a/cpu/cc26x0/Makefile.include +++ b/cpu/cc26x0/Makefile.include @@ -1,3 +1,3 @@ export CPU_ARCH := cortex-m3 -include $(RIOTCPU)/Makefile.include.cortexm_common +include $(RIOTMAKE)/arch/cortexm.mk diff --git a/cpu/ezr32wg/Makefile.include b/cpu/ezr32wg/Makefile.include index eb5d45d59681..a4228bce3ef9 100644 --- a/cpu/ezr32wg/Makefile.include +++ b/cpu/ezr32wg/Makefile.include @@ -1,3 +1,3 @@ export CPU_ARCH = cortex-m4f -include $(RIOTCPU)/Makefile.include.cortexm_common +include $(RIOTMAKE)/arch/cortexm.mk diff --git a/cpu/k60/Makefile.include b/cpu/k60/Makefile.include index a71bcf13c52e..59ec9aa44ead 100644 --- a/cpu/k60/Makefile.include +++ b/cpu/k60/Makefile.include @@ -22,4 +22,4 @@ export COMMON_STARTUP = $(KINETIS_COMMON) export UNDEF += $(BINDIR)/cpu/vectors.o export UNDEF += $(BINDIR)/cpu/ssp.o -include $(RIOTCPU)/Makefile.include.cortexm_common +include $(RIOTMAKE)/arch/cortexm.mk diff --git a/cpu/k64f/Makefile.include b/cpu/k64f/Makefile.include index fd234523cc4d..8225bcdbe56d 100644 --- a/cpu/k64f/Makefile.include +++ b/cpu/k64f/Makefile.include @@ -21,4 +21,4 @@ export COMMON_STARTUP = $(KINETIS_COMMON) # add the CPU specific system calls implementations for the linker export UNDEF += $(BINDIR)/cpu/vectors.o -include $(RIOTCPU)/Makefile.include.cortexm_common +include $(RIOTMAKE)/arch/cortexm.mk diff --git a/cpu/kw2x/Makefile.include b/cpu/kw2x/Makefile.include index 76e3daea5db1..c7e59fe31a78 100644 --- a/cpu/kw2x/Makefile.include +++ b/cpu/kw2x/Makefile.include @@ -21,4 +21,4 @@ export COMMON_STARTUP = $(KINETIS_COMMON) # add the CPU specific system calls implementations for the linker export UNDEF += $(BINDIR)/cpu/vectors.o -include $(RIOTCPU)/Makefile.include.cortexm_common +include $(RIOTMAKE)/arch/cortexm.mk diff --git a/cpu/lm4f120/Makefile.include b/cpu/lm4f120/Makefile.include index 50e87844f296..b6d705f95f62 100644 --- a/cpu/lm4f120/Makefile.include +++ b/cpu/lm4f120/Makefile.include @@ -1,4 +1,4 @@ export CPU_ARCH = cortex-m4f -include $(RIOTCPU)/Makefile.include.cortexm_common +include $(RIOTMAKE)/arch/cortexm.mk include $(RIOTCPU)/stellaris_common/Makefile diff --git a/cpu/lpc11u34/Makefile.include b/cpu/lpc11u34/Makefile.include index 04c2fd5dd48a..d7c8729d4ed0 100644 --- a/cpu/lpc11u34/Makefile.include +++ b/cpu/lpc11u34/Makefile.include @@ -1,3 +1,3 @@ export CPU_ARCH = cortex-m0 -include $(RIOTCPU)/Makefile.include.cortexm_common +include $(RIOTMAKE)/arch/cortexm.mk diff --git a/cpu/lpc1768/Makefile.include b/cpu/lpc1768/Makefile.include index f16ada89b8a3..4ea1e8768710 100644 --- a/cpu/lpc1768/Makefile.include +++ b/cpu/lpc1768/Makefile.include @@ -1,3 +1,3 @@ export CPU_ARCH = cortex-m3 -include $(RIOTCPU)/Makefile.include.cortexm_common +include $(RIOTMAKE)/arch/cortexm.mk diff --git a/cpu/msp430_common/Makefile.include b/cpu/msp430_common/Makefile.include index b0f3d009a6dc..28a86aea1668 100644 --- a/cpu/msp430_common/Makefile.include +++ b/cpu/msp430_common/Makefile.include @@ -6,4 +6,4 @@ export USEMODULE += msp430_common msp430_common_periph DEFAULT_MODULE += oneway_malloc # include the msp430 common Makefile -include $(RIOTCPU)/Makefile.include.msp430_common +include $(RIOTMAKE)/arch/msp430.mk diff --git a/cpu/nrf51/Makefile.include b/cpu/nrf51/Makefile.include index a3b630b9b55c..9b71b90e4865 100644 --- a/cpu/nrf51/Makefile.include +++ b/cpu/nrf51/Makefile.include @@ -2,4 +2,4 @@ export CPU_ARCH = cortex-m0 export CPU_FAM = nrf51 include $(RIOTCPU)/nrf5x_common/Makefile.include -include $(RIOTCPU)/Makefile.include.cortexm_common +include $(RIOTMAKE)/arch/cortexm.mk diff --git a/cpu/nrf52/Makefile.include b/cpu/nrf52/Makefile.include index 073024aac611..e619a3c3e679 100644 --- a/cpu/nrf52/Makefile.include +++ b/cpu/nrf52/Makefile.include @@ -2,4 +2,4 @@ export CPU_ARCH = cortex-m4f export CPU_FAM = nrf52 include $(RIOTCPU)/nrf5x_common/Makefile.include -include $(RIOTCPU)/Makefile.include.cortexm_common +include $(RIOTMAKE)/arch/cortexm.mk diff --git a/cpu/sam3/Makefile.include b/cpu/sam3/Makefile.include index ea9548deba40..1e3db86dc4da 100644 --- a/cpu/sam3/Makefile.include +++ b/cpu/sam3/Makefile.include @@ -3,4 +3,4 @@ export CPU_ARCH = cortex-m3 # include common SPI functions USEMODULE += periph_common -include $(RIOTCPU)/Makefile.include.cortexm_common +include $(RIOTMAKE)/arch/cortexm.mk diff --git a/cpu/samd21/Makefile.include b/cpu/samd21/Makefile.include index a95fff8036ba..c22af6dd2acf 100644 --- a/cpu/samd21/Makefile.include +++ b/cpu/samd21/Makefile.include @@ -4,4 +4,4 @@ export CPU_FAM = samd21 USEMODULE += pm_layered include $(RIOTCPU)/sam0_common/Makefile.include -include $(RIOTCPU)/Makefile.include.cortexm_common +include $(RIOTMAKE)/arch/cortexm.mk diff --git a/cpu/saml21/Makefile.include b/cpu/saml21/Makefile.include index 3ff606767e84..1b97e178601c 100644 --- a/cpu/saml21/Makefile.include +++ b/cpu/saml21/Makefile.include @@ -4,4 +4,4 @@ export CPU_FAM = saml21 USEMODULE += pm_layered include $(RIOTCPU)/sam0_common/Makefile.include -include $(RIOTCPU)/Makefile.include.cortexm_common +include $(RIOTMAKE)/arch/cortexm.mk diff --git a/cpu/stm32f0/Makefile.include b/cpu/stm32f0/Makefile.include index daa2827f9393..769a842a21ad 100644 --- a/cpu/stm32f0/Makefile.include +++ b/cpu/stm32f0/Makefile.include @@ -2,4 +2,4 @@ export CPU_ARCH = cortex-m0 export CPU_FAM = stm32f0 include $(RIOTCPU)/stm32_common/Makefile.include -include $(RIOTCPU)/Makefile.include.cortexm_common +include $(RIOTMAKE)/arch/cortexm.mk diff --git a/cpu/stm32f1/Makefile.include b/cpu/stm32f1/Makefile.include index ca6dcc210905..4f3dda4f82bc 100644 --- a/cpu/stm32f1/Makefile.include +++ b/cpu/stm32f1/Makefile.include @@ -4,4 +4,4 @@ export CPU_FAM = stm32f1 USEMODULE += pm_layered include $(RIOTCPU)/stm32_common/Makefile.include -include $(RIOTCPU)/Makefile.include.cortexm_common +include $(RIOTMAKE)/arch/cortexm.mk diff --git a/cpu/stm32f2/Makefile.include b/cpu/stm32f2/Makefile.include index 9271fa2774a1..a488c1acb041 100644 --- a/cpu/stm32f2/Makefile.include +++ b/cpu/stm32f2/Makefile.include @@ -4,4 +4,4 @@ export CPU_FAM = stm32f2 USEMODULE += pm_layered include $(RIOTCPU)/stm32_common/Makefile.include -include $(RIOTCPU)/Makefile.include.cortexm_common +include $(RIOTMAKE)/arch/cortexm.mk diff --git a/cpu/stm32f3/Makefile.include b/cpu/stm32f3/Makefile.include index b733349beeb2..6d9bc0bd32b0 100644 --- a/cpu/stm32f3/Makefile.include +++ b/cpu/stm32f3/Makefile.include @@ -2,4 +2,4 @@ export CPU_ARCH = cortex-m4f export CPU_FAM = stm32f3 include $(RIOTCPU)/stm32_common/Makefile.include -include $(RIOTCPU)/Makefile.include.cortexm_common +include $(RIOTMAKE)/arch/cortexm.mk diff --git a/cpu/stm32f4/Makefile.include b/cpu/stm32f4/Makefile.include index bf4156f52dce..52001eb8a512 100644 --- a/cpu/stm32f4/Makefile.include +++ b/cpu/stm32f4/Makefile.include @@ -4,5 +4,4 @@ export CPU_FAM = stm32f4 USEMODULE += pm_layered include $(RIOTCPU)/stm32_common/Makefile.include - -include $(RIOTCPU)/Makefile.include.cortexm_common +include $(RIOTMAKE)/arch/cortexm.mk diff --git a/cpu/stm32l0/Makefile.include b/cpu/stm32l0/Makefile.include index 8814ecd40595..0f51cda80b3c 100644 --- a/cpu/stm32l0/Makefile.include +++ b/cpu/stm32l0/Makefile.include @@ -2,4 +2,4 @@ export CPU_ARCH = cortex-m0 export CPU_FAM = stm32l0 include $(RIOTCPU)/stm32_common/Makefile.include -include $(RIOTCPU)/Makefile.include.cortexm_common +include $(RIOTMAKE)/arch/cortexm.mk diff --git a/cpu/stm32l1/Makefile.include b/cpu/stm32l1/Makefile.include index 2eeadee455d2..909c79ebef44 100644 --- a/cpu/stm32l1/Makefile.include +++ b/cpu/stm32l1/Makefile.include @@ -2,4 +2,4 @@ export CPU_ARCH = cortex-m3 export CPU_FAM = stm32l1 include $(RIOTCPU)/stm32_common/Makefile.include -include $(RIOTCPU)/Makefile.include.cortexm_common +include $(RIOTMAKE)/arch/cortexm.mk diff --git a/Makefile.application b/makefiles/application.mk similarity index 100% rename from Makefile.application rename to makefiles/application.mk diff --git a/cpu/Makefile.include.cortexm_common b/makefiles/arch/cortexm.mk similarity index 100% rename from cpu/Makefile.include.cortexm_common rename to makefiles/arch/cortexm.mk diff --git a/cpu/Makefile.include.msp430_common b/makefiles/arch/msp430.mk similarity index 88% rename from cpu/Makefile.include.msp430_common rename to makefiles/arch/msp430.mk index 88b0450cfa22..e892289c8ec8 100644 --- a/cpu/Makefile.include.msp430_common +++ b/makefiles/arch/msp430.mk @@ -12,6 +12,3 @@ export CFLAGS += $(CFLAGS_CPU) $(CFLAGS_LINK) $(CFLAGS_DBG) $(CFLAGS_OPT) export ASFLAGS += $(CFLAGS_CPU) --defsym $(CPU_MODEL)=1 $(CFLAGS_DBG) # export linker flags export LINKFLAGS += $(CFLAGS_CPU) $(CFLAGS_DBG) $(CFLAGS_OPT) -Wl,--gc-sections -static -lgcc - -# Import all toolchain settings -include $(RIOTCPU)/Makefile.include.gnu diff --git a/Makefile.bindist b/makefiles/bindist.mk similarity index 100% rename from Makefile.bindist rename to makefiles/bindist.mk diff --git a/Makefile.buildtests b/makefiles/buildtests.mk similarity index 100% rename from Makefile.buildtests rename to makefiles/buildtests.mk diff --git a/Makefile.cflags b/makefiles/cflags.mk similarity index 100% rename from Makefile.cflags rename to makefiles/cflags.mk diff --git a/Makefile.defaultmodules b/makefiles/defaultmodules.mk similarity index 100% rename from Makefile.defaultmodules rename to makefiles/defaultmodules.mk diff --git a/Makefile.docker b/makefiles/docker.mk similarity index 97% rename from Makefile.docker rename to makefiles/docker.mk index c882b0fe3c1c..6419ab26ee26 100644 --- a/Makefile.docker +++ b/makefiles/docker.mk @@ -92,12 +92,14 @@ DOCKER_OVERRIDE_CMDLINE := $(strip $(DOCKER_OVERRIDE_CMDLINE)) -v '$(RIOTBASE):$(DOCKER_BUILD_ROOT)/riotbase' \ -v '$(RIOTCPU):$(DOCKER_BUILD_ROOT)/riotcpu' \ -v '$(RIOTBOARD):$(DOCKER_BUILD_ROOT)/riotboard' \ + -v '$(RIOTMAKE):$(DOCKER_BUILD_ROOT)/riotmake' \ -v '$(RIOTPROJECT):$(DOCKER_BUILD_ROOT)/riotproject' \ -v /etc/localtime:/etc/localtime:ro \ -e 'RIOTBASE=$(DOCKER_BUILD_ROOT)/riotbase' \ -e 'CCACHE_BASEDIR=$(DOCKER_BUILD_ROOT)/riotbase' \ -e 'RIOTCPU=$(DOCKER_BUILD_ROOT)/riotcpu' \ -e 'RIOTBOARD=$(DOCKER_BUILD_ROOT)/riotboard' \ + -e 'RIOTMAKE=$(DOCKER_BUILD_ROOT)/riotmake' \ -e 'RIOTPROJECT=$(DOCKER_BUILD_ROOT)/riotproject' \ $(DOCKER_ENVIRONMENT_CMDLINE) \ -w '$(DOCKER_BUILD_ROOT)/riotproject/$(BUILDRELPATH)' \ diff --git a/Makefile.features b/makefiles/features.mk similarity index 100% rename from Makefile.features rename to makefiles/features.mk diff --git a/Makefile.modules b/makefiles/modules.mk similarity index 100% rename from Makefile.modules rename to makefiles/modules.mk diff --git a/Makefile.pseudomodules b/makefiles/pseudomodules.mk similarity index 100% rename from Makefile.pseudomodules rename to makefiles/pseudomodules.mk diff --git a/Makefile.scan-build b/makefiles/scan-build.mk similarity index 100% rename from Makefile.scan-build rename to makefiles/scan-build.mk diff --git a/Makefile.tests b/makefiles/tests.mk similarity index 100% rename from Makefile.tests rename to makefiles/tests.mk diff --git a/cpu/Makefile.include.gnu b/makefiles/toolchain/gnu.mk similarity index 100% rename from cpu/Makefile.include.gnu rename to makefiles/toolchain/gnu.mk diff --git a/cpu/Makefile.include.llvm b/makefiles/toolchain/llvm.mk similarity index 100% rename from cpu/Makefile.include.llvm rename to makefiles/toolchain/llvm.mk diff --git a/boards/Makefile.include.jlink b/makefiles/tools/jlink.mk similarity index 100% rename from boards/Makefile.include.jlink rename to makefiles/tools/jlink.mk diff --git a/boards/Makefile.include.openocd b/makefiles/tools/openocd.mk similarity index 100% rename from boards/Makefile.include.openocd rename to makefiles/tools/openocd.mk diff --git a/boards/Makefile.include.serial b/makefiles/tools/serial.mk similarity index 100% rename from boards/Makefile.include.serial rename to makefiles/tools/serial.mk diff --git a/Makefile.vars b/makefiles/vars.mk similarity index 98% rename from Makefile.vars rename to makefiles/vars.mk index e4267d1d5c18..a6404a347d8b 100644 --- a/Makefile.vars +++ b/makefiles/vars.mk @@ -19,6 +19,7 @@ export RIOTCPU # For third party CPUs this folder is the base of t export RIOTBOARD # For third party BOARDs this folder is the base of the BOARDs. export RIOTPKG # For overriding RIOT's pkg directory export RIOTPROJECT # Top level git root of the project being built, or PWD if not a git repository +export RIOTMAKE # Location of all supplemental Makefiles (such as this file) export BINDIRBASE # This is the folder where the application should be built in. For each BOARD a different subfolder is used. export BINDIR # This is the folder where the application should be built in. export APPDIR # The base folder containing the application From f3cac86a24e04ea403699c233865630787101aa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Nohlg=C3=A5rd?= Date: Thu, 30 Mar 2017 07:13:03 +0200 Subject: [PATCH 02/11] squash rename .mk -> .inc.mk --- makefiles/{application.mk => application.inc.mk} | 0 makefiles/arch/{cortexm.mk => cortexm.inc.mk} | 0 makefiles/arch/{msp430.mk => msp430.inc.mk} | 0 makefiles/{bindist.mk => bindist.inc.mk} | 0 makefiles/{buildtests.mk => buildtests.inc.mk} | 0 makefiles/{cflags.mk => cflags.inc.mk} | 0 makefiles/{defaultmodules.mk => defaultmodules.inc.mk} | 0 makefiles/{docker.mk => docker.inc.mk} | 0 makefiles/{features.mk => features.inc.mk} | 0 makefiles/{modules.mk => modules.inc.mk} | 0 makefiles/{pseudomodules.mk => pseudomodules.inc.mk} | 0 makefiles/{scan-build.mk => scan-build.inc.mk} | 0 makefiles/{tests.mk => tests.inc.mk} | 0 makefiles/toolchain/{gnu.mk => gnu.inc.mk} | 0 makefiles/toolchain/{llvm.mk => llvm.inc.mk} | 0 makefiles/tools/{jlink.mk => jlink.inc.mk} | 0 makefiles/tools/{openocd.mk => openocd.inc.mk} | 0 makefiles/tools/{serial.mk => serial.inc.mk} | 0 makefiles/{vars.mk => vars.inc.mk} | 0 19 files changed, 0 insertions(+), 0 deletions(-) rename makefiles/{application.mk => application.inc.mk} (100%) rename makefiles/arch/{cortexm.mk => cortexm.inc.mk} (100%) rename makefiles/arch/{msp430.mk => msp430.inc.mk} (100%) rename makefiles/{bindist.mk => bindist.inc.mk} (100%) rename makefiles/{buildtests.mk => buildtests.inc.mk} (100%) rename makefiles/{cflags.mk => cflags.inc.mk} (100%) rename makefiles/{defaultmodules.mk => defaultmodules.inc.mk} (100%) rename makefiles/{docker.mk => docker.inc.mk} (100%) rename makefiles/{features.mk => features.inc.mk} (100%) rename makefiles/{modules.mk => modules.inc.mk} (100%) rename makefiles/{pseudomodules.mk => pseudomodules.inc.mk} (100%) rename makefiles/{scan-build.mk => scan-build.inc.mk} (100%) rename makefiles/{tests.mk => tests.inc.mk} (100%) rename makefiles/toolchain/{gnu.mk => gnu.inc.mk} (100%) rename makefiles/toolchain/{llvm.mk => llvm.inc.mk} (100%) rename makefiles/tools/{jlink.mk => jlink.inc.mk} (100%) rename makefiles/tools/{openocd.mk => openocd.inc.mk} (100%) rename makefiles/tools/{serial.mk => serial.inc.mk} (100%) rename makefiles/{vars.mk => vars.inc.mk} (100%) diff --git a/makefiles/application.mk b/makefiles/application.inc.mk similarity index 100% rename from makefiles/application.mk rename to makefiles/application.inc.mk diff --git a/makefiles/arch/cortexm.mk b/makefiles/arch/cortexm.inc.mk similarity index 100% rename from makefiles/arch/cortexm.mk rename to makefiles/arch/cortexm.inc.mk diff --git a/makefiles/arch/msp430.mk b/makefiles/arch/msp430.inc.mk similarity index 100% rename from makefiles/arch/msp430.mk rename to makefiles/arch/msp430.inc.mk diff --git a/makefiles/bindist.mk b/makefiles/bindist.inc.mk similarity index 100% rename from makefiles/bindist.mk rename to makefiles/bindist.inc.mk diff --git a/makefiles/buildtests.mk b/makefiles/buildtests.inc.mk similarity index 100% rename from makefiles/buildtests.mk rename to makefiles/buildtests.inc.mk diff --git a/makefiles/cflags.mk b/makefiles/cflags.inc.mk similarity index 100% rename from makefiles/cflags.mk rename to makefiles/cflags.inc.mk diff --git a/makefiles/defaultmodules.mk b/makefiles/defaultmodules.inc.mk similarity index 100% rename from makefiles/defaultmodules.mk rename to makefiles/defaultmodules.inc.mk diff --git a/makefiles/docker.mk b/makefiles/docker.inc.mk similarity index 100% rename from makefiles/docker.mk rename to makefiles/docker.inc.mk diff --git a/makefiles/features.mk b/makefiles/features.inc.mk similarity index 100% rename from makefiles/features.mk rename to makefiles/features.inc.mk diff --git a/makefiles/modules.mk b/makefiles/modules.inc.mk similarity index 100% rename from makefiles/modules.mk rename to makefiles/modules.inc.mk diff --git a/makefiles/pseudomodules.mk b/makefiles/pseudomodules.inc.mk similarity index 100% rename from makefiles/pseudomodules.mk rename to makefiles/pseudomodules.inc.mk diff --git a/makefiles/scan-build.mk b/makefiles/scan-build.inc.mk similarity index 100% rename from makefiles/scan-build.mk rename to makefiles/scan-build.inc.mk diff --git a/makefiles/tests.mk b/makefiles/tests.inc.mk similarity index 100% rename from makefiles/tests.mk rename to makefiles/tests.inc.mk diff --git a/makefiles/toolchain/gnu.mk b/makefiles/toolchain/gnu.inc.mk similarity index 100% rename from makefiles/toolchain/gnu.mk rename to makefiles/toolchain/gnu.inc.mk diff --git a/makefiles/toolchain/llvm.mk b/makefiles/toolchain/llvm.inc.mk similarity index 100% rename from makefiles/toolchain/llvm.mk rename to makefiles/toolchain/llvm.inc.mk diff --git a/makefiles/tools/jlink.mk b/makefiles/tools/jlink.inc.mk similarity index 100% rename from makefiles/tools/jlink.mk rename to makefiles/tools/jlink.inc.mk diff --git a/makefiles/tools/openocd.mk b/makefiles/tools/openocd.inc.mk similarity index 100% rename from makefiles/tools/openocd.mk rename to makefiles/tools/openocd.inc.mk diff --git a/makefiles/tools/serial.mk b/makefiles/tools/serial.inc.mk similarity index 100% rename from makefiles/tools/serial.mk rename to makefiles/tools/serial.inc.mk diff --git a/makefiles/vars.mk b/makefiles/vars.inc.mk similarity index 100% rename from makefiles/vars.mk rename to makefiles/vars.inc.mk From a6945c20b64d2f896e2fc7e3344de8dec627b754 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Nohlg=C3=A5rd?= Date: Thu, 30 Mar 2017 09:00:30 +0200 Subject: [PATCH 03/11] squash update include names --- Makefile | 2 +- Makefile.include | 24 ++++++++++---------- boards/airfy-beacon/Makefile.include | 4 ++-- boards/arduino-due/Makefile.include | 2 +- boards/arduino-zero/Makefile.include | 4 ++-- boards/calliope-mini/Makefile.include | 4 ++-- boards/cc2538dk/Makefile.include | 2 +- boards/cc2650stk/Makefile.include | 2 +- boards/ek-lm4f120xl/Makefile.include | 4 ++-- boards/f4vi1/Makefile.include | 2 +- boards/fox/Makefile.include | 4 ++-- boards/frdm-k64f/Makefile.include | 4 ++-- boards/iotlab-common/Makefile.include | 4 ++-- boards/limifrog-v1/Makefile.include | 4 ++-- boards/maple-mini/Makefile.include | 4 ++-- boards/mbed_lpc1768/Makefile.include | 2 +- boards/microbit/Makefile.include | 4 ++-- boards/msb-430-common/Makefile.include | 2 +- boards/msbiot/Makefile.include | 4 ++-- boards/mulle/Makefile.include | 4 ++-- boards/nrf51dongle/Makefile.include | 4 ++-- boards/nrf52dk/Makefile.include | 4 ++-- boards/nrf6310/Makefile.include | 2 +- boards/nucleo-common/Makefile.include.serial | 4 ++-- boards/opencm904/Makefile.include | 2 +- boards/openmote-cc2538/Makefile.include | 4 ++-- boards/pba-d-01-kw2x/Makefile.include | 4 ++-- boards/pca10000/Makefile.include | 4 ++-- boards/pca10005/Makefile.include | 4 ++-- boards/remote-common/Makefile.include | 2 +- boards/saml21-xpro/Makefile.include | 4 ++-- boards/samr21-xpro/Makefile.include | 4 ++-- boards/seeeduino_arch-pro/Makefile.include | 4 ++-- boards/slwstk6220a/Makefile.include | 4 ++-- boards/sodaq-autonomo/Makefile.include | 4 ++-- boards/spark-core/Makefile.include | 4 ++-- boards/stm32f0discovery/Makefile.include | 4 ++-- boards/stm32f3discovery/Makefile.include | 4 ++-- boards/stm32f4discovery/Makefile.include | 4 ++-- boards/telosb/Makefile.include | 2 +- boards/udoo/Makefile.include | 2 +- boards/weio/Makefile.include | 2 +- boards/wsn430-common/Makefile.include | 2 +- boards/yunjia-nrf51822/Makefile.include | 4 ++-- boards/z1/Makefile.include | 2 +- cpu/cc2538/Makefile.include | 2 +- cpu/cc26x0/Makefile.include | 2 +- cpu/ezr32wg/Makefile.include | 2 +- cpu/k60/Makefile.include | 2 +- cpu/k64f/Makefile.include | 2 +- cpu/kw2x/Makefile.include | 2 +- cpu/lm4f120/Makefile.include | 2 +- cpu/lpc11u34/Makefile.include | 2 +- cpu/lpc1768/Makefile.include | 2 +- cpu/msp430_common/Makefile.include | 2 +- cpu/nrf51/Makefile.include | 2 +- cpu/nrf52/Makefile.include | 2 +- cpu/sam3/Makefile.include | 2 +- cpu/samd21/Makefile.include | 2 +- cpu/saml21/Makefile.include | 2 +- cpu/stm32f0/Makefile.include | 2 +- cpu/stm32f1/Makefile.include | 2 +- cpu/stm32f2/Makefile.include | 2 +- cpu/stm32f3/Makefile.include | 2 +- cpu/stm32f4/Makefile.include | 2 +- cpu/stm32l0/Makefile.include | 2 +- cpu/stm32l1/Makefile.include | 2 +- 67 files changed, 107 insertions(+), 107 deletions(-) diff --git a/Makefile b/Makefile index d7181c19d789..dcf2fb6a1660 100644 --- a/Makefile +++ b/Makefile @@ -37,4 +37,4 @@ welcome: @echo "Or ask questions on our mailing list:" @echo " users@riot-os.org (http://lists.riot-os.org/mailman/listinfo/users)" --include makefiles/tests.mk +-include makefiles/tests.inc.mk diff --git a/Makefile.include b/Makefile.include index e2e226f4e202..902a30950aba 100644 --- a/Makefile.include +++ b/Makefile.include @@ -62,10 +62,10 @@ BUILDRELPATH ?= ${PWD:${RIOTPROJECT}/%=%}/ # Include Docker settings near the top because we need to build the environment # command line before some of the variable origins are overwritten below when # using abspath, strip etc. -include $(RIOTMAKE)/docker.mk +include $(RIOTMAKE)/docker.inc.mk # Static code analysis tools provided by LLVM -include $(RIOTMAKE)/scan-build.mk +include $(RIOTMAKE)/scan-build.inc.mk export RIOTBUILD_CONFIG_HEADER_C = $(BINDIR)/riotbuild/riotbuild.h @@ -205,13 +205,13 @@ INCLUDES += -I$(RIOTCPU)/$(CPU)/include INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include # mandatory includes! -include $(RIOTMAKE)/pseudomodules.mk -include $(RIOTMAKE)/defaultmodules.mk +include $(RIOTMAKE)/pseudomodules.inc.mk +include $(RIOTMAKE)/defaultmodules.inc.mk include $(RIOTBOARD)/$(BOARD)/Makefile.include include $(RIOTCPU)/$(CPU)/Makefile.include # Import all toolchain settings -include $(RIOTMAKE)/toolchain/$(TOOLCHAIN).mk +include $(RIOTMAKE)/toolchain/$(TOOLCHAIN).inc.mk # get number of interfaces straight before resolving dependencies GNRC_NETIF_NUMOF ?= 1 @@ -254,7 +254,7 @@ ifneq (0, $(shell mkdir -p $(BINDIR); $(AR) rc $(BINDIR)/empty-archive.a 2> /dev endif # Feature test default CFLAGS and LINKFLAGS for the set compiled. -include $(RIOTMAKE)/cflags.mk +include $(RIOTMAKE)/cflags.inc.mk # make the RIOT version available to the program ifeq ($(origin RIOT_VERSION), undefined) @@ -294,7 +294,7 @@ all: ..in-docker-container else ## make script for your application. Build RIOT-base here! all: ..compiler-check ..build-message $(RIOTBUILD_CONFIG_HEADER_C) $(USEPKG:%=${BINDIR}/%.a) $(APPDEPS) - $(Q)DIRS="$(DIRS)" "$(MAKE)" -C $(APPDIR) -f $(RIOTMAKE)/application.mk + $(Q)DIRS="$(DIRS)" "$(MAKE)" -C $(APPDIR) -f $(RIOTMAKE)/application.inc.mk ifeq (,$(RIOTNOLINK)) ifeq ($(BUILDOSXNATIVE),1) $(Q)$(if $(CPPMIX),$(CXX),$(LINK)) $(UNDEF) -o $(ELFFILE) $$(find $(BASELIBS) -size +8c) $(LINKFLAGS) $(LINKFLAGPREFIX)-no_pie @@ -422,13 +422,13 @@ $(CURDIR)/eclipsesym.xml: $(RIOTBASE)/dist/tools/eclipsesym/cmdline2xml.sh > $@ # Extra make goals for testing and comparing changes. -include $(RIOTMAKE)/buildtests.mk +include $(RIOTMAKE)/buildtests.inc.mk # process provided features -include $(RIOTMAKE)/features.mk +include $(RIOTMAKE)/features.inc.mk # Export variables used throughout the whole make system: -include $(RIOTMAKE)/vars.mk +include $(RIOTMAKE)/vars.inc.mk # Warn if the selected board and drivers don't provide all needed features: ifneq (, $(filter all, $(if $(MAKECMDGOALS), $(MAKECMDGOALS), all))) @@ -532,10 +532,10 @@ endif include $(RIOTBASE)/dist/tools/desvirt/Makefile.desvirt # include bindist target -include $(RIOTMAKE)/bindist.mk +include $(RIOTMAKE)/bindist.inc.mk # Add all USEMODULE modules to CFLAGS -include $(RIOTMAKE)/modules.mk +include $(RIOTMAKE)/modules.inc.mk # Build a header file with all common macro definitions and undefinitions # make it phony to force re-run of the script every time even if the file exists diff --git a/boards/airfy-beacon/Makefile.include b/boards/airfy-beacon/Makefile.include index 35898c26e244..759cf37a4df5 100644 --- a/boards/airfy-beacon/Makefile.include +++ b/boards/airfy-beacon/Makefile.include @@ -7,7 +7,7 @@ PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) # setup serial terminal -include $(RIOTMAKE)/tools/serial.mk +include $(RIOTMAKE)/tools/serial.inc.mk # this board uses openocd -include $(RIOTMAKE)/tools/openocd.mk +include $(RIOTMAKE)/tools/openocd.inc.mk diff --git a/boards/arduino-due/Makefile.include b/boards/arduino-due/Makefile.include index 7c3e20cba774..a943e194c3cc 100644 --- a/boards/arduino-due/Makefile.include +++ b/boards/arduino-due/Makefile.include @@ -11,4 +11,4 @@ export FLASHER = $(RIOTBOARD)/$(BOARD)/dist/flash.sh export OFLAGS = -O binary # setup serial terminal -include $(RIOTMAKE)/tools/serial.mk +include $(RIOTMAKE)/tools/serial.inc.mk diff --git a/boards/arduino-zero/Makefile.include b/boards/arduino-zero/Makefile.include index 4114b6394c01..d8a948a8074e 100644 --- a/boards/arduino-zero/Makefile.include +++ b/boards/arduino-zero/Makefile.include @@ -7,7 +7,7 @@ export PORT_LINUX ?= /dev/ttyACM0 export PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) # setup serial terminal -include $(RIOTMAKE)/tools/serial.mk +include $(RIOTMAKE)/tools/serial.inc.mk # Add board selector (USB serial) to OpenOCD options if specified. # Use /dist/tools/usb-serial/list-ttys.sh to find out serial number. @@ -22,4 +22,4 @@ ifneq (,$(SERIAL)) endif # this board uses openocd -include $(RIOTMAKE)/tools/openocd.mk +include $(RIOTMAKE)/tools/openocd.inc.mk diff --git a/boards/calliope-mini/Makefile.include b/boards/calliope-mini/Makefile.include index fcb96e678fe4..3d131cdeda04 100644 --- a/boards/calliope-mini/Makefile.include +++ b/boards/calliope-mini/Makefile.include @@ -7,7 +7,7 @@ PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) # setup serial terminal -include $(RIOTMAKE)/tools/serial.mk +include $(RIOTMAKE)/tools/serial.inc.mk # we support flashing through plain fscopy or using JLink FLASHTOOL ?= fscopy @@ -22,7 +22,7 @@ ifeq (fscopy,$(FLASHTOOL)) export DEBUGSERVER = else ifeq (jlink,$(FLASHTOOL)) export JLINK_DEVICE := nrf51822 - include $(RIOTMAKE)/tools/jlink.mk + include $(RIOTMAKE)/tools/jlink.inc.mk else $(info ERROR: invalid flash tool specified) endif diff --git a/boards/cc2538dk/Makefile.include b/boards/cc2538dk/Makefile.include index 43430c70cea7..ccdd448d0eaa 100644 --- a/boards/cc2538dk/Makefile.include +++ b/boards/cc2538dk/Makefile.include @@ -9,7 +9,7 @@ export PROGRAMMER_SERIAL ?= 06EB # the debug UART is always the second tty with the matching serial number: PORT_LINUX ?= $(word 2,$(shell $(RIOTBASE)/dist/tools/usb-serial/find-tty.sh '^$(PROGRAMMER_SERIAL)')) PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbserial*))) -include $(RIOTMAKE)/tools/serial.mk +include $(RIOTMAKE)/tools/serial.inc.mk # debugger config export DEBUGGER = $(RIOTBOARD)/$(BOARD)/dist/debug.sh diff --git a/boards/cc2650stk/Makefile.include b/boards/cc2650stk/Makefile.include index c73882a279f9..25258b561424 100644 --- a/boards/cc2650stk/Makefile.include +++ b/boards/cc2650stk/Makefile.include @@ -7,7 +7,7 @@ PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) # setup serial terminal -include $(RIOTMAKE)/tools/serial.mk +include $(RIOTMAKE)/tools/serial.inc.mk # configure the flash tool export UNIFLASH_PATH ?= "UNIFLASH_PATH unconfigured" diff --git a/boards/ek-lm4f120xl/Makefile.include b/boards/ek-lm4f120xl/Makefile.include index 1086e70ba30a..d29ea94951a2 100644 --- a/boards/ek-lm4f120xl/Makefile.include +++ b/boards/ek-lm4f120xl/Makefile.include @@ -7,7 +7,7 @@ PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) # setup serial terminal -include $(RIOTMAKE)/tools/serial.mk +include $(RIOTMAKE)/tools/serial.inc.mk # this board uses openocd -include $(RIOTMAKE)/tools/openocd.mk +include $(RIOTMAKE)/tools/openocd.inc.mk diff --git a/boards/f4vi1/Makefile.include b/boards/f4vi1/Makefile.include index 3e334eeca547..7ddb27bf609f 100644 --- a/boards/f4vi1/Makefile.include +++ b/boards/f4vi1/Makefile.include @@ -7,7 +7,7 @@ PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) # setup serial terminal -include $(RIOTMAKE)/tools/serial.mk +include $(RIOTMAKE)/tools/serial.inc.mk # st-flash export FLASHER = st-flash diff --git a/boards/fox/Makefile.include b/boards/fox/Makefile.include index 04abd7bb8523..30ea92248759 100644 --- a/boards/fox/Makefile.include +++ b/boards/fox/Makefile.include @@ -7,7 +7,7 @@ PORT_LINUX ?= /dev/ttyUSB1 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbserial*))) # setup serial terminal -include $(RIOTMAKE)/tools/serial.mk +include $(RIOTMAKE)/tools/serial.inc.mk # this board uses openocd -include $(RIOTMAKE)/tools/openocd.mk +include $(RIOTMAKE)/tools/openocd.inc.mk diff --git a/boards/frdm-k64f/Makefile.include b/boards/frdm-k64f/Makefile.include index 15d01d401efe..e624601ea00b 100644 --- a/boards/frdm-k64f/Makefile.include +++ b/boards/frdm-k64f/Makefile.include @@ -24,7 +24,7 @@ export OPENOCD_EXTRA_INIT export PRE_FLASH_CHECK_SCRIPT = $(RIOTCPU)/kinetis_common/dist/check-fcfield-elf.sh # setup serial terminal -include $(RIOTMAKE)/tools/serial.mk +include $(RIOTMAKE)/tools/serial.inc.mk # this board uses openocd -include $(RIOTMAKE)/tools/openocd.mk +include $(RIOTMAKE)/tools/openocd.inc.mk diff --git a/boards/iotlab-common/Makefile.include b/boards/iotlab-common/Makefile.include index 3b9ae5695097..93260391c7c0 100644 --- a/boards/iotlab-common/Makefile.include +++ b/boards/iotlab-common/Makefile.include @@ -8,10 +8,10 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbserial*B))) # setup serial terminal export BAUD = 500000 -include $(RIOTMAKE)/tools/serial.mk +include $(RIOTMAKE)/tools/serial.inc.mk # this board uses openocd -include $(RIOTMAKE)/tools/openocd.mk +include $(RIOTMAKE)/tools/openocd.inc.mk # add the common header files to the include path INCLUDES += -I$(RIOTBOARD)/iotlab-common/include diff --git a/boards/limifrog-v1/Makefile.include b/boards/limifrog-v1/Makefile.include index 31282715743e..1855b1f352cb 100644 --- a/boards/limifrog-v1/Makefile.include +++ b/boards/limifrog-v1/Makefile.include @@ -7,7 +7,7 @@ PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) # setup serial terminal -include $(RIOTMAKE)/tools/serial.mk +include $(RIOTMAKE)/tools/serial.inc.mk # this board uses openocd -include $(RIOTMAKE)/tools/openocd.mk +include $(RIOTMAKE)/tools/openocd.inc.mk diff --git a/boards/maple-mini/Makefile.include b/boards/maple-mini/Makefile.include index 2196cf5a7e22..ba4a3e1b7528 100644 --- a/boards/maple-mini/Makefile.include +++ b/boards/maple-mini/Makefile.include @@ -7,7 +7,7 @@ PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) # setup serial terminal -include $(RIOTMAKE)/tools/serial.mk +include $(RIOTMAKE)/tools/serial.inc.mk # this board uses openocd -include $(RIOTMAKE)/tools/openocd.mk +include $(RIOTMAKE)/tools/openocd.inc.mk diff --git a/boards/mbed_lpc1768/Makefile.include b/boards/mbed_lpc1768/Makefile.include index 425ff3c8dca0..58f1721a7bd1 100644 --- a/boards/mbed_lpc1768/Makefile.include +++ b/boards/mbed_lpc1768/Makefile.include @@ -15,4 +15,4 @@ PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) # setup serial terminal -include $(RIOTMAKE)/tools/serial.mk +include $(RIOTMAKE)/tools/serial.inc.mk diff --git a/boards/microbit/Makefile.include b/boards/microbit/Makefile.include index ad12746fbb8e..4c566a29d453 100644 --- a/boards/microbit/Makefile.include +++ b/boards/microbit/Makefile.include @@ -7,7 +7,7 @@ PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) # setup serial terminal -include $(RIOTMAKE)/tools/serial.mk +include $(RIOTMAKE)/tools/serial.inc.mk # we support flashing through plain fscopy or using JLink FLASHTOOL ?= fscopy @@ -22,7 +22,7 @@ ifeq (fscopy,$(FLASHTOOL)) export DEBUGSERVER = else ifeq (jlink,$(FLASHTOOL)) export JLINK_DEVICE := nrf51822 - include $(RIOTMAKE)/tools/jlink.mk + include $(RIOTMAKE)/tools/jlink.inc.mk else $(info ERROR: invalid flash tool specified) endif diff --git a/boards/msb-430-common/Makefile.include b/boards/msb-430-common/Makefile.include index 1e13f262ae65..51ed1df09a27 100644 --- a/boards/msb-430-common/Makefile.include +++ b/boards/msb-430-common/Makefile.include @@ -6,7 +6,7 @@ export CPU_MODEL = msp430f1612 PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) # setup serial terminal -include $(RIOTMAKE)/tools/serial.mk +include $(RIOTMAKE)/tools/serial.inc.mk # setup flash tool export OFLAGS = -O ihex diff --git a/boards/msbiot/Makefile.include b/boards/msbiot/Makefile.include index 4f351401c33d..d87c020ab074 100644 --- a/boards/msbiot/Makefile.include +++ b/boards/msbiot/Makefile.include @@ -7,7 +7,7 @@ PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) # setup serial terminal -include $(RIOTMAKE)/tools/serial.mk +include $(RIOTMAKE)/tools/serial.inc.mk # this board uses openocd -include $(RIOTMAKE)/tools/openocd.mk +include $(RIOTMAKE)/tools/openocd.inc.mk diff --git a/boards/mulle/Makefile.include b/boards/mulle/Makefile.include index 6616383d0cf3..a4bb2aca4cfc 100644 --- a/boards/mulle/Makefile.include +++ b/boards/mulle/Makefile.include @@ -111,7 +111,7 @@ flash: $(RIOTCPU)/kinetis_common/dist/wdog-disable.bin .DEFAULT_GOAL := # this board uses openocd -include $(RIOTMAKE)/tools/openocd.mk +include $(RIOTMAKE)/tools/openocd.inc.mk # setup serial terminal -include $(RIOTMAKE)/tools/serial.mk +include $(RIOTMAKE)/tools/serial.inc.mk diff --git a/boards/nrf51dongle/Makefile.include b/boards/nrf51dongle/Makefile.include index f7d42fda7e34..089340c484e1 100644 --- a/boards/nrf51dongle/Makefile.include +++ b/boards/nrf51dongle/Makefile.include @@ -8,7 +8,7 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) # setup JLink for flashing export JLINK_DEVICE := nrf51822 -include $(RIOTMAKE)/tools/jlink.mk +include $(RIOTMAKE)/tools/jlink.inc.mk # setup serial terminal -include $(RIOTMAKE)/tools/serial.mk +include $(RIOTMAKE)/tools/serial.inc.mk diff --git a/boards/nrf52dk/Makefile.include b/boards/nrf52dk/Makefile.include index 3256a8f19a68..40df3b3f96cc 100644 --- a/boards/nrf52dk/Makefile.include +++ b/boards/nrf52dk/Makefile.include @@ -15,7 +15,7 @@ export JLINK_PRE_FLASH := erase\nloadfile $(BINDIR)/softdevice.hex export JLINK_FLASH_ADDR := 0x1f000 export LINKER_SCRIPT ?= $(RIOTCPU)/$(CPU)/ldscripts/$(CPU_MODEL)_sd.ld endif -include $(RIOTMAKE)/tools/jlink.mk +include $(RIOTMAKE)/tools/jlink.inc.mk # setup serial terminal -include $(RIOTMAKE)/tools/serial.mk +include $(RIOTMAKE)/tools/serial.inc.mk diff --git a/boards/nrf6310/Makefile.include b/boards/nrf6310/Makefile.include index 1c8625f61b8c..7a1e1dec76fa 100644 --- a/boards/nrf6310/Makefile.include +++ b/boards/nrf6310/Makefile.include @@ -20,4 +20,4 @@ export DEBUGGER_FLAGS = $(BINDIR) $(ELFFILE) export RESET_FLAGS = $(BINDIR) # setup serial terminal -include $(RIOTMAKE)/tools/serial.mk +include $(RIOTMAKE)/tools/serial.inc.mk diff --git a/boards/nucleo-common/Makefile.include.serial b/boards/nucleo-common/Makefile.include.serial index 0859ef061cde..1c5e4d00d0ba 100644 --- a/boards/nucleo-common/Makefile.include.serial +++ b/boards/nucleo-common/Makefile.include.serial @@ -3,7 +3,7 @@ PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) # setup serial terminal -include $(RIOTMAKE)/tools/serial.mk +include $(RIOTMAKE)/tools/serial.inc.mk # this board uses openocd -include $(RIOTMAKE)/tools/openocd.mk +include $(RIOTMAKE)/tools/openocd.inc.mk diff --git a/boards/opencm904/Makefile.include b/boards/opencm904/Makefile.include index d0ee0e174098..18b0b6cffa42 100755 --- a/boards/opencm904/Makefile.include +++ b/boards/opencm904/Makefile.include @@ -20,4 +20,4 @@ PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) # setup serial terminal -include $(RIOTMAKE)/tools/serial.mk +include $(RIOTMAKE)/tools/serial.inc.mk diff --git a/boards/openmote-cc2538/Makefile.include b/boards/openmote-cc2538/Makefile.include index 98070e81aad7..549c7476f88e 100644 --- a/boards/openmote-cc2538/Makefile.include +++ b/boards/openmote-cc2538/Makefile.include @@ -15,7 +15,7 @@ ifeq ($(PROGRAMMER),jlink) export JLINK_FLASH_ADDR := 200000 export JLINK_IF := JTAG export TUI := 1 - include $(RIOTMAKE)/tools/jlink.mk + include $(RIOTMAKE)/tools/jlink.inc.mk else export OFLAGS = -O binary export HEXFILE = $(ELFFILE:.elf=.bin) @@ -24,4 +24,4 @@ else endif # setup serial terminal -include $(RIOTMAKE)/tools/serial.mk +include $(RIOTMAKE)/tools/serial.inc.mk diff --git a/boards/pba-d-01-kw2x/Makefile.include b/boards/pba-d-01-kw2x/Makefile.include index 00acec222a26..97d6a7192be7 100644 --- a/boards/pba-d-01-kw2x/Makefile.include +++ b/boards/pba-d-01-kw2x/Makefile.include @@ -40,7 +40,7 @@ ifneq (,$(SERIAL)) endif # setup serial terminal -include $(RIOTMAKE)/tools/serial.mk +include $(RIOTMAKE)/tools/serial.inc.mk # this board uses openocd -include $(RIOTMAKE)/tools/openocd.mk +include $(RIOTMAKE)/tools/openocd.inc.mk diff --git a/boards/pca10000/Makefile.include b/boards/pca10000/Makefile.include index fd1c53c8addb..55826907c0bb 100644 --- a/boards/pca10000/Makefile.include +++ b/boards/pca10000/Makefile.include @@ -9,7 +9,7 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) # setup JLink for flashing export JLINK_DEVICE := nrf51822 export JLINK_PRE_FLASH := w4 4001e504 1 -include $(RIOTMAKE)/tools/jlink.mk +include $(RIOTMAKE)/tools/jlink.inc.mk # setup serial terminal -include $(RIOTMAKE)/tools/serial.mk +include $(RIOTMAKE)/tools/serial.inc.mk diff --git a/boards/pca10005/Makefile.include b/boards/pca10005/Makefile.include index df7deccfa24a..4c62ef1f6b93 100644 --- a/boards/pca10005/Makefile.include +++ b/boards/pca10005/Makefile.include @@ -9,7 +9,7 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) # setup JLink for flashing export JLINK_DEVICE := nrf51822 export JLINK_PRE_FLASH := w4 4001e504 1 -include $(RIOTMAKE)/tools/jlink.mk +include $(RIOTMAKE)/tools/jlink.inc.mk # setup serial terminal -include $(RIOTMAKE)/tools/serial.mk +include $(RIOTMAKE)/tools/serial.inc.mk diff --git a/boards/remote-common/Makefile.include b/boards/remote-common/Makefile.include index a4f541d0a6dd..9f3e9fca7621 100644 --- a/boards/remote-common/Makefile.include +++ b/boards/remote-common/Makefile.include @@ -32,4 +32,4 @@ export OBJDUMPFLAGS += --disassemble --source --disassembler-options=force-thumb export INCLUDES += -I$(RIOTBOARD)/remote-common/include # setup serial terminal -include $(RIOTMAKE)/tools/serial.mk +include $(RIOTMAKE)/tools/serial.inc.mk diff --git a/boards/saml21-xpro/Makefile.include b/boards/saml21-xpro/Makefile.include index 127ec7180c97..c96d71bec7df 100644 --- a/boards/saml21-xpro/Makefile.include +++ b/boards/saml21-xpro/Makefile.include @@ -5,7 +5,7 @@ export CFLAGS += -D__SAML21J18A__ # setup serial terminal PORT_LINUX ?= /dev/ttyACM0 -include $(RIOTMAKE)/tools/serial.mk +include $(RIOTMAKE)/tools/serial.inc.mk # this board uses openocd -include $(RIOTMAKE)/tools/openocd.mk +include $(RIOTMAKE)/tools/openocd.inc.mk diff --git a/boards/samr21-xpro/Makefile.include b/boards/samr21-xpro/Makefile.include index 94f1f3b8cb7a..7f68e0eaa1bf 100644 --- a/boards/samr21-xpro/Makefile.include +++ b/boards/samr21-xpro/Makefile.include @@ -7,7 +7,7 @@ PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) # setup serial terminal -include $(RIOTMAKE)/tools/serial.mk +include $(RIOTMAKE)/tools/serial.inc.mk # Add board selector (USB serial) to OpenOCD options if specified. # Use /dist/tools/usb-serial/list-ttys.sh to find out serial number. @@ -22,4 +22,4 @@ ifneq (,$(SERIAL)) endif # this board uses openocd -include $(RIOTMAKE)/tools/openocd.mk +include $(RIOTMAKE)/tools/openocd.inc.mk diff --git a/boards/seeeduino_arch-pro/Makefile.include b/boards/seeeduino_arch-pro/Makefile.include index 49f80858ce83..73f97a001bc8 100644 --- a/boards/seeeduino_arch-pro/Makefile.include +++ b/boards/seeeduino_arch-pro/Makefile.include @@ -6,10 +6,10 @@ PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) # setup serial terminal -include $(RIOTMAKE)/tools/serial.mk +include $(RIOTMAKE)/tools/serial.inc.mk # this board uses openocd -include $(RIOTMAKE)/tools/openocd.mk +include $(RIOTMAKE)/tools/openocd.inc.mk # generate image checksum from hex file export PRE_FLASH_CHECK_SCRIPT = lpc_checksum --format hex diff --git a/boards/slwstk6220a/Makefile.include b/boards/slwstk6220a/Makefile.include index 0e827fa798e8..1fb937e0d046 100644 --- a/boards/slwstk6220a/Makefile.include +++ b/boards/slwstk6220a/Makefile.include @@ -8,7 +8,7 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) # setup JLink for flashing export JLINK_DEVICE := ezr32wg330f256 -include $(RIOTMAKE)/tools/jlink.mk +include $(RIOTMAKE)/tools/jlink.inc.mk # setup serial terminal -include $(RIOTMAKE)/tools/serial.mk +include $(RIOTMAKE)/tools/serial.inc.mk diff --git a/boards/sodaq-autonomo/Makefile.include b/boards/sodaq-autonomo/Makefile.include index 00b26e5b9653..83eb6a03145a 100644 --- a/boards/sodaq-autonomo/Makefile.include +++ b/boards/sodaq-autonomo/Makefile.include @@ -9,7 +9,7 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) export OFLAGS = -O binary # setup serial terminal -include $(RIOTMAKE)/tools/serial.mk +include $(RIOTMAKE)/tools/serial.inc.mk # Add board selector (USB serial) to OpenOCD options if specified. # Use /dist/tools/usb-serial/list-ttys.sh to find out serial number. @@ -24,4 +24,4 @@ ifneq (,$(SERIAL)) endif # this board uses openocd -include $(RIOTMAKE)/tools/openocd.mk +include $(RIOTMAKE)/tools/openocd.inc.mk diff --git a/boards/spark-core/Makefile.include b/boards/spark-core/Makefile.include index 9d94535fc14d..0710da46ef60 100644 --- a/boards/spark-core/Makefile.include +++ b/boards/spark-core/Makefile.include @@ -22,7 +22,7 @@ export TERMFLAGS = -p $(PORT) export INCLUDES += -I$(RIOTCPU)/$(CPU)/include/ -I$(RIOTBOARD)/$(BOARD)/include/ # setup serial terminal -include $(RIOTMAKE)/tools/serial.mk +include $(RIOTMAKE)/tools/serial.inc.mk # this board uses openocd -include $(RIOTMAKE)/tools/openocd.mk +include $(RIOTMAKE)/tools/openocd.inc.mk diff --git a/boards/stm32f0discovery/Makefile.include b/boards/stm32f0discovery/Makefile.include index bce4ae29eba6..628b16fa30e6 100644 --- a/boards/stm32f0discovery/Makefile.include +++ b/boards/stm32f0discovery/Makefile.include @@ -7,7 +7,7 @@ PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) # setup serial terminal -include $(RIOTMAKE)/tools/serial.mk +include $(RIOTMAKE)/tools/serial.inc.mk # this board uses openocd -include $(RIOTMAKE)/tools/openocd.mk +include $(RIOTMAKE)/tools/openocd.inc.mk diff --git a/boards/stm32f3discovery/Makefile.include b/boards/stm32f3discovery/Makefile.include index 0a21c889bbf2..6e6ca2a41996 100644 --- a/boards/stm32f3discovery/Makefile.include +++ b/boards/stm32f3discovery/Makefile.include @@ -7,7 +7,7 @@ PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) # setup serial terminal -include $(RIOTMAKE)/tools/serial.mk +include $(RIOTMAKE)/tools/serial.inc.mk # this board uses openocd -include $(RIOTMAKE)/tools/openocd.mk +include $(RIOTMAKE)/tools/openocd.inc.mk diff --git a/boards/stm32f4discovery/Makefile.include b/boards/stm32f4discovery/Makefile.include index 2623e1713424..def388e08d6f 100644 --- a/boards/stm32f4discovery/Makefile.include +++ b/boards/stm32f4discovery/Makefile.include @@ -7,7 +7,7 @@ PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) # setup serial terminal -include $(RIOTMAKE)/tools/serial.mk +include $(RIOTMAKE)/tools/serial.inc.mk # this board uses openocd -include $(RIOTMAKE)/tools/openocd.mk +include $(RIOTMAKE)/tools/openocd.inc.mk diff --git a/boards/telosb/Makefile.include b/boards/telosb/Makefile.include index e589f4142326..7d062b427460 100644 --- a/boards/telosb/Makefile.include +++ b/boards/telosb/Makefile.include @@ -7,7 +7,7 @@ PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbserial-MXV*))) # setup serial terminal export BAUD ?= 9600 -include $(RIOTMAKE)/tools/serial.mk +include $(RIOTMAKE)/tools/serial.inc.mk # flash tool configuration export OFLAGS = -O ihex diff --git a/boards/udoo/Makefile.include b/boards/udoo/Makefile.include index e9a488345dcb..f566c727b518 100644 --- a/boards/udoo/Makefile.include +++ b/boards/udoo/Makefile.include @@ -21,4 +21,4 @@ export OFLAGS = -O binary export FFLAGS = -R -e -w -v -b bin/$(BOARD)/$(APPLICATION).hex # setup serial terminal -include $(RIOTMAKE)/tools/serial.mk +include $(RIOTMAKE)/tools/serial.inc.mk diff --git a/boards/weio/Makefile.include b/boards/weio/Makefile.include index 50ba7fbaf0fc..188b5a13021f 100644 --- a/boards/weio/Makefile.include +++ b/boards/weio/Makefile.include @@ -15,4 +15,4 @@ PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) # setup serial terminal -include $(RIOTMAKE)/tools/serial.mk +include $(RIOTMAKE)/tools/serial.inc.mk diff --git a/boards/wsn430-common/Makefile.include b/boards/wsn430-common/Makefile.include index a45c06ac167e..024d09c76785 100644 --- a/boards/wsn430-common/Makefile.include +++ b/boards/wsn430-common/Makefile.include @@ -6,7 +6,7 @@ export CPU_MODEL = msp430f1611 PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) # setup serial terminal -include $(RIOTMAKE)/tools/serial.mk +include $(RIOTMAKE)/tools/serial.inc.mk # setup flash tool export OFLAGS = -O ihex diff --git a/boards/yunjia-nrf51822/Makefile.include b/boards/yunjia-nrf51822/Makefile.include index 35898c26e244..759cf37a4df5 100644 --- a/boards/yunjia-nrf51822/Makefile.include +++ b/boards/yunjia-nrf51822/Makefile.include @@ -7,7 +7,7 @@ PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) # setup serial terminal -include $(RIOTMAKE)/tools/serial.mk +include $(RIOTMAKE)/tools/serial.inc.mk # this board uses openocd -include $(RIOTMAKE)/tools/openocd.mk +include $(RIOTMAKE)/tools/openocd.inc.mk diff --git a/boards/z1/Makefile.include b/boards/z1/Makefile.include index 4fdaf59b18c1..a215e48f14ff 100644 --- a/boards/z1/Makefile.include +++ b/boards/z1/Makefile.include @@ -6,7 +6,7 @@ export CPU_MODEL = msp430f2617 PORT_LINUX ?= /dev/ttyUSB0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) # setup serial terminal -include $(RIOTMAKE)/tools/serial.mk +include $(RIOTMAKE)/tools/serial.inc.mk # setup flash tool export OFLAGS = -O ihex diff --git a/cpu/cc2538/Makefile.include b/cpu/cc2538/Makefile.include index 85640133132f..bc93aaa0ebb0 100644 --- a/cpu/cc2538/Makefile.include +++ b/cpu/cc2538/Makefile.include @@ -3,4 +3,4 @@ export CPU_ARCH := cortex-m3 # include common SPI functions USEMODULE += periph_common -include $(RIOTMAKE)/arch/cortexm.mk +include $(RIOTMAKE)/arch/cortexm.inc.mk diff --git a/cpu/cc26x0/Makefile.include b/cpu/cc26x0/Makefile.include index d99699fe9666..7a03b807df95 100644 --- a/cpu/cc26x0/Makefile.include +++ b/cpu/cc26x0/Makefile.include @@ -1,3 +1,3 @@ export CPU_ARCH := cortex-m3 -include $(RIOTMAKE)/arch/cortexm.mk +include $(RIOTMAKE)/arch/cortexm.inc.mk diff --git a/cpu/ezr32wg/Makefile.include b/cpu/ezr32wg/Makefile.include index a4228bce3ef9..1e08098b245c 100644 --- a/cpu/ezr32wg/Makefile.include +++ b/cpu/ezr32wg/Makefile.include @@ -1,3 +1,3 @@ export CPU_ARCH = cortex-m4f -include $(RIOTMAKE)/arch/cortexm.mk +include $(RIOTMAKE)/arch/cortexm.inc.mk diff --git a/cpu/k60/Makefile.include b/cpu/k60/Makefile.include index 59ec9aa44ead..7864add139fe 100644 --- a/cpu/k60/Makefile.include +++ b/cpu/k60/Makefile.include @@ -22,4 +22,4 @@ export COMMON_STARTUP = $(KINETIS_COMMON) export UNDEF += $(BINDIR)/cpu/vectors.o export UNDEF += $(BINDIR)/cpu/ssp.o -include $(RIOTMAKE)/arch/cortexm.mk +include $(RIOTMAKE)/arch/cortexm.inc.mk diff --git a/cpu/k64f/Makefile.include b/cpu/k64f/Makefile.include index 8225bcdbe56d..1ef70e6970b2 100644 --- a/cpu/k64f/Makefile.include +++ b/cpu/k64f/Makefile.include @@ -21,4 +21,4 @@ export COMMON_STARTUP = $(KINETIS_COMMON) # add the CPU specific system calls implementations for the linker export UNDEF += $(BINDIR)/cpu/vectors.o -include $(RIOTMAKE)/arch/cortexm.mk +include $(RIOTMAKE)/arch/cortexm.inc.mk diff --git a/cpu/kw2x/Makefile.include b/cpu/kw2x/Makefile.include index c7e59fe31a78..e194a2124d04 100644 --- a/cpu/kw2x/Makefile.include +++ b/cpu/kw2x/Makefile.include @@ -21,4 +21,4 @@ export COMMON_STARTUP = $(KINETIS_COMMON) # add the CPU specific system calls implementations for the linker export UNDEF += $(BINDIR)/cpu/vectors.o -include $(RIOTMAKE)/arch/cortexm.mk +include $(RIOTMAKE)/arch/cortexm.inc.mk diff --git a/cpu/lm4f120/Makefile.include b/cpu/lm4f120/Makefile.include index b6d705f95f62..e038dd686daf 100644 --- a/cpu/lm4f120/Makefile.include +++ b/cpu/lm4f120/Makefile.include @@ -1,4 +1,4 @@ export CPU_ARCH = cortex-m4f -include $(RIOTMAKE)/arch/cortexm.mk +include $(RIOTMAKE)/arch/cortexm.inc.mk include $(RIOTCPU)/stellaris_common/Makefile diff --git a/cpu/lpc11u34/Makefile.include b/cpu/lpc11u34/Makefile.include index d7c8729d4ed0..26110583850b 100644 --- a/cpu/lpc11u34/Makefile.include +++ b/cpu/lpc11u34/Makefile.include @@ -1,3 +1,3 @@ export CPU_ARCH = cortex-m0 -include $(RIOTMAKE)/arch/cortexm.mk +include $(RIOTMAKE)/arch/cortexm.inc.mk diff --git a/cpu/lpc1768/Makefile.include b/cpu/lpc1768/Makefile.include index 4ea1e8768710..259ee2a90e08 100644 --- a/cpu/lpc1768/Makefile.include +++ b/cpu/lpc1768/Makefile.include @@ -1,3 +1,3 @@ export CPU_ARCH = cortex-m3 -include $(RIOTMAKE)/arch/cortexm.mk +include $(RIOTMAKE)/arch/cortexm.inc.mk diff --git a/cpu/msp430_common/Makefile.include b/cpu/msp430_common/Makefile.include index 28a86aea1668..ca676e5065a9 100644 --- a/cpu/msp430_common/Makefile.include +++ b/cpu/msp430_common/Makefile.include @@ -6,4 +6,4 @@ export USEMODULE += msp430_common msp430_common_periph DEFAULT_MODULE += oneway_malloc # include the msp430 common Makefile -include $(RIOTMAKE)/arch/msp430.mk +include $(RIOTMAKE)/arch/msp430.inc.mk diff --git a/cpu/nrf51/Makefile.include b/cpu/nrf51/Makefile.include index 9b71b90e4865..b182bf12fa38 100644 --- a/cpu/nrf51/Makefile.include +++ b/cpu/nrf51/Makefile.include @@ -2,4 +2,4 @@ export CPU_ARCH = cortex-m0 export CPU_FAM = nrf51 include $(RIOTCPU)/nrf5x_common/Makefile.include -include $(RIOTMAKE)/arch/cortexm.mk +include $(RIOTMAKE)/arch/cortexm.inc.mk diff --git a/cpu/nrf52/Makefile.include b/cpu/nrf52/Makefile.include index e619a3c3e679..196831749b8c 100644 --- a/cpu/nrf52/Makefile.include +++ b/cpu/nrf52/Makefile.include @@ -2,4 +2,4 @@ export CPU_ARCH = cortex-m4f export CPU_FAM = nrf52 include $(RIOTCPU)/nrf5x_common/Makefile.include -include $(RIOTMAKE)/arch/cortexm.mk +include $(RIOTMAKE)/arch/cortexm.inc.mk diff --git a/cpu/sam3/Makefile.include b/cpu/sam3/Makefile.include index 1e3db86dc4da..7a2337733e92 100644 --- a/cpu/sam3/Makefile.include +++ b/cpu/sam3/Makefile.include @@ -3,4 +3,4 @@ export CPU_ARCH = cortex-m3 # include common SPI functions USEMODULE += periph_common -include $(RIOTMAKE)/arch/cortexm.mk +include $(RIOTMAKE)/arch/cortexm.inc.mk diff --git a/cpu/samd21/Makefile.include b/cpu/samd21/Makefile.include index c22af6dd2acf..e5486c8a8901 100644 --- a/cpu/samd21/Makefile.include +++ b/cpu/samd21/Makefile.include @@ -4,4 +4,4 @@ export CPU_FAM = samd21 USEMODULE += pm_layered include $(RIOTCPU)/sam0_common/Makefile.include -include $(RIOTMAKE)/arch/cortexm.mk +include $(RIOTMAKE)/arch/cortexm.inc.mk diff --git a/cpu/saml21/Makefile.include b/cpu/saml21/Makefile.include index 1b97e178601c..951564302b56 100644 --- a/cpu/saml21/Makefile.include +++ b/cpu/saml21/Makefile.include @@ -4,4 +4,4 @@ export CPU_FAM = saml21 USEMODULE += pm_layered include $(RIOTCPU)/sam0_common/Makefile.include -include $(RIOTMAKE)/arch/cortexm.mk +include $(RIOTMAKE)/arch/cortexm.inc.mk diff --git a/cpu/stm32f0/Makefile.include b/cpu/stm32f0/Makefile.include index 769a842a21ad..18fc5c661dc2 100644 --- a/cpu/stm32f0/Makefile.include +++ b/cpu/stm32f0/Makefile.include @@ -2,4 +2,4 @@ export CPU_ARCH = cortex-m0 export CPU_FAM = stm32f0 include $(RIOTCPU)/stm32_common/Makefile.include -include $(RIOTMAKE)/arch/cortexm.mk +include $(RIOTMAKE)/arch/cortexm.inc.mk diff --git a/cpu/stm32f1/Makefile.include b/cpu/stm32f1/Makefile.include index 4f3dda4f82bc..abe4696648ee 100644 --- a/cpu/stm32f1/Makefile.include +++ b/cpu/stm32f1/Makefile.include @@ -4,4 +4,4 @@ export CPU_FAM = stm32f1 USEMODULE += pm_layered include $(RIOTCPU)/stm32_common/Makefile.include -include $(RIOTMAKE)/arch/cortexm.mk +include $(RIOTMAKE)/arch/cortexm.inc.mk diff --git a/cpu/stm32f2/Makefile.include b/cpu/stm32f2/Makefile.include index a488c1acb041..453f82cd4602 100644 --- a/cpu/stm32f2/Makefile.include +++ b/cpu/stm32f2/Makefile.include @@ -4,4 +4,4 @@ export CPU_FAM = stm32f2 USEMODULE += pm_layered include $(RIOTCPU)/stm32_common/Makefile.include -include $(RIOTMAKE)/arch/cortexm.mk +include $(RIOTMAKE)/arch/cortexm.inc.mk diff --git a/cpu/stm32f3/Makefile.include b/cpu/stm32f3/Makefile.include index 6d9bc0bd32b0..3ad9e9546cfe 100644 --- a/cpu/stm32f3/Makefile.include +++ b/cpu/stm32f3/Makefile.include @@ -2,4 +2,4 @@ export CPU_ARCH = cortex-m4f export CPU_FAM = stm32f3 include $(RIOTCPU)/stm32_common/Makefile.include -include $(RIOTMAKE)/arch/cortexm.mk +include $(RIOTMAKE)/arch/cortexm.inc.mk diff --git a/cpu/stm32f4/Makefile.include b/cpu/stm32f4/Makefile.include index 52001eb8a512..c88560db69f7 100644 --- a/cpu/stm32f4/Makefile.include +++ b/cpu/stm32f4/Makefile.include @@ -4,4 +4,4 @@ export CPU_FAM = stm32f4 USEMODULE += pm_layered include $(RIOTCPU)/stm32_common/Makefile.include -include $(RIOTMAKE)/arch/cortexm.mk +include $(RIOTMAKE)/arch/cortexm.inc.mk diff --git a/cpu/stm32l0/Makefile.include b/cpu/stm32l0/Makefile.include index 0f51cda80b3c..42b0a85b6621 100644 --- a/cpu/stm32l0/Makefile.include +++ b/cpu/stm32l0/Makefile.include @@ -2,4 +2,4 @@ export CPU_ARCH = cortex-m0 export CPU_FAM = stm32l0 include $(RIOTCPU)/stm32_common/Makefile.include -include $(RIOTMAKE)/arch/cortexm.mk +include $(RIOTMAKE)/arch/cortexm.inc.mk diff --git a/cpu/stm32l1/Makefile.include b/cpu/stm32l1/Makefile.include index 909c79ebef44..3d6f379e13b4 100644 --- a/cpu/stm32l1/Makefile.include +++ b/cpu/stm32l1/Makefile.include @@ -2,4 +2,4 @@ export CPU_ARCH = cortex-m3 export CPU_FAM = stm32l1 include $(RIOTCPU)/stm32_common/Makefile.include -include $(RIOTMAKE)/arch/cortexm.mk +include $(RIOTMAKE)/arch/cortexm.inc.mk From 0a6f879f490039dadeee3ac113c50220a18b4912 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Nohlg=C3=A5rd?= Date: Thu, 30 Mar 2017 09:03:22 +0200 Subject: [PATCH 04/11] squash move Makefile.include.mips_common -> arch/mips.inc.mk --- cpu/mips32r2_common/Makefile.include | 2 +- cpu/mips_pic32mx/Makefile.include | 2 +- cpu/mips_pic32mz/Makefile.include | 2 +- cpu/Makefile.include.mips_common => makefiles/arch/mips.inc.mk | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename cpu/Makefile.include.mips_common => makefiles/arch/mips.inc.mk (100%) diff --git a/cpu/mips32r2_common/Makefile.include b/cpu/mips32r2_common/Makefile.include index 644a65df40d3..40fa8dbf3604 100644 --- a/cpu/mips32r2_common/Makefile.include +++ b/cpu/mips32r2_common/Makefile.include @@ -2,7 +2,7 @@ export MEMORY_BASE=0x80000000 export MEMORY_SIZE=1M export APP_START=0x80000000 -include $(RIOTCPU)/Makefile.include.mips_common +include $(RIOTMAKE)/arch/mips.inc.mk export LINKFLAGS += -Tuhi32.ld export USEMODULE += periph diff --git a/cpu/mips_pic32mx/Makefile.include b/cpu/mips_pic32mx/Makefile.include index c7d6b8849552..6626e67c8e65 100644 --- a/cpu/mips_pic32mx/Makefile.include +++ b/cpu/mips_pic32mx/Makefile.include @@ -3,7 +3,7 @@ export MEMORY_SIZE=128K export APP_START=0x80000000 export ROMABLE = 1 -include $(RIOTCPU)/Makefile.include.mips_common +include $(RIOTMAKE)/arch/mips.inc.mk # define build specific options export CFLAGS += -march=m4k -DSKIP_COPY_TO_RAM diff --git a/cpu/mips_pic32mz/Makefile.include b/cpu/mips_pic32mz/Makefile.include index 7a36d5131e4e..30524b94972c 100644 --- a/cpu/mips_pic32mz/Makefile.include +++ b/cpu/mips_pic32mz/Makefile.include @@ -3,7 +3,7 @@ export MEMORY_SIZE=512K export APP_START=0x80000000 export ROMABLE = 1 -include $(RIOTCPU)/Makefile.include.mips_common +include $(RIOTMAKE)/arch/mips.inc.mk # define build specific options export CFLAGS += -march=m5101 -mmicromips -DSKIP_COPY_TO_RAM diff --git a/cpu/Makefile.include.mips_common b/makefiles/arch/mips.inc.mk similarity index 100% rename from cpu/Makefile.include.mips_common rename to makefiles/arch/mips.inc.mk From e4e90b22c9b5260b73c5bca729f4d5c419e9f6e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Nohlg=C3=A5rd?= Date: Wed, 1 Mar 2017 10:03:41 +0100 Subject: [PATCH 05/11] newlib: Split newlib into one generic part and one default syscalls part --- sys/Makefile.include | 6 +++++- sys/{newlib/Makefile.include => Makefile.newlib} | 4 +--- sys/{newlib => newlib_syscalls_default}/Makefile | 2 -- sys/newlib_syscalls_default/Makefile.include | 1 + sys/{newlib => newlib_syscalls_default}/syscalls.c | 0 5 files changed, 7 insertions(+), 6 deletions(-) rename sys/{newlib/Makefile.include => Makefile.newlib} (97%) rename sys/{newlib => newlib_syscalls_default}/Makefile (50%) create mode 100644 sys/newlib_syscalls_default/Makefile.include rename sys/{newlib => newlib_syscalls_default}/syscalls.c (100%) diff --git a/sys/Makefile.include b/sys/Makefile.include index 680f655b17bb..d5c172bc4432 100644 --- a/sys/Makefile.include +++ b/sys/Makefile.include @@ -65,8 +65,12 @@ ifneq (,$(filter log_%,$(USEMODULE))) include $(RIOTBASE)/sys/log/Makefile.include endif +ifneq (,$(filter newlib,$(USEMODULE))) + include $(RIOTBASE)/sys/Makefile.newlib +endif + ifneq (,$(filter newlib_syscalls_default,$(USEMODULE))) - include $(RIOTBASE)/sys/newlib/Makefile.include + include $(RIOTBASE)/sys/newlib_syscalls_default/Makefile.include endif ifneq (,$(filter arduino,$(USEMODULE))) diff --git a/sys/newlib/Makefile.include b/sys/Makefile.newlib similarity index 97% rename from sys/newlib/Makefile.include rename to sys/Makefile.newlib index 2e1c6b8cf933..4d8a784a1ee3 100644 --- a/sys/newlib/Makefile.include +++ b/sys/Makefile.newlib @@ -1,5 +1,3 @@ -UNDEF := $(BINDIR)/newlib_syscalls_default/syscalls.o $(UNDEF) - ifneq (,$(filter newlib_nano,$(USEMODULE))) # Test if nano.specs is available ifeq ($(shell $(LINK) -specs=nano.specs -E - 2>/dev/null >/dev/null /dev/null))/../$(TARGET_ARCH)/include)) endif ifeq ($(TOOLCHAIN),llvm) diff --git a/sys/newlib/Makefile b/sys/newlib_syscalls_default/Makefile similarity index 50% rename from sys/newlib/Makefile rename to sys/newlib_syscalls_default/Makefile index 586bc62601f7..48422e909a47 100644 --- a/sys/newlib/Makefile +++ b/sys/newlib_syscalls_default/Makefile @@ -1,3 +1 @@ -MODULE = newlib_syscalls_default - include $(RIOTBASE)/Makefile.base diff --git a/sys/newlib_syscalls_default/Makefile.include b/sys/newlib_syscalls_default/Makefile.include new file mode 100644 index 000000000000..419a6feddc87 --- /dev/null +++ b/sys/newlib_syscalls_default/Makefile.include @@ -0,0 +1 @@ +UNDEF += $(BINDIR)/newlib_syscalls_default/syscalls.o diff --git a/sys/newlib/syscalls.c b/sys/newlib_syscalls_default/syscalls.c similarity index 100% rename from sys/newlib/syscalls.c rename to sys/newlib_syscalls_default/syscalls.c From 0ddd2ef1a488cc97425f499d73a1589dcf304188 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Nohlg=C3=A5rd?= Date: Fri, 24 Mar 2017 14:57:46 +0100 Subject: [PATCH 06/11] squash move Makefile.newlib -> newlib.mk --- sys/Makefile.newlib => makefiles/libc/newlib.mk | 0 sys/Makefile.include | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sys/Makefile.newlib => makefiles/libc/newlib.mk (100%) diff --git a/sys/Makefile.newlib b/makefiles/libc/newlib.mk similarity index 100% rename from sys/Makefile.newlib rename to makefiles/libc/newlib.mk diff --git a/sys/Makefile.include b/sys/Makefile.include index d5c172bc4432..092bb68792ab 100644 --- a/sys/Makefile.include +++ b/sys/Makefile.include @@ -66,7 +66,7 @@ ifneq (,$(filter log_%,$(USEMODULE))) endif ifneq (,$(filter newlib,$(USEMODULE))) - include $(RIOTBASE)/sys/Makefile.newlib + include $(RIOTMAKE)/libc/newlib.mk endif ifneq (,$(filter newlib_syscalls_default,$(USEMODULE))) From 9789514e08fddb88144b596bbcb16f44f286e236 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Nohlg=C3=A5rd?= Date: Wed, 22 Feb 2017 16:07:58 +0100 Subject: [PATCH 07/11] cpu/mips: Integrate better with RIOT newlib layer - Copied the relevant parts of mipshal.mk from the toolchain - Cleaned up CFLAGS and more in Makefile.include - Added empty syscalls implementation which can be used to interface with the UHI system - Added a note on why -std=gnu99 is necessary for this CPU presently --- cpu/mips32r2_common/Makefile | 2 +- cpu/mips32r2_common/Makefile.include | 2 + cpu/mips32r2_common/cpu.c | 4 -- .../newlib_syscalls_mips_uhi/Makefile | 1 + .../newlib_syscalls_mips_uhi/syscalls.c | 11 ++++ cpu/mips_pic32mx/Makefile.include | 2 +- cpu/mips_pic32mz/Makefile.include | 2 +- makefiles/arch/mips.inc.mk | 51 ++++++++++++------- 8 files changed, 51 insertions(+), 24 deletions(-) create mode 100644 cpu/mips32r2_common/newlib_syscalls_mips_uhi/Makefile create mode 100644 cpu/mips32r2_common/newlib_syscalls_mips_uhi/syscalls.c diff --git a/cpu/mips32r2_common/Makefile b/cpu/mips32r2_common/Makefile index 7f386366f4ae..9524c712945c 100644 --- a/cpu/mips32r2_common/Makefile +++ b/cpu/mips32r2_common/Makefile @@ -1,4 +1,4 @@ MODULE = cpu -DIRS = periph +DIRS = periph newlib_syscalls_mips_uhi include $(RIOTBASE)/Makefile.base diff --git a/cpu/mips32r2_common/Makefile.include b/cpu/mips32r2_common/Makefile.include index 40fa8dbf3604..a1b63618157f 100644 --- a/cpu/mips32r2_common/Makefile.include +++ b/cpu/mips32r2_common/Makefile.include @@ -6,3 +6,5 @@ include $(RIOTMAKE)/arch/mips.inc.mk export LINKFLAGS += -Tuhi32.ld export USEMODULE += periph +export USEMODULE += newlib +export USEMODULE += newlib_syscalls_mips_uhi diff --git a/cpu/mips32r2_common/cpu.c b/cpu/mips32r2_common/cpu.c index 9c12b988fb38..1676212d8739 100644 --- a/cpu/mips32r2_common/cpu.c +++ b/cpu/mips32r2_common/cpu.c @@ -60,10 +60,6 @@ void mips_start(void) { board_init(); -#if MODULE_NEWLIB -#error "This Port is designed to work with the (newlib) C library provided with the mips sdk toolchain" -#endif - /* kernel_init */ kernel_init(); } diff --git a/cpu/mips32r2_common/newlib_syscalls_mips_uhi/Makefile b/cpu/mips32r2_common/newlib_syscalls_mips_uhi/Makefile new file mode 100644 index 000000000000..48422e909a47 --- /dev/null +++ b/cpu/mips32r2_common/newlib_syscalls_mips_uhi/Makefile @@ -0,0 +1 @@ +include $(RIOTBASE)/Makefile.base diff --git a/cpu/mips32r2_common/newlib_syscalls_mips_uhi/syscalls.c b/cpu/mips32r2_common/newlib_syscalls_mips_uhi/syscalls.c new file mode 100644 index 000000000000..051252785363 --- /dev/null +++ b/cpu/mips32r2_common/newlib_syscalls_mips_uhi/syscalls.c @@ -0,0 +1,11 @@ +/* + * Copyright (C) 2017 whoever implements this + * + * This file is subject to the terms and conditions of the GNU Lesser + * General Public License v2.1. See the file LICENSE in the top level + * directory for more details. + */ +/** + * @todo Here there should be a syscall implementation for use with the mips-mti-elf toolchain newlib + */ +typedef int dont_be_pedantic; diff --git a/cpu/mips_pic32mx/Makefile.include b/cpu/mips_pic32mx/Makefile.include index 6626e67c8e65..4210842dc5d2 100644 --- a/cpu/mips_pic32mx/Makefile.include +++ b/cpu/mips_pic32mx/Makefile.include @@ -11,7 +11,7 @@ export CFLAGS += -march=m4k -DSKIP_COPY_TO_RAM export USEMODULE += periph export LINKFLAGS += -Wl,--defsym,__use_excpt_boot=0 $(CFLAGS) -export LINKFLAGS += -T$(RIOTCPU)/$(CPU)/ldscripts/pic32mx512_12_128_uhi.ld +export LINKFLAGS += -Tpic32mx512_12_128_uhi.ld # the pickit programmer (MPLAB-IPE) wants physical addresses in the hex file!! export OBJCOPY = objcopy #use system objcopy as toolchain one is broken. diff --git a/cpu/mips_pic32mz/Makefile.include b/cpu/mips_pic32mz/Makefile.include index 30524b94972c..ffe2bf225463 100644 --- a/cpu/mips_pic32mz/Makefile.include +++ b/cpu/mips_pic32mz/Makefile.include @@ -12,7 +12,7 @@ export CFLAGS += -DMIPS_MICROMIPS export USEMODULE += periph export LINKFLAGS += -Wl,--defsym,__use_excpt_boot=0 $(CFLAGS) -export LINKFLAGS += -T$(RIOTCPU)/$(CPU)/ldscripts/pic32mz2048_uhi.ld +export LINKFLAGS += -Tpic32mz2048_uhi.ld # the pickit programmer (MPLAB-IPE) wants physical addresses in the hex file!! export OBJCOPY = objcopy #use system objcopy as toolchain one is broken. diff --git a/makefiles/arch/mips.inc.mk b/makefiles/arch/mips.inc.mk index f4bb05caf0ed..22f37d80ded6 100644 --- a/makefiles/arch/mips.inc.mk +++ b/makefiles/arch/mips.inc.mk @@ -1,31 +1,47 @@ -ifndef MIPS_ELF_ROOT -ifneq ($(BUILD_IN_DOCKER),1) #Don't error when BUILD_IN_DOCKER=1 as it _is_ set in DOCKER - $(error "Please set $$(MIPS_ELF_ROOT) and ensure $$(MIPS_ELF_ROOT)/bin is on your PATH") -endif -endif - # Target triple for the build. export TARGET_ARCH ?= mips-mti-elf export ABI=32 -ifneq ($(BUILD_IN_DOCKER),1) #Don't error when BUILD_IN_DOCKER=1 as MIPS_ELF_ROOT _is_ set in DOCKER -include $(MIPS_ELF_ROOT)/share/mips/rules/mipshal.mk -endif +# Portable 'lowercase' func. +lc = $(subst A,a,$(subst B,b,$(subst C,c,$(subst D,d,$(subst E,e,$(subst F,f,$(subst G,g,$(subst H,h,$(subst I,i,$(subst J,j,$(subst K,k,$(subst L,l,$(subst M,m,$(subst N,n,$(subst O,o,$(subst P,p,$(subst Q,q,$(subst R,r,$(subst S,s,$(subst T,t,$(subst U,u,$(subst V,v,$(subst W,w,$(subst X,x,$(subst Y,y,$(subst Z,z,$1)))))))))))))))))))))))))) + +# Default values for the linker script symbols listed below are +# defined in the linker script. + +# These are linker script symbols that are prefixed with '__" +priv_symbols = MEMORY_BASE MEMORY_SIZE STACK +priv_symbols += ENABLE_XPA +priv_symbols += FLUSH_TO_ZERO +priv_symbols += FLASH_START APP_START FLASH_APP_START +priv_symbols += ISR_VEC_SPACE ISR_VECTOR_COUNT + +comma := , + +# A bit of makefile magic: +# foreach symbol in overridable ld-symbols : +# If symbol has a value, produce a linker argument for that symbol. +MIPS_HAL_LDFLAGS = $(foreach a,$(priv_symbols),$(if $($a),-Wl$(comma)--defsym$(comma)__$(call lc,$(a))=$($a))) # define build specific options -export CFLAGS_CPU = -EL -std=gnu99 +# Remove -std=gnu99 once the MIPS toolchain headers are updated to include upstream +# newlib commit 81c17949f0419d1c4fee421c60987ea1149522ae +# https://cygwin.com/git/gitweb.cgi?p=newlib-cygwin.git;a=commitdiff;h=81c17949f0419d1c4fee421c60987ea1149522ae +# Otherwise we get an error about a missing declaration of strnlen in some parts. +export CFLAGS += -std=gnu99 +export CFLAGS_CPU = -EL -mabi=$(ABI) +# Why not -fdata-sections?? /JN export CFLAGS_LINK = -ffunction-sections -fno-builtin -fshort-enums #-fdata-sections -export CFLAGS_DBG = -O0 -g2 -export CFLAGS_OPT = -Os -g2 +export CFLAGS_DBG = -g3 +export CFLAGS_OPT = -Os -export CFLAGS += $(CFLAGS_CPU) $(CFLAGS_LINK) $(CFLAGS_OPT) -#$(CFLAGS_DBG) +export CFLAGS += $(CFLAGS_CPU) $(CFLAGS_LINK) $(CFLAGS_OPT) $(CFLAGS_DBG) ifeq ($(USE_HARD_FLOAT),1) export CFLAGS += -mhard-float else - export CFLAGS += -msoft-float #hard-float is the default so we must set soft-float + #hard-float is the default so we must set soft-float + export CFLAGS += -msoft-float export LINKFLAGS += -msoft-float endif @@ -33,9 +49,10 @@ ifeq ($(USE_DSP),1) export CFLAGS += -mdsp endif -export ASFLAGS += $(CFLAGS_CPU) $(CFLAGS_OPT) #$(CFLAGS_DBG) +export ASFLAGS += $(CFLAGS_CPU) $(CFLAGS_OPT) $(CFLAGS_DBG) -export LINKFLAGS += $(MIPS_HAL_LDFLAGS) -mabi=$(ABI) +export LINKFLAGS += $(MIPS_HAL_LDFLAGS) +export LINKFLAGS += -L$(RIOTCPU)/$(CPU)/ldscripts export LINKFLAGS += $(CFLAGS_CPU) $(CFLAGS_DBG) $(CFLAGS_OPT) export LINKFLAGS += -Wl,--gc-sections From 4790bac1ca80d285720bfa479389288aeb7cbe3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Nohlg=C3=A5rd?= Date: Wed, 1 Mar 2017 11:26:49 +0100 Subject: [PATCH 08/11] cpu/mips32r2_common: Use GCC for assembler files if TOOLCHAIN=llvm Some headers in the tool chain cause compilation errors with Clang in assembly mode. --- makefiles/arch/mips.inc.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/makefiles/arch/mips.inc.mk b/makefiles/arch/mips.inc.mk index 22f37d80ded6..fc107447e733 100644 --- a/makefiles/arch/mips.inc.mk +++ b/makefiles/arch/mips.inc.mk @@ -49,6 +49,12 @@ ifeq ($(USE_DSP),1) export CFLAGS += -mdsp endif +ifeq ($(TOOLCHAIN),llvm) +# The MIPS toolchain headers in assembly mode are not compatible with Clang +export CCAS = $(PREFIX)gcc +export CCASUWFLAGS += -target $(TARGET_ARCH) +endif + export ASFLAGS += $(CFLAGS_CPU) $(CFLAGS_OPT) $(CFLAGS_DBG) export LINKFLAGS += $(MIPS_HAL_LDFLAGS) From 375637ef8ce1fc928f51fc1843e2834ac0dab17e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Nohlg=C3=A5rd?= Date: Wed, 1 Mar 2017 11:28:33 +0100 Subject: [PATCH 09/11] cpu/mips32r2_common: ifdef __attribute__((optimize)) Causes compilation error on Clang --- cpu/mips32r2_common/thread_arch.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cpu/mips32r2_common/thread_arch.c b/cpu/mips32r2_common/thread_arch.c index 69b8fbb94bfb..31509ac74b67 100644 --- a/cpu/mips32r2_common/thread_arch.c +++ b/cpu/mips32r2_common/thread_arch.c @@ -185,7 +185,11 @@ struct linkctx* exctx_find(reg_t id, struct gpctx *gp) } /* unaligned access helper */ -static inline uint32_t __attribute__((optimize("-O3"))) +static inline uint32_t +#ifndef __clang__ +/* Clang does not support attribute optimize */ +__attribute__((optimize("-O3"))) +#endif mem_rw(const void *vaddr) { uint32_t v; From 5b961e09fa4cac85ce0ce1e0e68f6d0d6e476c0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Nohlg=C3=A5rd?= Date: Wed, 1 Mar 2017 15:11:19 +0100 Subject: [PATCH 10/11] squash add if ROMABLE --- makefiles/arch/mips.inc.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/makefiles/arch/mips.inc.mk b/makefiles/arch/mips.inc.mk index fc107447e733..eb924de6d0fa 100644 --- a/makefiles/arch/mips.inc.mk +++ b/makefiles/arch/mips.inc.mk @@ -23,6 +23,10 @@ comma := , # If symbol has a value, produce a linker argument for that symbol. MIPS_HAL_LDFLAGS = $(foreach a,$(priv_symbols),$(if $($a),-Wl$(comma)--defsym$(comma)__$(call lc,$(a))=$($a))) +ifeq ($(ROMABLE),1) +MIPS_HAL_LDFLAGS += -T bootcode.ld +endif + # define build specific options # Remove -std=gnu99 once the MIPS toolchain headers are updated to include upstream # newlib commit 81c17949f0419d1c4fee421c60987ea1149522ae From 67169256eeeb467ebca70b20139ad5b4ab4b360f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Nohlg=C3=A5rd?= Date: Sat, 11 Mar 2017 05:39:37 +0100 Subject: [PATCH 11/11] squash remove POSIX headers workaround for mips-malta --- sys/posix/include/fcntl.h | 4 +--- sys/posix/include/sys/statvfs.h | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/sys/posix/include/fcntl.h b/sys/posix/include/fcntl.h index ee9b894c2423..3cc1a766cf28 100644 --- a/sys/posix/include/fcntl.h +++ b/sys/posix/include/fcntl.h @@ -15,10 +15,8 @@ * @see http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/fcntl.h.html */ -/** @todo Remove ifdef __mips__ special case after - * [#6639](https://github.com/RIOT-OS/RIOT/pull/6639) is merged */ #ifndef DOXYGEN -#if defined(CPU_NATIVE) || MODULE_NEWLIB || defined(__mips__) +#if defined(CPU_NATIVE) || MODULE_NEWLIB /* If building on native or newlib we need to use the system header instead */ #pragma GCC system_header /* without the GCC pragma above #include_next will trigger a pedantic error */ diff --git a/sys/posix/include/sys/statvfs.h b/sys/posix/include/sys/statvfs.h index c688aa10da4b..4a6005b49b24 100644 --- a/sys/posix/include/sys/statvfs.h +++ b/sys/posix/include/sys/statvfs.h @@ -22,9 +22,7 @@ #define SYS_STATVFS_H_ #include /* for fsblkcnt_t, fsfilcnt_t */ -/** @todo Remove ifdef __mips__ special case after - * [#6639](https://github.com/RIOT-OS/RIOT/pull/6639) is merged */ -#if MODULE_NEWLIB || defined(__mips__) +#if MODULE_NEWLIB /* newlib support for fsblkcnt_t was only recently added to the newlib git * repository, commit f3e587d30a9f65d0c6551ad14095300f6e81672e, 15 apr 2016. * Will be included in release 2.5.0, around new year 2016/2017.