Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Makefile.dep
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,10 @@ ifneq (,$(filter gnrc_pktdump,$(USEMODULE)))
USEMODULE += od
endif

ifneq (,$(filter gnrc_slip,$(USEMODULE)))
FEATURES_REQUIRED += periph_uart
endif

ifneq (,$(filter od,$(USEMODULE)))
USEMODULE += fmt
endif
Expand Down
58 changes: 25 additions & 33 deletions Makefile.include
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
# include Makefile.local if it exists
-include Makefile.local

all: link

# set undefined variables
RIOTBASE ?= $(dir $(lastword $(MAKEFILE_LIST)))
CCACHE_BASEDIR ?= $(RIOTBASE)
Expand Down Expand Up @@ -63,37 +61,35 @@ MAKEOVERRIDES += $(foreach v,${__DIRECTORY_VARIABLES},${v}=${${v}})
# Path to the current directory relative to RIOTPROJECT
BUILDRELPATH ?= ${PWD:${RIOTPROJECT}/%=%}/

# get host operating system
OS := $(shell uname)

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

# Static code analysis tools provided by LLVM
include $(RIOTMAKE)/scan-build.inc.mk
# include color echo macros
include $(RIOTMAKE)/color.inc.mk

export RIOTBUILD_CONFIG_HEADER_C = $(BINDIR)/riotbuild/riotbuild.h
GLOBAL_GOALS := buildtest info-boards-supported info-boards-features-missing info-buildsizes info-buildsizes-diff
ifneq (, $(filter $(GLOBAL_GOALS), $(MAKECMDGOALS)))
BOARD=none
endif

COLOR_GREEN :=
COLOR_RED :=
COLOR_PURPLE :=
COLOR_RESET :=
COLOR_ECHO := /bin/echo
ifeq (none,$(BOARD))
include $(RIOTMAKE)/info-global.inc.mk
include $(RIOTMAKE)/buildtests.inc.mk
else

OS := $(shell uname)
all: link

