RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-17 10:12:45 +01:00
Code Releases Activity

boards/common: move CPU/CPU_MODEL definition to Makefile.features

Browse Source 
cpu/$(CPU)/Makefile.features and cpu/$(CPU)/Makefile.dep are
automatically included

Part of moving CPU/CPU_MODEL definition to Makefile.features to have it
available before Makefile.include.
This commit is contained in:
cladmi 2018-09-22 07:12:36 +02:00 committed by Gaëtan Harter
parent 3e753834e7
commit 8305390a05
No known key found for this signature in database
GPG Key ID: 76DF6BCF1B1F883B
21 changed files with 25 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
boards/common/arduino-due/Makefile.features
View File

@ -1,3 +1,6 @@
CPU = sam3
CPU_MODEL = sam3x8e
# Put defined MCU peripherals here (in alphabetical order) # Put defined MCU peripherals here (in alphabetical order)
FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_adc
FEATURES_PROVIDED += periph_dac FEATURES_PROVIDED += periph_dac
@ -9,5 +12,3 @@ FEATURES_PROVIDED += periph_uart
# Various other features (if any) # Various other features (if any)
FEATURES_PROVIDED += arduino FEATURES_PROVIDED += arduino
include $(RIOTCPU)/sam3/Makefile.features

4
boards/common/arduino-due/Makefile.include
View File

@ -1,7 +1,3 @@
# define the cpu used by the arduino due based boards
export CPU = sam3
export CPU_MODEL = sam3x8e
# export this module and its includes # export this module and its includes
USEMODULE += boards_common_arduino_due USEMODULE += boards_common_arduino_due
INCLUDES += -I$(RIOTBOARD)/common/arduino-due/include INCLUDES += -I$(RIOTBOARD)/common/arduino-due/include

4
boards/common/arduino-mkr/Makefile.features
View File

@ -1,3 +1,7 @@
CPU = samd21
CPU_MODEL = samd21g18a
# Put defined MCU peripherals here (in alphabetical order) # Put defined MCU peripherals here (in alphabetical order)
FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_adc
FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_i2c

4
boards/common/arduino-mkr/Makefile.include
View File

@ -1,7 +1,3 @@
# define the cpu used by Arduino/Genuino MKR1000 board
export CPU = samd21
export CPU_MODEL = samd21g18a
PORT_LINUX ?= /dev/ttyACM0 PORT_LINUX ?= /dev/ttyACM0
PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))

3
boards/common/iotlab/Makefile.features
View File

@ -1,3 +1,6 @@
CPU = stm32f1
CPU_MODEL = stm32f103re
# Put defined MCU peripherals here (in alphabetical order) # Put defined MCU peripherals here (in alphabetical order)
FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_i2c
FEATURES_PROVIDED += periph_rtt FEATURES_PROVIDED += periph_rtt

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

@ -1,7 +1,3 @@
# the cpu to build for
export CPU = stm32f1
export CPU_MODEL = stm32f103re
# define the default port depending on the host OS # define the default port depending on the host OS
PORT_LINUX ?= /dev/ttyUSB1 PORT_LINUX ?= /dev/ttyUSB1
PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbserial*B))) PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbserial*B)))

2
boards/common/kw41z/Makefile.dep
View File

@ -2,5 +2,3 @@ ifneq (,$(filter saul_default,$(USEMODULE)))
USEMODULE += saul_adc USEMODULE += saul_adc
USEMODULE += saul_gpio USEMODULE += saul_gpio
endif endif
include $(RIOTCPU)/kinetis/Makefile.dep

5
boards/common/kw41z/Makefile.features
View File

@ -1,3 +1,6 @@
CPU = kinetis
CPU_MODEL = mkw41z512vht4
# Put defined MCU peripherals here (in alphabetical order) # Put defined MCU peripherals here (in alphabetical order)
FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_adc
FEATURES_PROVIDED += periph_rtc FEATURES_PROVIDED += periph_rtc
@ -7,5 +10,3 @@ FEATURES_PROVIDED += periph_uart
# Put other features for this board (in alphabetical order) # Put other features for this board (in alphabetical order)
FEATURES_PROVIDED += riotboot FEATURES_PROVIDED += riotboot
include $(RIOTCPU)/kinetis/Makefile.features

4
boards/common/kw41z/Makefile.include
View File

@ -1,7 +1,3 @@
# define the cpu used by the board
export CPU = kinetis
export CPU_MODEL = mkw41z512vht4
# include this module into the build # include this module into the build
INCLUDES += -I$(RIOTBOARD)/common/kw41z/include INCLUDES += -I$(RIOTBOARD)/common/kw41z/include

