riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Makefiles: move to new directory /makefiles

Browse Source
This commit is contained in:
Joakim Nohlgård 2016-01-27 10:47:12 +01:00
parent dab3de5ea7
commit 339a4da9dc
91 changed files with 131 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -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.inc.mk

41
Makefile.include
View File

@ -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.inc.mk
# Static code analysis tools provided by LLVM
include $(RIOTBASE)/Makefile.scan-build
include $(RIOTMAKE)/scan-build.inc.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.inc.mk
include $(RIOTMAKE)/defaultmodules.inc.mk
include $(RIOTBOARD)/$(BOARD)/Makefile.include
include $(RIOTCPU)/$(CPU)/Makefile.include
# Import all toolchain settings
include $(RIOTCPU)/Makefile.include.$(TOOLCHAIN)
include $(RIOTMAKE)/toolchain/$(TOOLCHAIN).inc.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.inc.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.inc.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.inc.mk
# process provided features
include $(RIOTBASE)/Makefile.features
include $(RIOTMAKE)/features.inc.mk
# Export variables used throughout the whole make system:
include $(RIOTBASE)/Makefile.vars
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)))
@ -517,10 +532,10 @@ endif
include $(RIOTBASE)/dist/tools/desvirt/Makefile.desvirt
# include bindist target
include $(RIOTBASE)/Makefile.bindist
include $(RIOTMAKE)/bindist.inc.mk
# Add all USEMODULE modules to CFLAGS
include $(RIOTBASE)/Makefile.modules
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

4
boards/airfy-beacon/Makefile.include
View File

@ -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.inc.mk
# this board uses openocd
include $(RIOTBOARD)/Makefile.include.openocd
include $(RIOTMAKE)/tools/openocd.inc.mk

2
boards/arduino-due/Makefile.include
View File

@ -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.inc.mk

4
boards/arduino-zero/Makefile.include
View File

@ -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.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 $(RIOTBOARD)/Makefile.include.openocd
include $(RIOTMAKE)/tools/openocd.inc.mk

4
boards/calliope-mini/Makefile.include
View File

@ -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.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 $(RIOTBOARD)/Makefile.include.jlink
include $(RIOTMAKE)/tools/jlink.inc.mk
else
$(info ERROR: invalid flash tool specified)
endif

2
boards/cc2538dk/Makefile.include
View File

@ -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.inc.mk
# debugger config
export DEBUGGER = $(RIOTBOARD)/$(BOARD)/dist/debug.sh

2
boards/cc2650stk/Makefile.include
View File

@ -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.inc.mk
# configure the flash tool
export UNIFLASH_PATH ?= "UNIFLASH_PATH unconfigured"

4
boards/ek-lm4f120xl/Makefile.include
View File

@ -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.inc.mk
# this board uses openocd
include $(RIOTBOARD)/Makefile.include.openocd
include $(RIOTMAKE)/tools/openocd.inc.mk

2
boards/f4vi1/Makefile.include
View File

@ -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.inc.mk
# st-flash
export FLASHER = st-flash

6
boards/fox/Makefile.include
View File

@ -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.inc.mk
# this board uses openocd
include $(RIOTBOARD)/Makefile.include.openocd
include $(RIOTMAKE)/tools/openocd.inc.mk

4
boards/frdm-k64f/Makefile.include
View File

@ -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.inc.mk
# this board uses openocd
include $(RIOTBOARD)/Makefile.include.openocd
include $(RIOTMAKE)/tools/openocd.inc.mk

4
boards/iotlab-common/Makefile.include
View File

@ -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.inc.mk
# this board uses openocd
include $(RIOTBOARD)/Makefile.include.openocd
include $(RIOTMAKE)/tools/openocd.inc.mk
# add the common header files to the include path
INCLUDES += -I$(RIOTBOARD)/iotlab-common/include

4
boards/limifrog-v1/Makefile.include
View File

@ -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.inc.mk
# this board uses openocd
include $(RIOTBOARD)/Makefile.include.openocd
include $(RIOTMAKE)/tools/openocd.inc.mk

4
boards/maple-mini/Makefile.include
View File

@ -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.inc.mk
# this board uses openocd
include $(RIOTBOARD)/Makefile.include.openocd
include $(RIOTMAKE)/tools/openocd.inc.mk

2
boards/mbed_lpc1768/Makefile.include
View File

@ -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.inc.mk

4
boards/microbit/Makefile.include
View File

@ -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.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 $(RIOTBOARD)/Makefile.include.jlink
include $(RIOTMAKE)/tools/jlink.inc.mk
else
$(info ERROR: invalid flash tool specified)
endif

2
boards/msb-430-common/Makefile.include
View File

@ -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.inc.mk
# setup flash tool
export OFLAGS = -O ihex

4
boards/msbiot/Makefile.include
View File

@ -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.inc.mk
# this board uses openocd
include $(RIOTBOARD)/Makefile.include.openocd
include $(RIOTMAKE)/tools/openocd.inc.mk

4
boards/mulle/Makefile.include
View File

@ -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.inc.mk
# setup serial terminal
include $(RIOTBOARD)/Makefile.include.serial
include $(RIOTMAKE)/tools/serial.inc.mk

