From 9c1b677bd5400e81a4479408fc91667c221a4353 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 26 Dec 2015 08:18:52 -0600 Subject: [PATCH] TMS570: Clean up misc. build issues --- arch/arm/src/tms570/tms570_boot.c | 4 +++- arch/arm/src/tms570/tms570_gioirq.c | 2 +- arch/arm/src/tms570/tms570_irq.c | 13 ++++--------- arch/arm/src/tms570/tms570_selftest.c | 2 ++ arch/arm/src/tms570/tms570_selftest.h | 2 ++ 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/arch/arm/src/tms570/tms570_boot.c b/arch/arm/src/tms570/tms570_boot.c index 8b1cfb2cf84..f4abd925e8d 100644 --- a/arch/arm/src/tms570/tms570_boot.c +++ b/arch/arm/src/tms570/tms570_boot.c @@ -62,7 +62,9 @@ #include "chip/tms570_sys.h" #include "chip/tms570_esm.h" +#include "chip/tms570_pbist.h" #include "tms570_clockconfig.h" +#include "tms570_selftest.h" #include "tms570_gio.h" #include "tms570_boot.h" @@ -231,7 +233,7 @@ void arm_boot(void) /* Run the memory selftest on CPU RAM. */ - tms570_memtest_start(PBIST_RINFOL_ESRAM1_RAM) + tms570_memtest_start(PBIST_RINFOL_ESRAM1_RAM); ASSERT(tms570_memtest_complete() == 0); #endif /* CONFIG_TMS570_SELFTEST */ diff --git a/arch/arm/src/tms570/tms570_gioirq.c b/arch/arm/src/tms570/tms570_gioirq.c index 1da8d21d1fb..c20300e0b60 100644 --- a/arch/arm/src/tms570/tms570_gioirq.c +++ b/arch/arm/src/tms570/tms570_gioirq.c @@ -104,7 +104,7 @@ static int tms3570_gio_interrupt(int irq, void *context) * ****************************************************************************/ -void tms570_gioirqinitialize(void) +void tms570_gioirq_initialize(void) { /* Disable all pin interrupts on the pin. Make sure they are all level 0. */ diff --git a/arch/arm/src/tms570/tms570_irq.c b/arch/arm/src/tms570/tms570_irq.c index 3a6fdb295d7..dad8c10fd0f 100644 --- a/arch/arm/src/tms570/tms570_irq.c +++ b/arch/arm/src/tms570/tms570_irq.c @@ -52,6 +52,7 @@ #include "up_internal.h" #include "chip/tms570_vim.h" +#include "tms570_gio.h" #include "tms570_irq.h" /**************************************************************************** @@ -207,7 +208,7 @@ uint32_t *arm_decodeirq(uint32_t *regs) int vector; /* Check for a VRAM parity error. This is not to critical in this - * implementatin since VIM RAM is not used. + * implementation since VIM RAM is not used. */ #warning Missing logic @@ -225,9 +226,6 @@ uint32_t *arm_decodeirq(uint32_t *regs) regs = arm_doirq(vector - 1, regs); } - /* Acknowledge interrupt */ -#warning Verify not needed - return regs; } @@ -252,7 +250,7 @@ uint32_t *arm_decodefiq(FAR uint32_t *regs) int vector; /* Check for a VRAM parity error. This is not to critical in this - * implementatin since VIM RAM is not used. + * implementation since VIM RAM is not used. */ #warning Missing logic @@ -267,12 +265,9 @@ uint32_t *arm_decodefiq(FAR uint32_t *regs) * number offset by one to skip over the "phantom" vector. */ - regs = arm_doirq(vector - 1, regs) + regs = arm_doirq(vector - 1, regs); } - /* Acknowledge interrupt */ -#warning Verify not needed - return regs; } #endif diff --git a/arch/arm/src/tms570/tms570_selftest.c b/arch/arm/src/tms570/tms570_selftest.c index 16cee512115..eba0f3deed6 100644 --- a/arch/arm/src/tms570/tms570_selftest.c +++ b/arch/arm/src/tms570/tms570_selftest.c @@ -45,6 +45,8 @@ #include +#include + #include "tms570_selftest.h" #ifdef CONFIG_TMS570_SELFTEST diff --git a/arch/arm/src/tms570/tms570_selftest.h b/arch/arm/src/tms570/tms570_selftest.h index 783928043f3..bfc2bd41308 100644 --- a/arch/arm/src/tms570/tms570_selftest.h +++ b/arch/arm/src/tms570/tms570_selftest.h @@ -42,6 +42,8 @@ #include +#include + #ifdef CONFIG_TMS570_SELFTEST /****************************************************************************