3
boards/common/msb-430/Makefile.features
View File

@ -1 +1,2 @@
include $(RIOTCPU)/msp430fxyz/Makefile.features CPU = msp430fxyz
CPU_MODEL = msp430f1612

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

@ -1,7 +1,3 @@
## the cpu to build for
export CPU = msp430fxyz
export CPU_MODEL = msp430f1612
# set default port depending on operating system # set default port depending on operating system
PORT_LINUX ?= /dev/ttyUSB0 PORT_LINUX ?= /dev/ttyUSB0
PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))

2
boards/common/msba2/Makefile.features
View File

@ -1 +1 @@
include $(RIOTCPU)/lpc2387/Makefile.features CPU = lpc2387

3
boards/common/msba2/Makefile.include
View File

@ -1,8 +1,5 @@
BOARDS_COMMON_MSBA2_DIR := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST)))) BOARDS_COMMON_MSBA2_DIR := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST))))
## the cpu to build for
export CPU = lpc2387
# Compile `lpc2k_pgm` when required # Compile `lpc2k_pgm` when required
# It is still compiling in `boards` as it was the case before introducing the # It is still compiling in `boards` as it was the case before introducing the
# rule to autobuild # rule to autobuild

4
boards/common/nrf51/Makefile.features
View File

@ -1,8 +1,8 @@
CPU = nrf51
# Put defined MCU peripherals here (in alphabetical order) # Put defined MCU peripherals here (in alphabetical order)
FEATURES_PROVIDED += periph_rtt FEATURES_PROVIDED += periph_rtt
FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_timer
# Various other features (if any) # Various other features (if any)
FEATURES_PROVIDED += ble_nimble FEATURES_PROVIDED += ble_nimble
-include $(RIOTCPU)/nrf51/Makefile.features

3
boards/common/nrf51/Makefile.include
View File

@ -1,6 +1,3 @@
# define the used CPU
export CPU = nrf51
# setup serial terminal # setup serial terminal
include $(RIOTMAKE)/tools/serial.inc.mk include $(RIOTMAKE)/tools/serial.inc.mk

3
boards/common/remote/Makefile.features
View File

@ -1 +1,2 @@
include $(RIOTCPU)/cc2538/Makefile.features CPU = cc2538
CPU_MODEL = cc2538sf53

4
boards/common/remote/Makefile.include
View File

@ -1,7 +1,3 @@
# define the cpu used by the RE-mote board
export CPU = cc2538
export CPU_MODEL = cc2538sf53
# define the default flash-tool # define the default flash-tool
export PROGRAMMER ?= cc2538-bsl export PROGRAMMER ?= cc2538-bsl

4
boards/common/saml1x/Makefile.features
View File

@ -1,3 +1,5 @@
CPU = saml1x
# Put defined MCU peripherals here (in alphabetical order) # Put defined MCU peripherals here (in alphabetical order)
FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_adc
FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_i2c
@ -9,5 +11,3 @@ FEATURES_PROVIDED += periph_uart
# Put other features on these boards (in alphabetical order) # Put other features on these boards (in alphabetical order)
FEATURES_PROVIDED += riotboot FEATURES_PROVIDED += riotboot
include $(RIOTCPU)/saml1x/Makefile.features

3
boards/common/saml1x/Makefile.include
View File

@ -1,6 +1,3 @@
# define the cpu used by the saml11 board
export CPU = saml1x
# set edbg device type # set edbg device type
EDBG_DEVICE_TYPE = mchp_cm23 EDBG_DEVICE_TYPE = mchp_cm23

5
boards/common/wsn430/Makefile.features
View File

@ -1,7 +1,8 @@
CPU = msp430fxyz
CPU_MODEL = msp430f1611
# Put defined MCU peripherals here (in alphabetical order) # Put defined MCU peripherals here (in alphabetical order)
FEATURES_PROVIDED += periph_gpio periph_gpio_irq FEATURES_PROVIDED += periph_gpio periph_gpio_irq
FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_timer
FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_spi
FEATURES_PROVIDED += periph_uart FEATURES_PROVIDED += periph_uart
include $(RIOTCPU)/msp430fxyz/Makefile.features

4
boards/common/wsn430/Makefile.include
View File

@ -1,7 +1,3 @@
# select the used CPU
export CPU = msp430fxyz
export CPU_MODEL = msp430f1611
# include this module in the build # include this module in the build
USEMODULE += boards_common_wsn430 USEMODULE += boards_common_wsn430
# use common wsn430 includes # use common wsn430 includes