diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-12-28 23:24:45 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-12-28 23:24:45 +0000 |
commit | 9033d2ca901cdd2848d311fbef8494cbca2427f5 (patch) | |
tree | e0e95d71f7a0a8af8da3c63b648543ab71f7636e /nuttx/arch/arm/src | |
parent | 1e4c607f0f16aa631b05300314ec8884acac7779 (diff) | |
download | px4-nuttx-9033d2ca901cdd2848d311fbef8494cbca2427f5.tar.gz px4-nuttx-9033d2ca901cdd2848d311fbef8494cbca2427f5.tar.bz2 px4-nuttx-9033d2ca901cdd2848d311fbef8494cbca2427f5.zip |
Fixes for recent header file reorganization
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2449 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm/src')
-rw-r--r-- | nuttx/arch/arm/src/arm/up_doirq.c | 2 | ||||
-rw-r--r-- | nuttx/arch/arm/src/arm/up_head.S | 13 | ||||
-rw-r--r-- | nuttx/arch/arm/src/c5471/c5471_irq.c | 1 | ||||
-rw-r--r-- | nuttx/arch/arm/src/c5471/c5471_lowputc.S | 4 | ||||
-rw-r--r-- | nuttx/arch/arm/src/c5471/c5471_serial.c | 1 | ||||
-rw-r--r-- | nuttx/arch/arm/src/c5471/c5471_timerisr.c | 3 | ||||
-rw-r--r-- | nuttx/arch/arm/src/c5471/c5471_vectors.S | 1 | ||||
-rw-r--r-- | nuttx/arch/arm/src/c5471/c5471_watchdog.c | 1 | ||||
-rw-r--r-- | nuttx/arch/arm/src/dm320/dm320_usbdev.c | 1 |
9 files changed, 13 insertions, 14 deletions
diff --git a/nuttx/arch/arm/src/arm/up_doirq.c b/nuttx/arch/arm/src/arm/up_doirq.c index bc3fa2d67..5c127b75c 100644 --- a/nuttx/arch/arm/src/arm/up_doirq.c +++ b/nuttx/arch/arm/src/arm/up_doirq.c @@ -44,6 +44,8 @@ #include <nuttx/arch.h> #include <assert.h> +#include <arch/board/board.h> + #include "up_arch.h" #include "os_internal.h" #include "up_internal.h" diff --git a/nuttx/arch/arm/src/arm/up_head.S b/nuttx/arch/arm/src/arm/up_head.S index 5b420fc66..33d00366c 100644 --- a/nuttx/arch/arm/src/arm/up_head.S +++ b/nuttx/arch/arm/src/arm/up_head.S @@ -321,21 +321,10 @@ __start: strcc fp, [r0],#4 bcc .Lbssinit - /* Perform early C-level initialization */ + /* Perform early C-level, platform-specific initialization */ bl up_boot - /* Set up the LEDs */ - -#ifdef CONFIG_ARCH_LEDS - bl up_ledinit -#endif - /* Perform early serial initialization */ - -#ifdef CONFIG_USE_EARLYSERIALINIT - bl up_earlyserialinit -#endif - /* Finally branch to the OS entry point */ mov lr, #0 diff --git a/nuttx/arch/arm/src/c5471/c5471_irq.c b/nuttx/arch/arm/src/c5471/c5471_irq.c index 27e178469..6906e8f8d 100644 --- a/nuttx/arch/arm/src/c5471/c5471_irq.c +++ b/nuttx/arch/arm/src/c5471/c5471_irq.c @@ -43,6 +43,7 @@ #include <nuttx/irq.h> #include "arm.h" +#include "chip.h" #include "up_arch.h" #include "os_internal.h" #include "up_internal.h" diff --git a/nuttx/arch/arm/src/c5471/c5471_lowputc.S b/nuttx/arch/arm/src/c5471/c5471_lowputc.S index 4e949cf35..096742a70 100644 --- a/nuttx/arch/arm/src/c5471/c5471_lowputc.S +++ b/nuttx/arch/arm/src/c5471/c5471_lowputc.S @@ -38,8 +38,10 @@ **************************************************************************/ #include <nuttx/config.h> -#include "up_internal.h" + +#include "chip.h" #include "up_arch.h" +#include "up_internal.h" /************************************************************************** * Private Definitions diff --git a/nuttx/arch/arm/src/c5471/c5471_serial.c b/nuttx/arch/arm/src/c5471/c5471_serial.c index 6e3d52c67..020210d31 100644 --- a/nuttx/arch/arm/src/c5471/c5471_serial.c +++ b/nuttx/arch/arm/src/c5471/c5471_serial.c @@ -53,6 +53,7 @@ #include <nuttx/serial.h> #include <arch/serial.h> +#include "chip.h" #include "up_arch.h" #include "os_internal.h" #include "up_internal.h" diff --git a/nuttx/arch/arm/src/c5471/c5471_timerisr.c b/nuttx/arch/arm/src/c5471/c5471_timerisr.c index 81fb24a21..c9ff79055 100644 --- a/nuttx/arch/arm/src/c5471/c5471_timerisr.c +++ b/nuttx/arch/arm/src/c5471/c5471_timerisr.c @@ -43,9 +43,10 @@ #include <debug.h> #include <nuttx/arch.h> +#include "chip.h" +#include "up_arch.h" #include "clock_internal.h" #include "up_internal.h" -#include "up_arch.h" /************************************************************ * Pre-processor Definitions diff --git a/nuttx/arch/arm/src/c5471/c5471_vectors.S b/nuttx/arch/arm/src/c5471/c5471_vectors.S index 0176c8aed..34f9e1b23 100644 --- a/nuttx/arch/arm/src/c5471/c5471_vectors.S +++ b/nuttx/arch/arm/src/c5471/c5471_vectors.S @@ -41,6 +41,7 @@ #include <nuttx/irq.h> #include "arm.h" +#include "chip.h" #include "up_arch.h" /************************************************************************************ diff --git a/nuttx/arch/arm/src/c5471/c5471_watchdog.c b/nuttx/arch/arm/src/c5471/c5471_watchdog.c index 18f7a4352..164cbbe23 100644 --- a/nuttx/arch/arm/src/c5471/c5471_watchdog.c +++ b/nuttx/arch/arm/src/c5471/c5471_watchdog.c @@ -50,6 +50,7 @@ #include <nuttx/irq.h> #include <arch/watchdog.h> +#include "chip.h" #include "up_arch.h" /************************************************************************** diff --git a/nuttx/arch/arm/src/dm320/dm320_usbdev.c b/nuttx/arch/arm/src/dm320/dm320_usbdev.c index 9e8dc5ea1..33049403b 100644 --- a/nuttx/arch/arm/src/dm320/dm320_usbdev.c +++ b/nuttx/arch/arm/src/dm320/dm320_usbdev.c @@ -55,6 +55,7 @@ #include <arch/irq.h> #include <arch/board/board.h> +#include "chip.h" #include "up_arch.h" #include "up_internal.h" #include "dm320_usb.h" |