From 07e24dfcf9835cac8dc27d2d3de75e92d78945fc Mon Sep 17 00:00:00 2001 From: Travis Geiselbrecht Date: Wed, 5 Mar 2014 12:53:46 -0800 Subject: [PATCH] [arch][arm-m] fix arch_cycle_count on cortex-m A bad #ifdef broke it somewhere along the line. --- arch/arm/include/arch/arch_ops.h | 2 +- arch/arm/rules.mk | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/arm/include/arch/arch_ops.h b/arch/arm/include/arch/arch_ops.h index 6c3f43fe..207c477f 100644 --- a/arch/arm/include/arch/arch_ops.h +++ b/arch/arm/include/arch/arch_ops.h @@ -183,7 +183,7 @@ static inline int atomic_cmpxchg(volatile int *ptr, int oldval, int newval) static inline uint32_t arch_cycle_count(void) { -#if ARM_ISA_ARM7M +#if ARM_ISA_ARMV7M #if ENABLE_CYCLE_COUNTER #define DWT_CYCCNT (0xE0001004) return *REG32(DWT_CYCCNT); diff --git a/arch/arm/rules.mk b/arch/arm/rules.mk index 77e1d102..099e2b2e 100644 --- a/arch/arm/rules.mk +++ b/arch/arm/rules.mk @@ -15,7 +15,7 @@ GLOBAL_DEFINES += \ HANDLED_CORE := false ifeq ($(ARM_CPU),cortex-m3) GLOBAL_DEFINES += \ - ARM_WITH_CP15=1 \ + ARM_CPU_CORTEX_M3=1 \ ARM_ISA_ARMv7=1 \ ARM_ISA_ARMv7M=1 \ ARM_WITH_THUMB=1 \ @@ -29,7 +29,6 @@ endif ifeq ($(ARM_CPU),cortex-m4) GLOBAL_DEFINES += \ ARM_CPU_CORTEX_M4=1 \ - ARM_WITH_CP15=1 \ ARM_ISA_ARMv7=1 \ ARM_ISA_ARMv7M=1 \ ARM_WITH_THUMB=1 \ @@ -44,7 +43,6 @@ ifeq ($(ARM_CPU),cortex-m4f) GLOBAL_DEFINES += \ ARM_CPU_CORTEX_M4=1 \ ARM_CPU_CORTEX_M4F=1 \ - ARM_WITH_CP15=1 \ ARM_ISA_ARMv7=1 \ ARM_ISA_ARMv7M=1 \ ARM_WITH_THUMB=1 \