From 33816cbbb340dbec79aaecf04ff6169eaeb22966 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/pic32*: move CPU/CPU_MODEL definition to Makefile.features cpu/$(CPU)/Makefile.features and cpu/$(CPU)/Makefile.dep are automatically included Add the missing space when defining 'CPU_MODEL'. Part of moving CPU/CPU_MODEL definition to Makefile.features to have it available before Makefile.include. --- boards/pic32-clicker/Makefile.features | 5 +++-- boards/pic32-clicker/Makefile.include | 2 -- boards/pic32-wifire/Makefile.features | 5 +++-- boards/pic32-wifire/Makefile.include | 2 -- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/boards/pic32-clicker/Makefile.features b/boards/pic32-clicker/Makefile.features index 328dd02c76..c10c2eb5ba 100644 --- a/boards/pic32-clicker/Makefile.features +++ b/boards/pic32-clicker/Makefile.features @@ -1,6 +1,7 @@ +CPU = mips_pic32mx +CPU_MODEL = p32mx470f512h + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_gpio FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart - -include $(RIOTCPU)/mips_pic32mx/Makefile.features diff --git a/boards/pic32-clicker/Makefile.include b/boards/pic32-clicker/Makefile.include index 6e3898c579..823d462545 100644 --- a/boards/pic32-clicker/Makefile.include +++ b/boards/pic32-clicker/Makefile.include @@ -1,5 +1,3 @@ -export CPU = mips_pic32mx -export CPU_MODEL=p32mx470f512h export APPDEPS += $(RIOTCPU)/$(CPU)/$(CPU_MODEL)/$(CPU_MODEL).S export USE_UHI_SYSCALLS = 1 diff --git a/boards/pic32-wifire/Makefile.features b/boards/pic32-wifire/Makefile.features index 9e83dbd44d..051b80b1dc 100644 --- a/boards/pic32-wifire/Makefile.features +++ b/boards/pic32-wifire/Makefile.features @@ -1,6 +1,7 @@ +CPU = mips_pic32mz +CPU_MODEL = p32mz2048efg100 + # Put defined MCU peripherals here (in alphabetical order) FEATURES_PROVIDED += periph_gpio FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart - -include $(RIOTCPU)/mips_pic32mz/Makefile.features diff --git a/boards/pic32-wifire/Makefile.include b/boards/pic32-wifire/Makefile.include index c07595ef98..823d462545 100644 --- a/boards/pic32-wifire/Makefile.include +++ b/boards/pic32-wifire/Makefile.include @@ -1,5 +1,3 @@ -export CPU = mips_pic32mz -export CPU_MODEL=p32mz2048efg100 export APPDEPS += $(RIOTCPU)/$(CPU)/$(CPU_MODEL)/$(CPU_MODEL).S export USE_UHI_SYSCALLS = 1