lby/lk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[arch][arm-m] fix arch_cycle_count on cortex-m

Browse Source 
A bad #ifdef broke it somewhere along the line.
This commit is contained in:
Travis Geiselbrecht
2014-03-05 12:53:46 -08:00
parent 616a4d5066
commit 07e24dfcf9
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/include/arch/arch_ops.h
View File

@@ -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);

4
arch/arm/rules.mk
View File

@@ -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 \