diff options
Diffstat (limited to 'nuttx/arch/arm/src/lm3s')
-rw-r--r-- | nuttx/arch/arm/src/lm3s/Make.defs | 9 | ||||
-rw-r--r-- | nuttx/arch/arm/src/lm3s/chip.h | 1 | ||||
-rw-r--r-- | nuttx/arch/arm/src/lm3s/lm3s_context.S | 2 | ||||
-rw-r--r-- | nuttx/arch/arm/src/lm3s/lm3s_hardfault.c | 2 | ||||
-rw-r--r-- | nuttx/arch/arm/src/lm3s/lm3s_irq.c | 1 | ||||
-rw-r--r-- | nuttx/arch/arm/src/lm3s/lm3s_timerisr.c | 1 |
6 files changed, 8 insertions, 8 deletions
diff --git a/nuttx/arch/arm/src/lm3s/Make.defs b/nuttx/arch/arm/src/lm3s/Make.defs index 3eb33dd58..3e0ab3488 100644 --- a/nuttx/arch/arm/src/lm3s/Make.defs +++ b/nuttx/arch/arm/src/lm3s/Make.defs @@ -37,13 +37,12 @@ HEAD_ASRC = lm3s_vectors.S CMN_ASRCS = CMN_CSRCS = up_allocateheap.c up_assert.c up_blocktask.c up_copystate.c \ - up_createstack.c up_dataabort.c up_mdelay.c up_udelay.c up_exit.c \ + up_createstack.c up_mdelay.c up_udelay.c up_exit.c \ up_idle.c up_initialize.c up_initialstate.c up_interruptcontext.c \ up_modifyreg8.c up_modifyreg16.c up_modifyreg32.c \ - up_prefetchabort.c up_releasepending.c up_releasestack.c \ - up_reprioritizertr.c up_schedulesigaction.c \ - up_sigdeliver.c up_syscall.c up_unblocktask.c \ - up_undefinedinsn.c up_usestack.c up_doirq.c + up_releasepending.c up_releasestack.c up_reprioritizertr.c \ + up_schedulesigaction.c up_sigdeliver.c up_unblocktask.c \ + up_usestack.c up_doirq.c CHIP_ASRCS = lm3s_context.S CHIP_CSRCS = lm3s_start.c lm3s_syscontrol.c lm3s_irq.c lm3s_svcall.c \ diff --git a/nuttx/arch/arm/src/lm3s/chip.h b/nuttx/arch/arm/src/lm3s/chip.h index 129cd9f37..6d113cbb7 100644 --- a/nuttx/arch/arm/src/lm3s/chip.h +++ b/nuttx/arch/arm/src/lm3s/chip.h @@ -47,7 +47,6 @@ #include "lm3s_syscontrol.h" /* System control module */ #include "lm3s_gpio.h" /* GPIO module */ #include "lm3s_uart.h" /* UART peripherals */ -#include "cortexm3_nvic.h" /* Nested, vectored interrupt controller */ /************************************************************************************ * Definitions diff --git a/nuttx/arch/arm/src/lm3s/lm3s_context.S b/nuttx/arch/arm/src/lm3s/lm3s_context.S index 7641b0109..efef06630 100644 --- a/nuttx/arch/arm/src/lm3s/lm3s_context.S +++ b/nuttx/arch/arm/src/lm3s/lm3s_context.S @@ -40,7 +40,7 @@ #include <nuttx/config.h>
#include <arch/irq.h>
-#include "cortexm3_nvic.h"
+#include "nvic.h"
/************************************************************************************
* Preprocessor Definitions
diff --git a/nuttx/arch/arm/src/lm3s/lm3s_hardfault.c b/nuttx/arch/arm/src/lm3s/lm3s_hardfault.c index 7a9c76611..7a3e60623 100644 --- a/nuttx/arch/arm/src/lm3s/lm3s_hardfault.c +++ b/nuttx/arch/arm/src/lm3s/lm3s_hardfault.c @@ -49,7 +49,7 @@ #include "up_arch.h" #include "os_internal.h" -#include "cortexm3_nvic.h" +#include "nvic.h" #include "lm3s_internal.h" /**************************************************************************** diff --git a/nuttx/arch/arm/src/lm3s/lm3s_irq.c b/nuttx/arch/arm/src/lm3s/lm3s_irq.c index d75d33304..374c4bfc7 100644 --- a/nuttx/arch/arm/src/lm3s/lm3s_irq.c +++ b/nuttx/arch/arm/src/lm3s/lm3s_irq.c @@ -47,6 +47,7 @@ #include <nuttx/arch.h> #include <arch/irq.h> +#include "nvic.h" #include "up_arch.h" #include "os_internal.h" #include "up_internal.h" diff --git a/nuttx/arch/arm/src/lm3s/lm3s_timerisr.c b/nuttx/arch/arm/src/lm3s/lm3s_timerisr.c index 95b358df1..714d68c7d 100644 --- a/nuttx/arch/arm/src/lm3s/lm3s_timerisr.c +++ b/nuttx/arch/arm/src/lm3s/lm3s_timerisr.c @@ -44,6 +44,7 @@ #include <nuttx/arch.h> #include <arch/board/board.h> +#include "nvic.h" #include "clock_internal.h" #include "up_internal.h" #include "up_arch.h" |