From 0f7f3648652beb81bd5bdac450f8982564143292 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 17 Dec 2015 12:52:15 -0600 Subject: [PATCH] TMS570: Correct a few problems introduced in previous commits --- arch/arm/src/tms570/chip/tms570_esm.h | 4 ++-- arch/arm/src/tms570/tms570_boot.c | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/arm/src/tms570/chip/tms570_esm.h b/arch/arm/src/tms570/chip/tms570_esm.h index 9455a838d1..9639b63107 100644 --- a/arch/arm/src/tms570/chip/tms570_esm.h +++ b/arch/arm/src/tms570/chip/tms570_esm.h @@ -86,7 +86,7 @@ #define TMS570_ESM_IECR1 (TMS570_ESM_BASE+TMS570_ESM_IECR1_OFFSET) #define TMS570_ESM_ILSR1 (TMS570_ESM_BASE+TMS570_ESM_ILSR1_OFFSET) #define TMS570_ESM_ILCR1 (TMS570_ESM_BASE+TMS570_ESM_ILCR1_OFFSET) -#define TMS570_ESM_SR1(n) (TMS570_ESM_BASE+TMS570_ESM_SR_OFFSET(n)) +#define TMS570_ESM_SR(n) (TMS570_ESM_BASE+TMS570_ESM_SR_OFFSET(n)) # define TMS570_ESM_SR1 (TMS570_ESM_BASE+TMS570_ESM_SR1_OFFSET) # define TMS570_ESM_SR2 (TMS570_ESM_BASE+TMS570_ESM_SR2_OFFSET) # define TMS570_ESM_SR3 (TMS570_ESM_BASE+TMS570_ESM_SR3_OFFSET) @@ -161,7 +161,7 @@ #define ESM_EKR_MASK 0x0000000f /* Bits 0-3: Error key value */ # define ESM_EKR_NORMAL 0x00000000 /* Activates normal mode */ # define ESM_EKR_ERROR 0x00000005 /* nERROR set high when LTC completes */ -# define ESM_EKR_NORMAL 0x0000000a /* Forces error on nERROR pin */ +# define ESM_EKR_FORCE 0x0000000a /* Forces error on nERROR pin */ /* ESM Status Shadow Register 2 */ diff --git a/arch/arm/src/tms570/tms570_boot.c b/arch/arm/src/tms570/tms570_boot.c index 83588239c8..150946bdbe 100644 --- a/arch/arm/src/tms570/tms570_boot.c +++ b/arch/arm/src/tms570/tms570_boot.c @@ -56,9 +56,12 @@ #include "arm.h" #include "cache.h" #include "fpu.h" +#include "sctlr.h" #include "up_internal.h" #include "up_arch.h" +#include "chip/tms570_esm.h" +#include "tms570_clockconfig.h" #include "tms570_boot.h" /**************************************************************************** @@ -185,7 +188,7 @@ static inline void tms570_event_export(void) { uint32_t pmcr = cp15_rdpmcr(); pmcr |= PCMR_X; - cp15_wrpmcr(pmcr) + cp15_wrpmcr(pmcr); } /****************************************************************************