4
boards/nrf51dongle/Makefile.include
View File

@ -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.inc.mk
# setup serial terminal
include $(RIOTBOARD)/Makefile.include.serial
include $(RIOTMAKE)/tools/serial.inc.mk

4
boards/nrf52dk/Makefile.include
View File

@ -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.inc.mk
# setup serial terminal
include $(RIOTBOARD)/Makefile.include.serial
include $(RIOTMAKE)/tools/serial.inc.mk

2
boards/nrf6310/Makefile.include
View File

@ -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.inc.mk

4
boards/nucleo-common/Makefile.include.serial
View File

@ -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.inc.mk
# this board uses openocd
include $(RIOTBOARD)/Makefile.include.openocd
include $(RIOTMAKE)/tools/openocd.inc.mk

2
boards/opencm904/Makefile.include
View File

@ -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.inc.mk

4
boards/openmote-cc2538/Makefile.include
View File

@ -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.inc.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.inc.mk

4
boards/pba-d-01-kw2x/Makefile.include
View File

@ -40,7 +40,7 @@ ifneq (,$(SERIAL))
endif
# setup serial terminal
include $(RIOTBOARD)/Makefile.include.serial
include $(RIOTMAKE)/tools/serial.inc.mk
# this board uses openocd
include $(RIOTBOARD)/Makefile.include.openocd
include $(RIOTMAKE)/tools/openocd.inc.mk

4
boards/pca10000/Makefile.include
View File

@ -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.inc.mk
# setup serial terminal
include $(RIOTBOARD)/Makefile.include.serial
include $(RIOTMAKE)/tools/serial.inc.mk

4
boards/pca10005/Makefile.include
View File

@ -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.inc.mk
# setup serial terminal
include $(RIOTBOARD)/Makefile.include.serial
include $(RIOTMAKE)/tools/serial.inc.mk

2
boards/remote-common/Makefile.include
View File

@ -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.inc.mk

4
boards/saml21-xpro/Makefile.include
View File

@ -5,7 +5,7 @@ export CFLAGS += -D__SAML21J18A__
# setup serial terminal
PORT_LINUX ?= /dev/ttyACM0
include $(RIOTBOARD)/Makefile.include.serial
include $(RIOTMAKE)/tools/serial.inc.mk
# this board uses openocd
include $(RIOTBOARD)/Makefile.include.openocd
include $(RIOTMAKE)/tools/openocd.inc.mk

4
boards/samr21-xpro/Makefile.include
View File

@ -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.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 $(RIOTBOARD)/Makefile.include.openocd
include $(RIOTMAKE)/tools/openocd.inc.mk

4
boards/seeeduino_arch-pro/Makefile.include
View File

@ -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.inc.mk
# this board uses openocd
include $(RIOTBOARD)/Makefile.include.openocd
include $(RIOTMAKE)/tools/openocd.inc.mk
# generate image checksum from hex file
export PRE_FLASH_CHECK_SCRIPT = lpc_checksum --format hex

4
boards/slwstk6220a/Makefile.include
View File

@ -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.inc.mk
# setup serial terminal
include $(RIOTBOARD)/Makefile.include.serial
include $(RIOTMAKE)/tools/serial.inc.mk

4
boards/sodaq-autonomo/Makefile.include
View File

@ -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.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 $(RIOTBOARD)/Makefile.include.openocd
include $(RIOTMAKE)/tools/openocd.inc.mk

4
boards/spark-core/Makefile.include
View File

@ -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.inc.mk
# this board uses openocd
include $(RIOTBOARD)/Makefile.include.openocd
include $(RIOTMAKE)/tools/openocd.inc.mk

4
boards/stm32f0discovery/Makefile.include
View File

@ -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.inc.mk
# this board uses openocd
include $(RIOTBOARD)/Makefile.include.openocd
include $(RIOTMAKE)/tools/openocd.inc.mk

4
boards/stm32f3discovery/Makefile.include
View File

@ -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.inc.mk
# this board uses openocd
include $(RIOTBOARD)/Makefile.include.openocd
include $(RIOTMAKE)/tools/openocd.inc.mk

4
boards/stm32f4discovery/Makefile.include
View File

@ -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.inc.mk
# this board uses openocd
include $(RIOTBOARD)/Makefile.include.openocd
include $(RIOTMAKE)/tools/openocd.inc.mk

2
boards/telosb/Makefile.include
View File

@ -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.inc.mk
# flash tool configuration
export OFLAGS = -O ihex

2
boards/udoo/Makefile.include
View File

@ -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.inc.mk

2
boards/weio/Makefile.include
View File

@ -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.inc.mk

2
boards/wsn430-common/Makefile.include
View File

@ -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.inc.mk
# setup flash tool
export OFLAGS = -O ihex

4
boards/yunjia-nrf51822/Makefile.include
View File

@ -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.inc.mk
# this board uses openocd
include $(RIOTBOARD)/Makefile.include.openocd
include $(RIOTMAKE)/tools/openocd.inc.mk

2
boards/z1/Makefile.include
View File

