From 38e0ce3d54ec880c8eb798904678298e79519b89 Mon Sep 17 00:00:00 2001 From: cladmi Date: Sun, 23 Sep 2018 18:14:32 +0200 Subject: [PATCH 1/4] boards/bluepill/blackpill: always include common Makefile.features The file is there so no reason to have an include if file exists. --- boards/blackpill/Makefile.features | 2 +- boards/bluepill/Makefile.features | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/boards/blackpill/Makefile.features b/boards/blackpill/Makefile.features index ef95df38ad..b8adee88b3 100644 --- a/boards/blackpill/Makefile.features +++ b/boards/blackpill/Makefile.features @@ -1 +1 @@ --include $(RIOTBOARD)/common/stm32f103c8/Makefile.features +include $(RIOTBOARD)/common/stm32f103c8/Makefile.features diff --git a/boards/bluepill/Makefile.features b/boards/bluepill/Makefile.features index ef95df38ad..b8adee88b3 100644 --- a/boards/bluepill/Makefile.features +++ b/boards/bluepill/Makefile.features @@ -1 +1 @@ --include $(RIOTBOARD)/common/stm32f103c8/Makefile.features +include $(RIOTBOARD)/common/stm32f103c8/Makefile.features From 6be662a48bf84e3c5a6b39b2f616764df157c1a5 Mon Sep 17 00:00:00 2001 From: cladmi Date: Sat, 22 Sep 2018 07:23:01 +0200 Subject: [PATCH 2/4] boards/msp30: use common/msb-430/Makefile.features Use the common `msb-430/Makefile.features` instead of duplicating the `cpu` include. --- boards/msb-430/Makefile.features | 2 +- boards/msb-430h/Makefile.features | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/boards/msb-430/Makefile.features b/boards/msb-430/Makefile.features index 98d6e62aa1..94c96d14ef 100644 --- a/boards/msb-430/Makefile.features +++ b/boards/msb-430/Makefile.features @@ -6,4 +6,4 @@ FEATURES_PROVIDED += periph_uart # Various other features (if any) -include $(RIOTCPU)/msp430fxyz/Makefile.features +include $(RIOTBOARD)/common/msb-430/Makefile.features diff --git a/boards/msb-430h/Makefile.features b/boards/msb-430h/Makefile.features index c9c4f0b84a..18d247410c 100644 --- a/boards/msb-430h/Makefile.features +++ b/boards/msb-430h/Makefile.features @@ -4,4 +4,4 @@ FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart -include $(RIOTCPU)/msp430fxyz/Makefile.features +include $(RIOTBOARD)/common/msb-430/Makefile.features From 5b00d3a9424c84d794fd2a214c6c3dce8e226490 Mon Sep 17 00:00:00 2001 From: cladmi Date: Sat, 22 Sep 2018 07:23:01 +0200 Subject: [PATCH 3/4] boards/msba2-based: use common/msba2/Makefile.features Introduce and use a common/msba2/Makefile.features. The boards were already using the common `Makefile.include` and `Makefile.dep`. This makes 'include $(RIOTCPU)/lpc2387/Makefile.features' be done in the same module where 'CPU' is defined. Preparation for moving 'CPU' definition to Makefile.features. --- boards/avsextrem/Makefile.features | 2 +- boards/common/msba2/Makefile.features | 1 + boards/msba2/Makefile.features | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 boards/common/msba2/Makefile.features diff --git a/boards/avsextrem/Makefile.features b/boards/avsextrem/Makefile.features index 1798b8f9bf..9ab9387fa7 100644 --- a/boards/avsextrem/Makefile.features +++ b/boards/avsextrem/Makefile.features @@ -7,4 +7,4 @@ FEATURES_PROVIDED += periph_uart # Various other features (if any) -include $(RIOTCPU)/lpc2387/Makefile.features +include $(RIOTBOARD)/common/msba2/Makefile.features diff --git a/boards/common/msba2/Makefile.features b/boards/common/msba2/Makefile.features new file mode 100644 index 0000000000..c391af5a82 --- /dev/null +++ b/boards/common/msba2/Makefile.features @@ -0,0 +1 @@ +include $(RIOTCPU)/lpc2387/Makefile.features diff --git a/boards/msba2/Makefile.features b/boards/msba2/Makefile.features index 12ebfb47f0..9e71ba6f19 100644 --- a/boards/msba2/Makefile.features +++ b/boards/msba2/Makefile.features @@ -6,4 +6,4 @@ FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart -include $(RIOTCPU)/lpc2387/Makefile.features +include $(RIOTBOARD)/common/msba2/Makefile.features From ec312492ee3857ddd94dc9c6a3421da213f9d478 Mon Sep 17 00:00:00 2001 From: cladmi Date: Sat, 22 Sep 2018 07:23:01 +0200 Subject: [PATCH 4/4] boards/remote: use common/remote/Makefile.features Introduce and use a common/remote/Makefile.features. The boards were already using the common `Makefile.include` and `Makefile.dep`. This makes 'include $(RIOTCPU)/cc2538/Makefile.features' be done in the same module where 'CPU' is defined. Preparation for moving 'CPU' definition to Makefile.features. --- boards/common/remote/Makefile.features | 1 + boards/firefly/Makefile.features | 2 +- boards/remote-pa/Makefile.features | 2 +- boards/remote-reva/Makefile.features | 2 +- boards/remote-revb/Makefile.features | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 boards/common/remote/Makefile.features diff --git a/boards/common/remote/Makefile.features b/boards/common/remote/Makefile.features new file mode 100644 index 0000000000..59a813e43b --- /dev/null +++ b/boards/common/remote/Makefile.features @@ -0,0 +1 @@ +include $(RIOTCPU)/cc2538/Makefile.features diff --git a/boards/firefly/Makefile.features b/boards/firefly/Makefile.features index 438b044dc5..63e966cd82 100644 --- a/boards/firefly/Makefile.features +++ b/boards/firefly/Makefile.features @@ -6,4 +6,4 @@ FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart --include $(RIOTCPU)/cc2538/Makefile.features +include $(RIOTBOARD)/common/remote/Makefile.features diff --git a/boards/remote-pa/Makefile.features b/boards/remote-pa/Makefile.features index 07fde60b04..82d591d7c7 100644 --- a/boards/remote-pa/Makefile.features +++ b/boards/remote-pa/Makefile.features @@ -6,4 +6,4 @@ FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart FEATURES_PROVIDED += periph_adc -include $(RIOTCPU)/cc2538/Makefile.features +include $(RIOTBOARD)/common/remote/Makefile.features diff --git a/boards/remote-reva/Makefile.features b/boards/remote-reva/Makefile.features index 07fde60b04..82d591d7c7 100644 --- a/boards/remote-reva/Makefile.features +++ b/boards/remote-reva/Makefile.features @@ -6,4 +6,4 @@ FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart FEATURES_PROVIDED += periph_adc -include $(RIOTCPU)/cc2538/Makefile.features +include $(RIOTBOARD)/common/remote/Makefile.features diff --git a/boards/remote-revb/Makefile.features b/boards/remote-revb/Makefile.features index 07fde60b04..82d591d7c7 100644 --- a/boards/remote-revb/Makefile.features +++ b/boards/remote-revb/Makefile.features @@ -6,4 +6,4 @@ FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart FEATURES_PROVIDED += periph_adc -include $(RIOTCPU)/cc2538/Makefile.features +include $(RIOTBOARD)/common/remote/Makefile.features