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

Merge pull request #12092 from cladmi/pr/cpu_model/minor_changes_included

Browse Source 
boards with side-effect: move CPU/CPU_MODEL definition to Makefile.features
This commit is contained in:
benpicco 2019-09-24 18:36:58 +02:00 committed by GitHub
commit 3833e42426
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
29 changed files with 36 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
boards/cc2538dk/Makefile.features
View File

@ -1,3 +1,6 @@
CPU = cc2538
CPU_MODEL ?= cc2538nf53
# 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_i2c FEATURES_PROVIDED += periph_i2c
@ -8,5 +11,3 @@ FEATURES_PROVIDED += periph_adc
# Various other features (if any) # Various other features (if any)
FEATURES_PROVIDED += emulator_renode FEATURES_PROVIDED += emulator_renode
include $(RIOTCPU)/cc2538/Makefile.features

4
boards/cc2538dk/Makefile.include
View File

@ -1,7 +1,3 @@
# Define the cpu used by the CC2538DK board:
export CPU = cc2538
export CPU_MODEL ?= cc2538nf53
# the SmartRF06 Evaluation Board serial numbers all begin with "06EB": # the SmartRF06 Evaluation Board serial numbers all begin with "06EB":
PROGRAMMER_SERIAL ?= 06EB PROGRAMMER_SERIAL ?= 06EB

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*)))

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

@ -1,5 +1,3 @@
include $(RIOTCPU)/nrf52/Makefile.dep
ifneq (,$(filter skald,$(USEMODULE))) ifneq (,$(filter skald,$(USEMODULE)))
USEMODULE += nrfble USEMODULE += nrfble
endif endif

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

@ -1,3 +1,5 @@
CPU = nrf52
# 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
@ -8,5 +10,3 @@ endif
# Various other features (if any) # Various other features (if any)
FEATURES_PROVIDED += ble_nimble FEATURES_PROVIDED += ble_nimble
FEATURES_PROVIDED += radio_nrfble FEATURES_PROVIDED += radio_nrfble
include $(RIOTCPU)/nrf52/Makefile.features

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

@ -1,6 +1,3 @@
# this module contains shared code for all boards using the nrf52 CPU
export CPU = nrf52
# include this module into the build # include this module into the build
INCLUDES += -I$(RIOTBOARD)/common/nrf52/include INCLUDES += -I$(RIOTBOARD)/common/nrf52/include

5
boards/ek-lm4f120xl/Makefile.features
View File

@ -1,8 +1,9 @@
CPU = lm4f120
CPU_MODEL = LM4F120H5QR
# 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_gpio periph_gpio_irq FEATURES_PROVIDED += periph_gpio periph_gpio_irq
FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_spi
FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_timer
FEATURES_PROVIDED += periph_uart FEATURES_PROVIDED += periph_uart
include $(RIOTCPU)/lm4f120/Makefile.features

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

@ -1,7 +1,3 @@
# define the cpu used by the ek-lm4f120xl board
export CPU = lm4f120
export CPU_MODEL = LM4F120H5QR
#define the default port depending on the host OS #define the default port depending on the host OS
PORT_LINUX ?= /dev/ttyACM0 PORT_LINUX ?= /dev/ttyACM0
PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))

1
boards/hifive1/Makefile.dep
View File

@ -1 +0,0 @@
include $(RIOTCPU)/fe310/Makefile.dep

5
boards/hifive1/Makefile.features
View File

@ -1,3 +1,6 @@
CPU = fe310
CPU_MODEL = fe310_g000
# 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_pwm #FEATURES_PROVIDED += periph_pwm
@ -6,5 +9,3 @@ FEATURES_PROVIDED += periph_rtt
#FEATURES_PROVIDED += periph_spi #FEATURES_PROVIDED += periph_spi
FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_timer
FEATURES_PROVIDED += periph_uart FEATURES_PROVIDED += periph_uart
include $(RIOTCPU)/fe310/Makefile.features

4
boards/hifive1/Makefile.include
View File

@ -1,7 +1,3 @@
# define the cpu used by the HiFive1 board
export CPU = fe310
export CPU_MODEL = fe310_g000
# Uses UART0 for stdio input/output (comment out to disable) # Uses UART0 for stdio input/output (comment out to disable)
USEMODULE += stdio_uart USEMODULE += stdio_uart

1
boards/hifive1b/Makefile.dep
View File

@ -1 +0,0 @@
include $(RIOTCPU)/fe310/Makefile.dep

5
boards/hifive1b/Makefile.features
View File

@ -1,3 +1,6 @@
CPU = fe310
CPU_MODEL = fe310_g002
# 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_i2c #FEATURES_PROVIDED += periph_i2c
@ -7,5 +10,3 @@ FEATURES_PROVIDED += periph_rtt
#FEATURES_PROVIDED += periph_spi #FEATURES_PROVIDED += periph_spi
FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_timer
FEATURES_PROVIDED += periph_uart FEATURES_PROVIDED += periph_uart
include $(RIOTCPU)/fe310/Makefile.features

4
boards/hifive1b/Makefile.include
View File

@ -1,7 +1,3 @@
# define the cpu used by the HiFive1 board
export CPU = fe310
export CPU_MODEL = fe310_g002
# Uses UART0 for stdio input/output (comment out to disable) # Uses UART0 for stdio input/output (comment out to disable)
USEMODULE += stdio_uart USEMODULE += stdio_uart

2
boards/mulle/Makefile.dep
View File

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

12
boards/mulle/Makefile.features
View File

