cpu: adapted Makefiles to unified cortexm module

dev/timer
haukepetersen 8 years ago committed by Hauke Petersen
parent 49dcb692d1
commit 0d5c8546f3

@ -2,6 +2,6 @@
MODULE = cpu
# Add a list of subdirectories, that should also be built:
DIRS = periph $(CORTEX_COMMON)
DIRS = periph $(RIOTCPU)/cortexm_common
include $(RIOTBASE)/Makefile.base

@ -1,4 +1,3 @@
# select CPU
export CORTEX := cortex-m3
export CPU_ARCH := cortex-m3
include $(RIOTCPU)/Makefile.include.cortex_common
include $(RIOTCPU)/Makefile.include.cortexm_common

@ -2,6 +2,6 @@
MODULE = cpu
# add a list of subdirectories, that should also be build
DIRS = periph $(CORTEX_M4_COMMON) devio $(KINETIS_COMMON)
DIRS = periph $(RIOTCPU)/cortexm_common devio $(KINETIS_COMMON)
include $(RIOTBASE)/Makefile.base

@ -1,3 +1,6 @@
# define the CPU architecture for the k60
export CPU_ARCH = cortex-m4
# this CPU implementation is using the explicit core/CPU interface
export CFLAGS += -DCOREIF_NG=1
@ -8,19 +11,16 @@ export USEMODULE += periph
export USEMODULE += devio
# tell the build system that the CPU depends on the Cortex-M common files
export USEMODULE += cortex-m4_common
export USEMODULE += cortexm_common
# tell the build system that the CPU depends on the Kinetis common files
export USEMODULE += kinetis_common
# define path to cortex-m common module, which is needed for this CPU
export CORTEX_M4_COMMON = $(RIOTCPU)/cortex-m4_common/
# define path to kinetis module, which is needed for this CPU
export KINETIS_COMMON = $(RIOTCPU)/kinetis_common/
# CPU depends on the cortex-m common module, so include it
include $(CORTEX_M4_COMMON)Makefile.include
include $(RIOTCPU)/cortexm_common/Makefile.include
# CPU depends on the kinetis module, so include it
include $(KINETIS_COMMON)Makefile.include

@ -2,6 +2,6 @@
MODULE = cpu
# add a list of subdirectories, that should also be build
DIRS = periph $(CORTEX_M4_COMMON) $(KINETIS_COMMON)
DIRS = periph $(RIOTCPU)/cortexm_common $(KINETIS_COMMON)
include $(RIOTBASE)/Makefile.base

@ -5,19 +5,16 @@ export CFLAGS += -DCOREIF_NG=1
export USEMODULE += periph
# tell the build system that the CPU depends on the Cortex-M common files
export USEMODULE += cortex-m4_common
export USEMODULE += cortexm_common
# tell the build system that the CPU depends on the Kinetis common files
export USEMODULE += kinetis_common
# define path to cortex-m common module, which is needed for this CPU
export CORTEX_M4_COMMON = $(RIOTCPU)/cortex-m4_common/
# define path to kinetis module, which is needed for this CPU
export KINETIS_COMMON = $(RIOTCPU)/kinetis_common/
# CPU depends on the cortex-m common module, so include it
include $(CORTEX_M4_COMMON)Makefile.include
include $(RIOTCPU)/cortexm_common/Makefile.include
# CPU depends on the kinetis module, so include it
include $(KINETIS_COMMON)Makefile.include

@ -2,6 +2,6 @@
MODULE = cpu
# add a list of subdirectories, that should also be build
DIRS = periph $(CORTEX_COMMON)
DIRS = periph $(RIOTCPU)/cortexm_common
include $(RIOTBASE)/Makefile.base

@ -1,3 +1,3 @@
export CORTEX = cortex-m3
export CPU_ARCH = cortex-m3
include $(RIOTCPU)/Makefile.include.cortex_common
include $(RIOTCPU)/Makefile.include.cortexm_common

@ -2,7 +2,7 @@
MODULE = cpu
# add a list of subdirectories, that should also be build
DIRS = periph $(CORTEX_COMMON)
DIRS = periph $(RIOTCPU)/cortexm_common
# build one of the radio drivers, if enabled
ifneq (,$(filter radio_nrfmin,$(USEMODULE)))

@ -1,3 +1,3 @@
export CORTEX = cortex-m0
export CPU_ARCH = cortex-m0
include $(RIOTCPU)/Makefile.include.cortex_common
include $(RIOTCPU)/Makefile.include.cortexm_common

@ -2,6 +2,6 @@
MODULE = cpu
# add a list of subdirectories, that should also be build
DIRS = periph $(CORTEX_COMMON)
DIRS = periph $(RIOTCPU)/cortexm_common
include $(RIOTBASE)/Makefile.base

