diff --git a/arch/arm/src/imx/imx_allocateheap.c b/arch/arm/src/imx/imx_allocateheap.c
index a9ba6800f4b9ddc20276a7ece67f58d6d6e0b533..1574cac00775cee83a43847dc56f8798e2caa792 100644
--- a/arch/arm/src/imx/imx_allocateheap.c
+++ b/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/arch/arm/src/imx/imx_boot.c b/arch/arm/src/imx/imx_boot.c
index 4979d77605318c4903e5e24fa4a848c35b299fc6..842050e154420a1e9e6fa92f2e8cf8cd0580d42d 100644
--- a/arch/arm/src/imx/imx_boot.c
+++ b/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/arch/arm/src/imx/imx_decodeirq.c b/arch/arm/src/imx/imx_decodeirq.c
index 4657d18da18f4d51641736767a75a58405d24853..96a40fd4a7dccc05669115664b9e59f15d3ea84c 100644
--- a/arch/arm/src/imx/imx_decodeirq.c
+++ b/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/arch/arm/src/imx/imx_gpio.c b/arch/arm/src/imx/imx_gpio.c
index 9ca86e12071cc9f491de7f7a2c8e74bf43d517ff..f6099310f63c8705853dbb9c18a3b2f7a3d64b44 100644
--- a/arch/arm/src/imx/imx_gpio.c
+++ b/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/arch/arm/src/imx/imx_irq.c b/arch/arm/src/imx/imx_irq.c
index 2793438ed1c854596436cf6af294f02a78734701..b346064c54fb853fd6b10b2d5c1a3ce38ff0df58 100644
--- a/arch/arm/src/imx/imx_irq.c
+++ b/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/arch/arm/src/imx/imx_lowputc.S b/arch/arm/src/imx/imx_lowputc.S
index e146c5bec75c7a118134eaa2893134ec7a364e0c..c00955622088b7133d20b90b3786339102fc7571 100644
--- a/arch/arm/src/imx/imx_lowputc.S
+++ b/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/arch/arm/src/imx/imx_serial.c b/arch/arm/src/imx/imx_serial.c
index 5a03a70bb1469c144e8707e5d6df0009258e4c8d..984f516497c134c1998dbb73568d79ab258108f8 100644
--- a/arch/arm/src/imx/imx_serial.c
+++ b/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/arch/arm/src/imx/imx_spi.c b/arch/arm/src/imx/imx_spi.c
index 5f065f8866689b4a45473cda22fa9e9891063aab..0a7ca9af0662f2461c34aefe1cf38929d17f1967 100755
--- a/arch/arm/src/imx/imx_spi.c
+++ b/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/arch/arm/src/imx/imx_timerisr.c b/arch/arm/src/imx/imx_timerisr.c
index 74429ef5ec6cb885aa8235c87a904b9c795ae513..30367e97c00d1fca3249c69d85a4df74ed4400ca 100644
--- a/arch/arm/src/imx/imx_timerisr.c
+++ b/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