From ad34a38d135671c1dba07172709b5a04e918dd4d Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Mon, 28 Dec 2009 23:24:45 +0000
Subject: [PATCH] Fixes for recent header file reorganization

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2449 42af7a65-404d-4744-a932-0658087f49c3
---
 arch/arm/src/arm/up_doirq.c         |  2 ++
 arch/arm/src/arm/up_head.S          | 13 +------------
 arch/arm/src/c5471/c5471_irq.c      |  1 +
 arch/arm/src/c5471/c5471_lowputc.S  |  4 +++-
 arch/arm/src/c5471/c5471_serial.c   |  1 +
 arch/arm/src/c5471/c5471_timerisr.c |  3 ++-
 arch/arm/src/c5471/c5471_vectors.S  |  1 +
 arch/arm/src/c5471/c5471_watchdog.c |  1 +
 arch/arm/src/dm320/dm320_usbdev.c   |  1 +
 9 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/arch/arm/src/arm/up_doirq.c b/arch/arm/src/arm/up_doirq.c
index bc3fa2d675..5c127b75c4 100644
--- a/arch/arm/src/arm/up_doirq.c
+++ b/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/arch/arm/src/arm/up_head.S b/arch/arm/src/arm/up_head.S
index 5b420fc668..33d00366c6 100644
--- a/arch/arm/src/arm/up_head.S
+++ b/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/arch/arm/src/c5471/c5471_irq.c b/arch/arm/src/c5471/c5471_irq.c
index 27e1784692..6906e8f8dc 100644
--- a/arch/arm/src/c5471/c5471_irq.c
+++ b/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/arch/arm/src/c5471/c5471_lowputc.S b/arch/arm/src/c5471/c5471_lowputc.S
index 4e949cf351..096742a700 100644
--- a/arch/arm/src/c5471/c5471_lowputc.S
+++ b/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/arch/arm/src/c5471/c5471_serial.c b/arch/arm/src/c5471/c5471_serial.c
index 6e3d52c672..020210d313 100644
--- a/arch/arm/src/c5471/c5471_serial.c
+++ b/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/arch/arm/src/c5471/c5471_timerisr.c b/arch/arm/src/c5471/c5471_timerisr.c
index 81fb24a219..c9ff790556 100644
--- a/arch/arm/src/c5471/c5471_timerisr.c
+++ b/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/arch/arm/src/c5471/c5471_vectors.S b/arch/arm/src/c5471/c5471_vectors.S
index 0176c8aedd..34f9e1b237 100644
--- a/arch/arm/src/c5471/c5471_vectors.S
+++ b/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/arch/arm/src/c5471/c5471_watchdog.c b/arch/arm/src/c5471/c5471_watchdog.c
index 18f7a43528..164cbbe236 100644
--- a/arch/arm/src/c5471/c5471_watchdog.c
+++ b/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/arch/arm/src/dm320/dm320_usbdev.c b/arch/arm/src/dm320/dm320_usbdev.c
index 9e8dc5ea1e..33049403b2 100644
--- a/arch/arm/src/dm320/dm320_usbdev.c
+++ b/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"