@ -1,3 +1,3 @@
export CORTEX = cortex-m3
export CPU_ARCH = cortex-m3
include $(RIOTCPU)/Makefile.include.cortex_common
include $(RIOTCPU)/Makefile.include.cortexm_common

@ -2,6 +2,6 @@
MODULE = cpu
# add a list of subdirectories, that should also be build
DIRS = periph $(CORTEX_COMMON)
DIRS = periph $(RIOTCPU)/cortexm_common
include $(RIOTBASE)/Makefile.base

@ -1,9 +1,9 @@
export CORTEX = cortex-m0
export CPU_ARCH = cortex-m0plus
# this CPU implementation doesn't use CMSIS initialisation
export CFLAGS += -DDONT_USE_CMSIS_INIT
#
# use the hwtimer compatibility layer
USEMODULE += hwtimer_compat
include $(RIOTCPU)/Makefile.include.cortex_common
include $(RIOTCPU)/Makefile.include.cortexm_common

@ -2,6 +2,6 @@
MODULE = cpu
# add a list of subdirectories, that should also be build
DIRS = periph $(CORTEX_COMMON)
DIRS = periph $(RIOTCPU)/cortexm_common
include $(RIOTBASE)/Makefile.base

@ -1,4 +1,4 @@
export CORTEX = cortex-m0
export CPU_ARCH = cortex-m0plus
# this CPU implementation doesn't use CMSIS initialisation
export CFLAGS += -DDONT_USE_CMSIS_INIT
@ -6,4 +6,4 @@ export CFLAGS += -DDONT_USE_CMSIS_INIT
# use the hwtimer compatibility module
USEMODULE += hwtimer_compat
include $(RIOTCPU)/Makefile.include.cortex_common
include $(RIOTCPU)/Makefile.include.cortexm_common

@ -2,6 +2,6 @@
MODULE = cpu
# add a list of subdirectories, that should also be build
DIRS = periph $(CORTEX_COMMON)
DIRS = periph $(RIOTCPU)/cortexm_common
include $(RIOTBASE)/Makefile.base

@ -1,6 +1,6 @@
export CORTEX = cortex-m0
export CPU_ARCH = cortex-m0
# use hwtimer compatibility module
USEMODULE += hwtimer_compat
include $(RIOTCPU)/Makefile.include.cortex_common
include $(RIOTCPU)/Makefile.include.cortexm_common

@ -1,7 +1,7 @@
# define the module that is build
MODULE =cpu
MODULE = cpu
# add a list of subdirectories, that should also be build
DIRS += periph $(CORTEX_COMMON)
DIRS += periph $(RIOTCPU)/cortexm_common
include $(RIOTBASE)/Makefile.base

@ -1,6 +1,6 @@
export CORTEX = cortex-m3
export CPU_ARCH = cortex-m3
# use hwtimer compatibility module
USEMODULE += hwtimer_compat
include $(RIOTCPU)/Makefile.include.cortex_common
include $(RIOTCPU)/Makefile.include.cortexm_common

@ -2,6 +2,6 @@
MODULE = cpu
# add a list of subdirectories, that should also be build
DIRS = periph $(CORTEX_COMMON)
DIRS = periph $(RIOTCPU)/cortexm_common
include $(RIOTBASE)/Makefile.base

@ -1,6 +1,6 @@
export CORTEX = cortex-m4
export CPU_ARCH = cortex-m4f
# use hwtimer compatibility module
USEMODULE += hwtimer_compat
include $(RIOTCPU)/Makefile.include.cortex_common
include $(RIOTCPU)/Makefile.include.cortexm_common

@ -2,6 +2,6 @@
MODULE = cpu
# add a list of subdirectories, that should also be build
DIRS = periph $(CORTEX_COMMON)
DIRS = periph $(RIOTCPU)/cortexm_common
include $(RIOTBASE)/Makefile.base

@ -1,6 +1,6 @@
export CORTEX = cortex-m4
export CPU_ARCH = cortex-m4f
# use hwtimer compatibility module
USEMODULE += hwtimer_compat
include $(RIOTCPU)/Makefile.include.cortex_common
include $(RIOTCPU)/Makefile.include.cortexm_common

@ -1,7 +1,7 @@
# define the module that is build
MODULE =cpu
MODULE = cpu
# add a list of subdirectories, that should also be build
DIRS += periph $(CORTEX_COMMON)
DIRS += periph $(RIOTCPU)/cortexm_common
include $(RIOTBASE)/Makefile.base

@ -1,6 +1,6 @@
export CORTEX = cortex-m3
export CPU_ARCH = cortex-m3
# use hwtimer compatibility module
USEMODULE += hwtimer_compat
include $(RIOTCPU)/Makefile.include.cortex_common
include $(RIOTCPU)/Makefile.include.cortexm_common

Loading…
Cancel
Save