summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorKumar Gala <kumar.gala@linaro.org>2017-01-13 10:46:53 -0600
committerKumar Gala <kumar.gala@linaro.org>2017-01-23 15:15:54 -0600
commit457a5988c4efed83796334ac7acdd2aa0f643b25 (patch)
tree2a72660ba77ee9fdc6eba9c7c40ee23eba2d4a0d /arch
parent375a0ef39304fcc5b4b765c69bfce976909ae5c9 (diff)
arm: cmsis: Introduce CMSIS layer
Support using CMSIS defines and functions, we either pull the expect defines/enum from the SoC HAL layers via <soc.h> for the SoC or we provide a default set based on __NVIC_PRIO_BITS is defined. We provide defaults in the case for: IRQn_Type enum *_REV define (set to 0) __MPU_PRESENT define (set to 0 - no MPU) __NVIC_PRIO_BITS define (set to CONFIG_NUM_IRQ_PRIO_BITS) __Vendor_SysTickConfig (set to 0 - standard SysTick) Jira: ZEP-1568 Change-Id: Ibc203de79f4697b14849b69c0e8c5c43677b5c6e Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no> Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/core/Kconfig1
-rw-r--r--arch/arm/core/cortex_m/Makefile1
-rw-r--r--arch/arm/soc/nxp_kinetis/k6x/soc.h1
3 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/core/Kconfig b/arch/arm/core/Kconfig
index 603171758..df880279c 100644
--- a/arch/arm/core/Kconfig
+++ b/arch/arm/core/Kconfig
@@ -19,6 +19,7 @@ config CPU_CORTEX_M
default n
select CPU_CORTEX
select ARCH_HAS_CUSTOM_SWAP_TO_MAIN
+ select HAS_CMSIS
help
This option signifies the use of a CPU of the Cortex-M family.
diff --git a/arch/arm/core/cortex_m/Makefile b/arch/arm/core/cortex_m/Makefile
index a671b28f9..8a7c080a7 100644
--- a/arch/arm/core/cortex_m/Makefile
+++ b/arch/arm/core/cortex_m/Makefile
@@ -1,6 +1,7 @@
ccflags-y +=-I$(srctree)/include/drivers
ccflags-y +=-I$(srctree)/arch/arm/soc/$(SOC_PATH)
ccflags-y +=-I$(srctree)/kernel/include
+ccflags-y +=-I$(srctree)/include/
asflags-y = $(ccflags-y)
diff --git a/arch/arm/soc/nxp_kinetis/k6x/soc.h b/arch/arm/soc/nxp_kinetis/k6x/soc.h
index 8c48c70be..a7b5e7a44 100644
--- a/arch/arm/soc/nxp_kinetis/k6x/soc.h
+++ b/arch/arm/soc/nxp_kinetis/k6x/soc.h
@@ -134,6 +134,7 @@ extern "C" {
#ifndef _ASMLANGUAGE
+#include <fsl_common.h>
#include <device.h>
#include <misc/util.h>
#include <drivers/rand32.h>