diff --git a/cpu/sam0_common/Makefile.dep b/cpu/sam0_common/Makefile.dep index d14f2bdb7b..a87db0f10c 100644 --- a/cpu/sam0_common/Makefile.dep +++ b/cpu/sam0_common/Makefile.dep @@ -1,3 +1,9 @@ ifneq (,$(filter periph_uart_nonblocking,$(USEMODULE))) USEMODULE += tsrb endif + +# All SAM0 based CPUs provide PM +USEMODULE += pm_layered + +# include sam0 common periph drivers +USEMODULE += sam0_common_periph diff --git a/cpu/sam0_common/Makefile.include b/cpu/sam0_common/Makefile.include index 1ccbb98c16..d08c446d65 100644 --- a/cpu/sam0_common/Makefile.include +++ b/cpu/sam0_common/Makefile.include @@ -31,7 +31,4 @@ LINKER_SCRIPT ?= cortexm.ld # define sam0 specific pseudomodules PSEUDOMODULES += sam0_periph_uart_hw_fc -# include sam0 common periph drivers -USEMODULE += sam0_common_periph - INCLUDES += -I$(RIOTCPU)/sam0_common/include diff --git a/cpu/samd21/Makefile.include b/cpu/samd21/Makefile.include index 2576ff4ed2..30f4ae9d0c 100644 --- a/cpu/samd21/Makefile.include +++ b/cpu/samd21/Makefile.include @@ -1,7 +1,5 @@ CPU_ARCH = cortex-m0plus CPU_FAM = samd21 -USEMODULE += pm_layered - include $(RIOTCPU)/sam0_common/Makefile.include include $(RIOTMAKE)/arch/cortexm.inc.mk diff --git a/cpu/samd5x/Makefile.include b/cpu/samd5x/Makefile.include index 4484c2497e..6e33db8efc 100644 --- a/cpu/samd5x/Makefile.include +++ b/cpu/samd5x/Makefile.include @@ -6,8 +6,6 @@ CPU_FAM = samd5x # flash cannot be divided by two slots while staying FLASHPAGE_SIZE aligned. RIOTBOOT_LEN ?= 0x4000 -USEMODULE += pm_layered - BACKUP_RAM_ADDR = 0x47000000 BACKUP_RAM_LEN = 0x2000 diff --git a/cpu/saml1x/Makefile.include b/cpu/saml1x/Makefile.include index c552017b2d..5f85fa02ea 100644 --- a/cpu/saml1x/Makefile.include +++ b/cpu/saml1x/Makefile.include @@ -1,6 +1,4 @@ CPU_ARCH = cortex-m23 -USEMODULE += pm_layered - include $(RIOTCPU)/sam0_common/Makefile.include include $(RIOTMAKE)/arch/cortexm.inc.mk diff --git a/cpu/saml21/Makefile.include b/cpu/saml21/Makefile.include index f42f494a78..233886256a 100644 --- a/cpu/saml21/Makefile.include +++ b/cpu/saml21/Makefile.include @@ -1,8 +1,6 @@ CPU_ARCH = cortex-m0plus CPU_FAM = saml21 -USEMODULE += pm_layered - ifneq (,$(filter saml21j18b saml21j18a samr30g18a samr34j18b,$(CPU_MODEL))) BACKUP_RAM_ADDR = 0x30000000 BACKUP_RAM_LEN = 0x2000