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

boards/common/esp: harmonize CPU/CPU_MODEL to other boards

Browse Source 
* CPU files should already have 'CPU' defined by the board.
* Do not conditionally define CPU as it is not needed.

This is part of cleanup prior to moving the CPU/CPU_MODEL to
Makefile.features.
This commit is contained in:
Gaëtan Harter 2019-05-02 12:17:56 +02:00
parent 97de3e835b
commit 8cebed6792
No known key found for this signature in database
GPG Key ID: 76DF6BCF1B1F883B
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
# the cpu to build for # the cpu to build for
export CPU ?= esp32 export CPU = esp32
export CPU_MODEL ?= esp32 export CPU_MODEL = esp32
# configure the serial interface # configure the serial interface
PORT_LINUX ?= /dev/ttyUSB0 PORT_LINUX ?= /dev/ttyUSB0

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

@ -1,6 +1,6 @@
# the cpu to build for # the cpu to build for
export CPU ?= esp8266 export CPU = esp8266
export CPU_MODEL ?= esp8266 export CPU_MODEL = esp8266
# configure the serial interface # configure the serial interface
PORT_LINUX ?= /dev/ttyUSB0 PORT_LINUX ?= /dev/ttyUSB0

1
cpu/esp32/Makefile.include
View File

@ -59,7 +59,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