From 17877ca993fc887da521fab77318c12e68ad6a98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Harter?= Date: Mon, 3 Jun 2019 11:08:02 +0200 Subject: [PATCH] boards/ek-lm4f120xl: move CPU/CPU_MODEL definition to Makefile.features cpu/$(CPU)/Makefile.features and cpu/$(CPU)/Makefile.dep are automatically included CPU_MODEL is currently kept uppercase. Making it lowercase is a future task. Part of moving CPU/CPU_MODEL definition to Makefile.features to have it available before Makefile.include. --- boards/ek-lm4f120xl/Makefile.features | 5 +++-- boards/ek-lm4f120xl/Makefile.include | 4 ---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/boards/ek-lm4f120xl/Makefile.features b/boards/ek-lm4f120xl/Makefile.features index 7b3050728c..46e86ac374 100644 --- a/boards/ek-lm4f120xl/Makefile.features +++ b/boards/ek-lm4f120xl/Makefile.features @@ -1,8 +1,9 @@ +CPU = lm4f120 +CPU_MODEL = LM4F120H5QR + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_gpio periph_gpio_irq FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart - -include $(RIOTCPU)/lm4f120/Makefile.features diff --git a/boards/ek-lm4f120xl/Makefile.include b/boards/ek-lm4f120xl/Makefile.include index d29ea94951..f2ca52974b 100644 --- a/boards/ek-lm4f120xl/Makefile.include +++ b/boards/ek-lm4f120xl/Makefile.include @@ -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 PORT_LINUX ?= /dev/ttyACM0 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))