@ -1,3 +1,13 @@
CPU = kinetis
### CPU part number (must have a specific linker script for each part)
# Note that MK60DN256ZVLL10 (version 1.x) and MK60DN256VLL10 (version 2.x, no Z)
# only differ in some register locations etc, not in the actual memory layout,
# so it is safe to use the same linker script for both version 1.x and version
# 2.x silicon.
# The linker script needs to know the flash and RAM sizes of the device.
CPU_MODEL ?= mk60dn512vll10
# 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
@ -8,5 +18,3 @@ FEATURES_PROVIDED += periph_rtt
FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_spi
FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_timer
FEATURES_PROVIDED += periph_uart FEATURES_PROVIDED += periph_uart
include $(RIOTCPU)/kinetis/Makefile.features

16
boards/mulle/Makefile.include
View File

@ -1,24 +1,8 @@
# define the cpu used by the Mulle board
export CPU = kinetis
# MULLE_SERIAL is used to select which specific Mulle board we are compiling for. # MULLE_SERIAL is used to select which specific Mulle board we are compiling for.
ifdef MULLE_SERIAL ifdef MULLE_SERIAL
CFLAGS += -DMULLE_SERIAL=$(MULLE_SERIAL) CFLAGS += -DMULLE_SERIAL=$(MULLE_SERIAL)
endif endif
### CPU part number (must have a specific linker script for each part)
# Note that MK60DN256ZVLL10 (version 1.x) and MK60DN256VLL10 (version 2.x, no Z)
# only differ in some register locations etc, not in the actual memory layout,
# so it is safe to use the same linker script for both version 1.x and version
# 2.x silicon.
# The linker script needs to know the flash and RAM sizes of the device.
ifeq ($(CPU_MODEL),)
CPU_MODEL = mk60dn512vll10
endif
export CPU_MODEL
# Default debug adapter choice is to use the Mulle programmer board # Default debug adapter choice is to use the Mulle programmer board
DEBUG_ADAPTER ?= mulle DEBUG_ADAPTER ?= mulle
# Host OS name # Host OS name

4
boards/nrf6310/Makefile.features
View File

@ -1,8 +1,8 @@
CPU_MODEL = nrf51x22xxaa
# Put defined MCU peripherals here (in alphabetical order) # Put defined MCU peripherals here (in alphabetical order)
FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_spi
FEATURES_PROVIDED += periph_uart FEATURES_PROVIDED += periph_uart
# include common nrf51 based boards features # include common nrf51 based boards features
include $(RIOTBOARD)/common/nrf51/Makefile.features include $(RIOTBOARD)/common/nrf51/Makefile.features
include $(RIOTCPU)/nrf51/Makefile.features

3
boards/nrf6310/Makefile.include
View File

@ -1,6 +1,3 @@
# define the used CPU
export CPU_MODEL = nrf51x22xxaa
# 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*)))

5
boards/pic32-clicker/Makefile.features
View File

@ -1,6 +1,7 @@
CPU = mips_pic32mx
CPU_MODEL = p32mx470f512h
# Put defined MCU peripherals here (in alphabetical order) # Put defined MCU peripherals here (in alphabetical order)
FEATURES_PROVIDED += periph_gpio FEATURES_PROVIDED += periph_gpio
FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_timer
FEATURES_PROVIDED += periph_uart FEATURES_PROVIDED += periph_uart
include $(RIOTCPU)/mips_pic32mx/Makefile.features

2
boards/pic32-clicker/Makefile.include
View File

@ -1,5 +1,3 @@
export CPU = mips_pic32mx
export CPU_MODEL=p32mx470f512h
export APPDEPS += $(RIOTCPU)/$(CPU)/$(CPU_MODEL)/$(CPU_MODEL).S export APPDEPS += $(RIOTCPU)/$(CPU)/$(CPU_MODEL)/$(CPU_MODEL).S
export USE_UHI_SYSCALLS = 1 export USE_UHI_SYSCALLS = 1

5
boards/pic32-wifire/Makefile.features
View File

@ -1,6 +1,7 @@
CPU = mips_pic32mz
CPU_MODEL = p32mz2048efg100
# Put defined MCU peripherals here (in alphabetical order) # Put defined MCU peripherals here (in alphabetical order)
FEATURES_PROVIDED += periph_gpio FEATURES_PROVIDED += periph_gpio
FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_timer
FEATURES_PROVIDED += periph_uart FEATURES_PROVIDED += periph_uart
include $(RIOTCPU)/mips_pic32mz/Makefile.features

2
boards/pic32-wifire/Makefile.include
View File

@ -1,5 +1,3 @@
export CPU = mips_pic32mz
export CPU_MODEL=p32mz2048efg100
export APPDEPS += $(RIOTCPU)/$(CPU)/$(CPU_MODEL)/$(CPU_MODEL).S export APPDEPS += $(RIOTCPU)/$(CPU)/$(CPU_MODEL)/$(CPU_MODEL).S
export USE_UHI_SYSCALLS = 1 export USE_UHI_SYSCALLS = 1

1
cpu/esp32/Makefile.include
View File

@ -63,7 +63,6 @@ PSEUDOMODULES += esp_spi_ram
PSEUDOMODULES += esp_spiffs PSEUDOMODULES += esp_spiffs
PSEUDOMODULES += esp_wifi_any PSEUDOMODULES += esp_wifi_any
export CPU ?= esp32
export TARGET_ARCH ?= xtensa-esp32-elf export TARGET_ARCH ?= xtensa-esp32-elf
export ESPTOOL ?= $(ESP32_SDK_DIR)/components/esptool_py/esptool/esptool.py export ESPTOOL ?= $(ESP32_SDK_DIR)/components/esptool_py/esptool/esptool.py