Fixes for recent header file reorganization

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2448 42af7a65-404d-4744-a932-0658087f49c3

9 files changed, 24 insertions, 2 deletions

diff --git a/nuttx/arch/arm/src/imx/imx_allocateheap.c b/nuttx/arch/arm/src/imx/imx_allocateheap.c
index a9ba6800f..1574cac00 100644
--- a/nuttx/arch/arm/src/imx/imx_allocateheap.c
+++ b/nuttx/arch/arm/src/imx/imx_allocateheap.c
@@ -48,6 +48,7 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
+#include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
 
diff --git a/nuttx/arch/arm/src/imx/imx_boot.c b/nuttx/arch/arm/src/imx/imx_boot.c
index 4979d7760..842050e15 100644
--- a/nuttx/arch/arm/src/imx/imx_boot.c
+++ b/nuttx/arch/arm/src/imx/imx_boot.c
@@ -41,6 +41,7 @@
 #include <nuttx/config.h>
 #include <stdint.h>
 
+#include "chip.h"
 #include "up_internal.h"
 #include "up_arch.h"
 
@@ -210,4 +211,15 @@ void up_boot(void)
   /* Perform board-specific initialiation */
 
   imx_boardinitialize();
+
+  /* Set up the board-specific LEDs */
+
+#ifdef CONFIG_ARCH_LEDS
+  up_ledinit();
+#endif
+  /* Perform early serial initialization */
+
+#ifdef CONFIG_USE_EARLYSERIALINIT
+  up_earlyserialinit();
+#endif
 }
diff --git a/nuttx/arch/arm/src/imx/imx_decodeirq.c b/nuttx/arch/arm/src/imx/imx_decodeirq.c
index 4657d18da..96a40fd4a 100644
--- a/nuttx/arch/arm/src/imx/imx_decodeirq.c
+++ b/nuttx/arch/arm/src/imx/imx_decodeirq.c
@@ -46,6 +46,7 @@
 #include <assert.h>
 #include <debug.h>
 
+#include "chip.h"
 #include "up_arch.h"
 #include "os_internal.h"
 #include "up_internal.h"
diff --git a/nuttx/arch/arm/src/imx/imx_gpio.c b/nuttx/arch/arm/src/imx/imx_gpio.c
index 9ca86e120..f6099310f 100644
--- a/nuttx/arch/arm/src/imx/imx_gpio.c
+++ b/nuttx/arch/arm/src/imx/imx_gpio.c
@@ -40,6 +40,7 @@
 
 #include <nuttx/config.h>
 
+#include "chip.h"
 #include "up_arch.h"
 #include "imx_gpio.h"
 
diff --git a/nuttx/arch/arm/src/imx/imx_irq.c b/nuttx/arch/arm/src/imx/imx_irq.c
index 2793438ed..b346064c5 100644
--- a/nuttx/arch/arm/src/imx/imx_irq.c
+++ b/nuttx/arch/arm/src/imx/imx_irq.c
@@ -43,6 +43,7 @@
 #include <stdint.h>
 #include <nuttx/irq.h>
 
+#include "chip.h"
 #include "up_arch.h"
 #include "os_internal.h"
 #include "up_internal.h"
diff --git a/nuttx/arch/arm/src/imx/imx_lowputc.S b/nuttx/arch/arm/src/imx/imx_lowputc.S
index e146c5bec..c00955622 100644
--- a/nuttx/arch/arm/src/imx/imx_lowputc.S
+++ b/nuttx/arch/arm/src/imx/imx_lowputc.S
@@ -39,6 +39,8 @@
  **************************************************************************/
 
 #include <nuttx/config.h>
+
+#include "chip.h"
 #include "up_internal.h"
 #include "up_arch.h"
 
diff --git a/nuttx/arch/arm/src/imx/imx_serial.c b/nuttx/arch/arm/src/imx/imx_serial.c
index 5a03a70bb..984f51649 100644
--- a/nuttx/arch/arm/src/imx/imx_serial.c
+++ b/nuttx/arch/arm/src/imx/imx_serial.c
@@ -53,7 +53,9 @@
 #include <nuttx/arch.h>
 #include <nuttx/serial.h>
 #include <arch/serial.h>
+#include <arch/board/board.h>
 
+#include "chip.h"
 #include "up_arch.h"
 #include "imx_gpio.h"
 #include "os_internal.h"
diff --git a/nuttx/arch/arm/src/imx/imx_spi.c b/nuttx/arch/arm/src/imx/imx_spi.c
index 5f065f886..0a7ca9af0 100755
--- a/nuttx/arch/arm/src/imx/imx_spi.c
+++ b/nuttx/arch/arm/src/imx/imx_spi.c
@@ -332,7 +332,7 @@ static void spi_rxnull(struct imx_spidev_s *priv)
   (void)spi_getreg(priv, CSPI_RXD_OFFSET);
 }
 
-static voidspi_rxuint16(struct imx_spidev_s *priv)
+static void spi_rxuint16(struct imx_spidev_s *priv)
 {
   uint16_t *ptr = (uint16_t*)priv->rxbuffer;
   *ptr++ = (uint16_t)spi_getreg(priv, CSPI_TXD_OFFSET);
diff --git a/nuttx/arch/arm/src/imx/imx_timerisr.c b/nuttx/arch/arm/src/imx/imx_timerisr.c
index 74429ef5e..30367e97c 100644
--- a/nuttx/arch/arm/src/imx/imx_timerisr.c
+++ b/nuttx/arch/arm/src/imx/imx_timerisr.c
@@ -44,10 +44,12 @@
 #include <debug.h>
 #include <errno.h>
 #include <nuttx/arch.h>
+#include <arch/board/board.h>
 
+#include "chip.h"
+#include "up_arch.h"
 #include "clock_internal.h"
 #include "up_internal.h"
-#include "up_arch.h"
 
 /****************************************************************************
  * Pre-processor Definitions