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

boards/common/esp: move CPU/CPU_MODEL definiton 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:
Gaëtan Harter 2019-05-02 15:49:35 +02:00
parent 8cebed6792
commit 49d61bbe6e
No known key found for this signature in database
GPG Key ID: 76DF6BCF1B1F883B
6 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -1,5 +1,5 @@
# most board features results directly from ESP32 CPU features CPU = esp32
include $(RIOTCPU)/esp32/Makefile.features CPU_MODEL = esp32
# additional features provided by all boards are GPIOs and at least one UART # additional features provided by all boards are GPIOs and at least one UART
FEATURES_PROVIDED += periph_gpio FEATURES_PROVIDED += periph_gpio

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

@ -1,7 +1,3 @@
# the cpu to build for
export CPU = esp32
export CPU_MODEL = esp32
# configure the serial interface # configure the serial interface
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/esp8266/Makefile.dep
View File

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

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

@ -1,6 +1,5 @@
# MCU defined features that are provided independent on board definitions CPU = esp8266
CPU_MODEL = esp8266
include $(RIOTCPU)/esp8266/Makefile.features
# MCU defined peripheral features provided by all boards in alphabetical order # MCU defined peripheral features provided by all boards in alphabetical order

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

@ -1,7 +1,3 @@
# the cpu to build for
export CPU = esp8266
export CPU_MODEL = esp8266
# configure the serial interface # configure the serial interface
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*)))