ifeq (0, $(shell tput colors 2>&1 > /dev/null; echo $$?))
COLOR_GREEN := \033[1;32m
COLOR_RED := \033[1;31m
COLOR_YELLOW := \033[1;33m
COLOR_PURPLE := \033[1;35m
COLOR_RESET := \033[0m
ifeq ($(OS),Darwin)
COLOR_ECHO := echo -e
SHELL=bash
else
COLOR_ECHO := /bin/echo -e
endif
endif
include $(RIOTMAKE)/info.inc.mk

# Static code analysis tools provided by LLVM
include $(RIOTMAKE)/scan-build.inc.mk

export RIOTBUILD_CONFIG_HEADER_C = $(BINDIR)/riotbuild/riotbuild.h

ifeq ($(OS),Darwin)
OPEN := open
Expand Down Expand Up @@ -224,6 +220,10 @@ ifneq ($(GNRC_NETIF_NUMOF),1)
CFLAGS += -DGNRC_NETIF_NUMOF=$(GNRC_NETIF_NUMOF)
endif

# process provided features
include $(RIOTMAKE)/features.inc.mk

# process dependencies
include $(RIOTBASE)/Makefile.dep

USEMODULE += $(filter-out $(DISABLE_MODULE), $(DEFAULT_MODULE))
Expand Down Expand Up @@ -433,12 +433,6 @@ $(CURDIR)/eclipsesym.xml:
$(Q)printf "%s\n" $(CC) $(CFLAGS_WITH_MACROS) $(INCLUDES) | \
$(RIOTBASE)/dist/tools/eclipsesym/cmdline2xml.sh > $@

# Extra make goals for testing and comparing changes.
include $(RIOTMAKE)/buildtests.inc.mk

# process provided features
include $(RIOTMAKE)/features.inc.mk

# Export variables used throughout the whole make system:
include $(RIOTMAKE)/vars.inc.mk

Expand Down Expand Up @@ -535,9 +529,6 @@ endif
help:
@$(MAKE) -qp | sed -ne 's/\(^[a-z][a-z_-]*\):.*/\1/p' | sort | uniq

info-modules:
@for i in $(sort $(USEMODULE)); do echo $$i; done

ifneq (,$(filter iotlab-m3 wsn430-v1_3b wsn430-v1_4,$(BOARD)))
ifneq (,$(filter iotlab-%,$(MAKECMDGOALS)))
include $(RIOTBASE)/dist/testbed-support/Makefile.iotlab
Expand Down Expand Up @@ -575,3 +566,4 @@ CFLAGS += -include '$(RIOTBUILD_CONFIG_HEADER_C)'

# include multislot support
include $(RIOTMAKE)/multislot.mk
endif # BOARD=none
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The indentation above seems off (not related to this PR though)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, it is. But I didn't want to indent the whole file (or most of it), so I intentionally didn't indent the "BOARD!=none" case.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

2 changes: 2 additions & 0 deletions boards/airfy-beacon/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@ FEATURES_PROVIDED += radio_nrfmin

# The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m0_2

-include $(RIOTCPU)/nrf51/Makefile.features
2 changes: 2 additions & 0 deletions boards/arduino-due/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ FEATURES_PROVIDED += arduino

# The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m3_1

-include $(RIOTCPU)/sam3/Makefile.features
2 changes: 2 additions & 0 deletions boards/arduino-duemilanove/Makefile.features
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
include $(RIOTBOARD)/arduino-atmega-common/Makefile.features

-include $(RIOTCPU)/atmega328p/Makefile.features
2 changes: 2 additions & 0 deletions boards/arduino-mega2560/Makefile.features
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
include $(RIOTBOARD)/arduino-atmega-common/Makefile.features

-include $(RIOTCPU)/atmega2560/Makefile.features
2 changes: 2 additions & 0 deletions boards/arduino-mkr1000/Makefile.features
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
include $(RIOTBOARD)/arduino-mkr-common/Makefile.features

-include $(RIOTCPU)/samd21/Makefile.features
2 changes: 2 additions & 0 deletions boards/arduino-mkrzero/Makefile.features
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
include $(RIOTBOARD)/arduino-mkr-common/Makefile.features

-include $(RIOTCPU)/samd21/Makefile.features
2 changes: 2 additions & 0 deletions boards/arduino-uno/Makefile.features
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
include $(RIOTBOARD)/arduino-atmega-common/Makefile.features

-include $(RIOTCPU)/atmega328p/Makefile.features
2 changes: 2 additions & 0 deletions boards/arduino-zero/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ FEATURES_PROVIDED += arduino

# The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m0_2

-include $(RIOTCPU)/samd21/Makefile.features
2 changes: 2 additions & 0 deletions boards/avsextrem/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@ FEATURES_PROVIDED += periph_uart

# The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = arm7

-include $(RIOTCPU)/lpc2387/Makefile.features
2 changes: 2 additions & 0 deletions boards/b-l072z-lrwan1/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ FEATURES_PROVIDED += cpp

# The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m0_1

-include $(RIOTCPU)/stm32l0/Makefile.features
2 changes: 2 additions & 0 deletions boards/calliope-mini/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ FEATURES_PROVIDED += radio_nrfmin

# The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m0_1

-include $(RIOTCPU)/nrf51/Makefile.features
2 changes: 2 additions & 0 deletions boards/cc2538dk/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ FEATURES_PROVIDED += cpp

# The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m3_1

-include $(RIOTCPU)/cc2538/Makefile.features
2 changes: 2 additions & 0 deletions boards/cc2650stk/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@ FEATURES_PROVIDED += cpp

# The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m3_1

-include $(RIOTCPU)/cc26x0/Makefile.features
2 changes: 2 additions & 0 deletions boards/chronos/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ FEATURES_PROVIDED += periph_rtc

# The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = msp430

-include $(RIOTCPU)/cc430/Makefile.features
2 changes: 2 additions & 0 deletions boards/ek-lm4f120xl/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ FEATURES_PROVIDED += cpp

# The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m4_1

-include $(RIOTCPU)/lm4f120/Makefile.features
2 changes: 2 additions & 0 deletions boards/f4vi1/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,5 @@ FEATURES_PROVIDED += cpp

# The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m4_1

-include $(RIOTCPU)/stm32f4/Makefile.features
2 changes: 2 additions & 0 deletions boards/fox/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ FEATURES_PROVIDED += cpp

# The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m3_1

-include $(RIOTCPU)/stm32f1/Makefile.features
2 changes: 2 additions & 0 deletions boards/frdm-k22f/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@ FEATURES_PROVIDED += cpp

# The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m4_1

-include $(RIOTCPU)/k22f/Makefile.features
2 changes: 2 additions & 0 deletions boards/frdm-k64f/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@ FEATURES_PROVIDED += cpp

# The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m4_1

-include $(RIOTCPU)/k64f/Makefile.features
2 changes: 2 additions & 0 deletions boards/iotlab-a8-m3/Makefile.features
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
include $(RIOTBOARD)/iotlab-common/Makefile.features

-include $(RIOTCPU)/stm32f1/Makefile.features
2 changes: 2 additions & 0 deletions boards/iotlab-m3/Makefile.features
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
include $(RIOTBOARD)/iotlab-common/Makefile.features

-include $(RIOTCPU)/stm32f1/Makefile.features
2 changes: 2 additions & 0 deletions boards/limifrog-v1/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ FEATURES_PROVIDED += cpp

# The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m3_2

-include $(RIOTCPU)/stm32l1/Makefile.features
2 changes: 2 additions & 0 deletions boards/maple-mini/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ FEATURES_PROVIDED += cpp

# The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m3_1

-include $(RIOTCPU)/stm32f1/Makefile.features
2 changes: 2 additions & 0 deletions boards/mbed_lpc1768/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ FEATURES_PROVIDED += cpp

# The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m3_1

-include $(RIOTCPU)/lpc1768/Makefile.features
2 changes: 2 additions & 0 deletions boards/microbit/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ FEATURES_PROVIDED += radio_nrfmin

# The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m0_1

-include $(RIOTCPU)/nrf51/Makefile.features
2 changes: 2 additions & 0 deletions boards/mips-malta/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,5 @@ FEATURES_PROVIDED += cpp

# The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = mips32r2

-include $(RIOTCPU)/mips32r2_common/Makefile.features
2 changes: 2 additions & 0 deletions boards/msb-430/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@ FEATURES_PROVIDED += periph_uart

# The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = msp430

-include $(RIOTCPU)/msp430fxyz/Makefile.features
2 changes: 2 additions & 0 deletions boards/msb-430h/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ FEATURES_PROVIDED += config

# The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = msp430

-include $(RIOTCPU)/msp430fxyz/Makefile.features
2 changes: 2 additions & 0 deletions boards/msba2/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@ FEATURES_PROVIDED += config

# The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = arm7

-include $(RIOTCPU)/lpc2387/Makefile.features
2 changes: 2 additions & 0 deletions boards/msbiot/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ FEATURES_PROVIDED += cpp

# The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m4_1

-include $(RIOTCPU)/stm32f4/Makefile.features
2 changes: 2 additions & 0 deletions boards/mulle/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,5 @@ FEATURES_PROVIDED += cpp

# The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m4_2

-include $(RIOTCPU)/k60/Makefile.features
2 changes: 2 additions & 0 deletions boards/native/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ FEATURES_PROVIDED += ethernet

# The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = x86

-include $(RIOTCPU)/native/Makefile.features
2 changes: 2 additions & 0 deletions boards/nrf51dongle/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ FEATURES_PROVIDED += radio_nrfmin

# The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m0_1

-include $(RIOTCPU)/nrf51/Makefile.features
2 changes: 2 additions & 0 deletions boards/nrf52840dk/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ FEATURES_PROVIDED += radio_nrfmin

# The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m4_3

-include $(RIOTCPU)/nrf52/Makefile.features
2 changes: 2 additions & 0 deletions boards/nrf52dk/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ FEATURES_PROVIDED += radio_nrfmin

# The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m4_3

-include $(RIOTCPU)/nrf52/Makefile.features
2 changes: 2 additions & 0 deletions boards/nrf6310/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ FEATURES_PROVIDED += radio_nrfmin

# The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m0_2

-include $(RIOTCPU)/nrf51/Makefile.features
2 changes: 2 additions & 0 deletions boards/nucleo-f030/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ include $(RIOTBOARD)/nucleo-common/Makefile.features

# The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m0_1

-include $(RIOTCPU)/stm32f0/Makefile.features
2 changes: 2 additions & 0 deletions boards/nucleo-f070/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ include $(RIOTBOARD)/nucleo-common/Makefile.features

# The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m0_1

-include $(RIOTCPU)/stm32f0/Makefile.features
2 changes: 2 additions & 0 deletions boards/nucleo-f072/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ include $(RIOTBOARD)/nucleo-common/Makefile.features

# The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m0_1

-include $(RIOTCPU)/stm32f0/Makefile.features
2 changes: 2 additions & 0 deletions boards/nucleo-f091/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ include $(RIOTBOARD)/nucleo-common/Makefile.features

# The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m0_1

-include $(RIOTCPU)/stm32f0/Makefile.features
2 changes: 2 additions & 0 deletions boards/nucleo-f103/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@ include $(RIOTBOARD)/nucleo-common/Makefile.features

# The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m3_1

-include $(RIOTCPU)/stm32f1/Makefile.features
2 changes: 2 additions & 0 deletions boards/nucleo-f302/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ include $(RIOTBOARD)/nucleo-common/Makefile.features

# The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m4_2

-include $(RIOTCPU)/stm32f3/Makefile.features
2 changes: 2 additions & 0 deletions boards/nucleo-f303/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ include $(RIOTBOARD)/nucleo-common/Makefile.features

# The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m4_2

-include $(RIOTCPU)/stm32f3/Makefile.features
2 changes: 2 additions & 0 deletions boards/nucleo-f334/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@ include $(RIOTBOARD)/nucleo-common/Makefile.features

# The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m4_2

-include $(RIOTCPU)/stm32f3/Makefile.features
2 changes: 2 additions & 0 deletions boards/nucleo-f401/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ include $(RIOTBOARD)/nucleo-common/Makefile.features

# The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m4_3

-include $(RIOTCPU)/stm32f4/Makefile.features
2 changes: 2 additions & 0 deletions boards/nucleo-f410/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ FEATURES_PROVIDED += cpp

# The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m4_3

-include $(RIOTCPU)/stm32f4/Makefile.features
2 changes: 2 additions & 0 deletions boards/nucleo-f411/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ FEATURES_PROVIDED += cpp

# The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m4_3

-include $(RIOTCPU)/stm32f4/Makefile.features
2 changes: 2 additions & 0 deletions boards/nucleo-f446/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ include $(RIOTBOARD)/nucleo-common/Makefile.features

# The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m4_3

-include $(RIOTCPU)/stm32f4/Makefile.features
2 changes: 2 additions & 0 deletions boards/nucleo-l053/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ include $(RIOTBOARD)/nucleo-common/Makefile.features

# The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m0_1

-include $(RIOTCPU)/stm32l0/Makefile.features
Loading