@ -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.inc.mk
# setup flash tool
export OFLAGS = -O ihex

2
cpu/cc2538/Makefile.include
View File

@ -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.inc.mk

2
cpu/cc26x0/Makefile.include
View File

@ -1,3 +1,3 @@
export CPU_ARCH := cortex-m3
include $(RIOTCPU)/Makefile.include.cortexm_common
include $(RIOTMAKE)/arch/cortexm.inc.mk

2
cpu/ezr32wg/Makefile.include
View File

@ -1,3 +1,3 @@
export CPU_ARCH = cortex-m4f
include $(RIOTCPU)/Makefile.include.cortexm_common
include $(RIOTMAKE)/arch/cortexm.inc.mk

2
cpu/k60/Makefile.include
View File

@ -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.inc.mk

2
cpu/k64f/Makefile.include
View File

@ -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.inc.mk

2
cpu/kw2x/Makefile.include
View File

@ -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.inc.mk

2
cpu/lm4f120/Makefile.include
View File

@ -1,4 +1,4 @@
export CPU_ARCH = cortex-m4f
include $(RIOTCPU)/Makefile.include.cortexm_common
include $(RIOTMAKE)/arch/cortexm.inc.mk
include $(RIOTCPU)/stellaris_common/Makefile

2
cpu/lpc11u34/Makefile.include
View File

@ -1,3 +1,3 @@
export CPU_ARCH = cortex-m0
include $(RIOTCPU)/Makefile.include.cortexm_common
include $(RIOTMAKE)/arch/cortexm.inc.mk

2
cpu/lpc1768/Makefile.include
View File

@ -1,3 +1,3 @@
export CPU_ARCH = cortex-m3
include $(RIOTCPU)/Makefile.include.cortexm_common
include $(RIOTMAKE)/arch/cortexm.inc.mk

2
cpu/mips32r2_common/Makefile.include
View File

@ -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

2
cpu/mips_pic32mx/Makefile.include
View File

@ -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

2
cpu/mips_pic32mz/Makefile.include
View File

@ -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

2
cpu/msp430_common/Makefile.include
View File

@ -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.inc.mk

2
cpu/nrf51/Makefile.include
View File

@ -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.inc.mk

2
cpu/nrf52/Makefile.include
View File

@ -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.inc.mk

2
cpu/sam3/Makefile.include
View File

@ -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.inc.mk

2
cpu/samd21/Makefile.include
View File

@ -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.inc.mk

2
cpu/saml21/Makefile.include
View File

@ -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.inc.mk

2
cpu/stm32f0/Makefile.include
View File

@ -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.inc.mk

2
cpu/stm32f1/Makefile.include
View File

@ -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.inc.mk

2
cpu/stm32f2/Makefile.include
View File

@ -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.inc.mk

2
cpu/stm32f3/Makefile.include
View File

@ -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.inc.mk

3
cpu/stm32f4/Makefile.include
View File

@ -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.inc.mk

2
cpu/stm32l0/Makefile.include
View File

@ -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.inc.mk

2
cpu/stm32l1/Makefile.include
View File

@ -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.inc.mk

2
cpu/stm32l4/Makefile.include
View File

@ -2,4 +2,4 @@ export CPU_ARCH = cortex-m4f
export CPU_FAM = stm32l4
include $(RIOTCPU)/stm32_common/Makefile.include
include $(RIOTCPU)/Makefile.include.cortexm_common
include $(RIOTMAKE)/arch/cortexm.inc.mk

0
Makefile.application → makefiles/application.inc.mk
View File

0
cpu/Makefile.include.cortexm_common → makefiles/arch/cortexm.inc.mk
View File

0
cpu/Makefile.include.mips_common → makefiles/arch/mips.inc.mk
View File

3
cpu/Makefile.include.msp430_common → makefiles/arch/msp430.inc.mk
View File

@ -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

0
Makefile.bindist → makefiles/bindist.inc.mk
View File

0
Makefile.buildtests → makefiles/buildtests.inc.mk
View File

0
Makefile.cflags → makefiles/cflags.inc.mk
View File

0
Makefile.defaultmodules → makefiles/defaultmodules.inc.mk
View File

2
Makefile.docker → makefiles/docker.inc.mk
View File

@ -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)' \

0
Makefile.features → makefiles/features.inc.mk
View File

0
Makefile.modules → makefiles/modules.inc.mk
View File

0
Makefile.pseudomodules → makefiles/pseudomodules.inc.mk
View File

0
Makefile.scan-build → makefiles/scan-build.inc.mk
View File

0
Makefile.tests → makefiles/tests.inc.mk
View File

0
cpu/Makefile.include.gnu → makefiles/toolchain/gnu.inc.mk
View File

0
cpu/Makefile.include.llvm → makefiles/toolchain/llvm.inc.mk
View File

0
boards/Makefile.include.jlink → makefiles/tools/jlink.inc.mk
View File

0
boards/Makefile.include.openocd → makefiles/tools/openocd.inc.mk
View File

0
boards/Makefile.include.serial → makefiles/tools/serial.inc.mk
View File

1
Makefile.vars → makefiles/vars.inc.mk
View File

@ -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