From 3ec8126c840583371aaa6dc60d3d76f8b6619347 Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Mon, 6 Nov 2017 10:35:30 +0100 Subject: [PATCH] cpu: cortexm: provide periph_pm for all cortexm --- cpu/cc2538/Makefile.features | 1 - cpu/cc26x0/Makefile.features | 1 - cpu/cortexm_common/Makefile.features | 1 + cpu/cortexm_common/Makefile.include | 2 -- cpu/cortexm_common/periph/Makefile | 2 +- cpu/kinetis_common/Makefile.features | 1 - cpu/nrf5x_common/Makefile.features | 1 - cpu/samd21/Makefile.features | 2 -- cpu/saml21/Makefile.features | 2 -- cpu/stm32f1/Makefile.features | 1 - cpu/stm32f2/Makefile.features | 1 - cpu/stm32f4/Makefile.features | 1 - makefiles/arch/cortexm.inc.mk | 2 ++ 13 files changed, 4 insertions(+), 14 deletions(-) diff --git a/cpu/cc2538/Makefile.features b/cpu/cc2538/Makefile.features index 631d9c5b4a..894817aedb 100644 --- a/cpu/cc2538/Makefile.features +++ b/cpu/cc2538/Makefile.features @@ -1,5 +1,4 @@ FEATURES_PROVIDED += periph_cpuid FEATURES_PROVIDED += periph_hwrng -FEATURES_PROVIDED += periph_pm -include $(RIOTCPU)/cortexm_common/Makefile.features diff --git a/cpu/cc26x0/Makefile.features b/cpu/cc26x0/Makefile.features index 01cd4811b7..c7af1adde5 100644 --- a/cpu/cc26x0/Makefile.features +++ b/cpu/cc26x0/Makefile.features @@ -1,4 +1,3 @@ FEATURES_PROVIDED += periph_cpuid -FEATURES_PROVIDED += periph_pm -include $(RIOTCPU)/cortexm_common/Makefile.features diff --git a/cpu/cortexm_common/Makefile.features b/cpu/cortexm_common/Makefile.features index 990fa817be..7fd73728ca 100644 --- a/cpu/cortexm_common/Makefile.features +++ b/cpu/cortexm_common/Makefile.features @@ -1 +1,2 @@ +FEATURES_PROVIDED += periph_pm FEATURES_PROVIDED += cpp diff --git a/cpu/cortexm_common/Makefile.include b/cpu/cortexm_common/Makefile.include index 90e6e9d33f..ee70e1b686 100644 --- a/cpu/cortexm_common/Makefile.include +++ b/cpu/cortexm_common/Makefile.include @@ -2,6 +2,4 @@ INCLUDES += -I$(RIOTCPU)/cortexm_common/include INCLUDES += -I$(RIOTCPU)/cortexm_common/include/vendor -USEMODULE += cortexm_common_periph - export IMAGE_HDR_SIZE ?= 512 diff --git a/cpu/cortexm_common/periph/Makefile b/cpu/cortexm_common/periph/Makefile index 06eb230776..7e029e1e43 100644 --- a/cpu/cortexm_common/periph/Makefile +++ b/cpu/cortexm_common/periph/Makefile @@ -1,2 +1,2 @@ MODULE = cortexm_common_periph -include $(RIOTBASE)/Makefile.base +include $(RIOTBASE)/makefiles/periph.mk diff --git a/cpu/kinetis_common/Makefile.features b/cpu/kinetis_common/Makefile.features index 631d9c5b4a..894817aedb 100644 --- a/cpu/kinetis_common/Makefile.features +++ b/cpu/kinetis_common/Makefile.features @@ -1,5 +1,4 @@ FEATURES_PROVIDED += periph_cpuid FEATURES_PROVIDED += periph_hwrng -FEATURES_PROVIDED += periph_pm -include $(RIOTCPU)/cortexm_common/Makefile.features diff --git a/cpu/nrf5x_common/Makefile.features b/cpu/nrf5x_common/Makefile.features index 86552c14ec..a8f68ad748 100644 --- a/cpu/nrf5x_common/Makefile.features +++ b/cpu/nrf5x_common/Makefile.features @@ -1,6 +1,5 @@ FEATURES_PROVIDED += periph_cpuid FEATURES_PROVIDED += periph_flashpage FEATURES_PROVIDED += periph_hwrng -FEATURES_PROVIDED += periph_pm -include $(RIOTCPU)/cortexm_common/Makefile.features diff --git a/cpu/samd21/Makefile.features b/cpu/samd21/Makefile.features index dc380093cd..96e6fcceee 100644 --- a/cpu/samd21/Makefile.features +++ b/cpu/samd21/Makefile.features @@ -1,3 +1 @@ -FEATURES_PROVIDED += periph_pm - -include $(RIOTCPU)/sam0_common/Makefile.features diff --git a/cpu/saml21/Makefile.features b/cpu/saml21/Makefile.features index dc380093cd..96e6fcceee 100644 --- a/cpu/saml21/Makefile.features +++ b/cpu/saml21/Makefile.features @@ -1,3 +1 @@ -FEATURES_PROVIDED += periph_pm - -include $(RIOTCPU)/sam0_common/Makefile.features diff --git a/cpu/stm32f1/Makefile.features b/cpu/stm32f1/Makefile.features index 651254b37b..6f8b9d6062 100644 --- a/cpu/stm32f1/Makefile.features +++ b/cpu/stm32f1/Makefile.features @@ -1,4 +1,3 @@ FEATURES_PROVIDED += periph_flashpage -FEATURES_PROVIDED += periph_pm -include $(RIOTCPU)/stm32_common/Makefile.features diff --git a/cpu/stm32f2/Makefile.features b/cpu/stm32f2/Makefile.features index c6412dd78e..c51e0186eb 100644 --- a/cpu/stm32f2/Makefile.features +++ b/cpu/stm32f2/Makefile.features @@ -1,4 +1,3 @@ FEATURES_PROVIDED += periph_hwrng -FEATURES_PROVIDED += periph_pm -include $(RIOTCPU)/stm32_common/Makefile.features diff --git a/cpu/stm32f4/Makefile.features b/cpu/stm32f4/Makefile.features index a7a5abd1a3..0bc5724d86 100644 --- a/cpu/stm32f4/Makefile.features +++ b/cpu/stm32f4/Makefile.features @@ -1,5 +1,4 @@ FEATURES_PROVIDED += periph_hwrng -FEATURES_PROVIDED += periph_pm # the granularity of provided feature definition for STMs is currently by CPU # sub-family (e.g., stm32f[1234]). Unfortunately, only some of e.g., the diff --git a/makefiles/arch/cortexm.inc.mk b/makefiles/arch/cortexm.inc.mk index e46b851576..69d4844a7e 100644 --- a/makefiles/arch/cortexm.inc.mk +++ b/makefiles/arch/cortexm.inc.mk @@ -31,6 +31,8 @@ export USEMODULE += cortexm_common export USEMODULE += periph # include common periph code export USEMODULE += periph_common +export USEMODULE += cortexm_common_periph + # all cortex MCU's use newlib as libc export USEMODULE += newlib