From a04f50985792dadf0a8799ef210a43542855355f Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Mon, 8 Feb 2016 21:50:24 +0100 Subject: [PATCH] cpu/stm32f0: use common STM32 files --- cpu/stm32f0/Makefile | 2 +- cpu/stm32f0/Makefile.include | 5 ++--- cpu/stm32f0/include/periph_cpu.h | 11 ++++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cpu/stm32f0/Makefile b/cpu/stm32f0/Makefile index 21f0d1871..9836e38e6 100644 --- a/cpu/stm32f0/Makefile +++ b/cpu/stm32f0/Makefile @@ -2,6 +2,6 @@ MODULE = cpu # add a list of subdirectories, that should also be build -DIRS = periph $(RIOTCPU)/cortexm_common +DIRS = periph $(RIOTCPU)/cortexm_common $(RIOTCPU)/stm32_common include $(RIOTBASE)/Makefile.base diff --git a/cpu/stm32f0/Makefile.include b/cpu/stm32f0/Makefile.include index 1fcb75962..daa2827f9 100644 --- a/cpu/stm32f0/Makefile.include +++ b/cpu/stm32f0/Makefile.include @@ -1,6 +1,5 @@ export CPU_ARCH = cortex-m0 +export CPU_FAM = stm32f0 -# use common periph functions -USEMODULE += periph_common - +include $(RIOTCPU)/stm32_common/Makefile.include include $(RIOTCPU)/Makefile.include.cortexm_common diff --git a/cpu/stm32f0/include/periph_cpu.h b/cpu/stm32f0/include/periph_cpu.h index 2a6512fa0..d4a3fee68 100644 --- a/cpu/stm32f0/include/periph_cpu.h +++ b/cpu/stm32f0/include/periph_cpu.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Freie Universität Berlin + * Copyright (C) 2015-2016 Freie Universität Berlin * * This file is subject to the terms and conditions of the GNU Lesser * General Public License v2.1. See the file LICENSE in the top level @@ -16,10 +16,11 @@ * @author Hauke Petersen */ -#ifndef PERIPH_CPU_H_ -#define PERIPH_CPU_H_ +#ifndef PERIPH_CPU_H +#define PERIPH_CPU_H -#include "periph/dev_enums.h" +#include "cpu.h" +#include "periph_cpu_common.h" #ifdef __cplusplus extern "C" { @@ -43,5 +44,5 @@ extern "C" { } #endif -#endif /* PERIPH_CPU_H_ */ +#endif /* PERIPH_CPU_H */ /** @} */