diff --git a/configs/cc3200-launchpad/src/cc3200_leds.c b/configs/cc3200-launchpad/src/cc3200_leds.c
index e72a8098f5..94091341e2 100644
--- a/configs/cc3200-launchpad/src/cc3200_leds.c
+++ b/configs/cc3200-launchpad/src/cc3200_leds.c
@@ -7,12 +7,12 @@
 #include <debug.h>
 
 #include <arch/board/board.h>
+#include <arch/board/cc3200_utils.h>
 #include <chip/cc3200_memorymap.h>
 
 #include "up_arch.h"
 
 #include "cc3200_launchpad.h"
-#include "cc3200_utils.h"
 
 #define LED1_GPIO              9
 #define LED2_GPIO              10
@@ -153,4 +153,4 @@ void cc3200_ledoff(int led)
 	break;
 
     }
-}
\ No newline at end of file
+}
diff --git a/configs/cc3200-launchpad/src/cc3200_utils.c b/configs/cc3200-launchpad/src/cc3200_utils.c
index 69fcaa2d54..8e6d57c0c1 100644
--- a/configs/cc3200-launchpad/src/cc3200_utils.c
+++ b/configs/cc3200-launchpad/src/cc3200_utils.c
@@ -43,8 +43,6 @@
 #include "nuttx/arch.h"
 #include "up_arch.h"
 
-#include "cc3200_utils.h"
-
 /************************************************************************************
  * Private Data
  ************************************************************************************/
diff --git a/configs/kwikstik-k40/src/kwikstik-internal.h b/configs/kwikstik-k40/src/kwikstik-internal.h
index 14ece24781..149a9b767a 100644
--- a/configs/kwikstik-k40/src/kwikstik-internal.h
+++ b/configs/kwikstik-k40/src/kwikstik-internal.h
@@ -44,6 +44,7 @@
 #include <nuttx/config.h>
 #include <nuttx/compiler.h>
 #include <stdint.h>
+#include <arch/kinetis/chip.h>
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/configs/mikroe-stm32f4/src/stm32_mio283qt2.c b/configs/mikroe-stm32f4/src/stm32_mio283qt2.c
index 859be4425c..b4ef1d7669 100644
--- a/configs/mikroe-stm32f4/src/stm32_mio283qt2.c
+++ b/configs/mikroe-stm32f4/src/stm32_mio283qt2.c
@@ -147,7 +147,7 @@ struct stm32f4_dev_s
 static void stm32_select(FAR struct mio283qt2_lcd_s *dev);
 static void stm32_deselect(FAR struct mio283qt2_lcd_s *dev);
 static void stm32_index(FAR struct mio283qt2_lcd_s *dev, uint8_t index);
-#if !defined(CONFIG_MIO283QT2_WRONLY) && CONFIG_LCD_NOGETRUN != 1
+#if !defined(CONFIG_MIO283QT2_WRONLY) && !defined(CONFIG_LCD_NOGETRUN)
 static uint16_t stm32_read(FAR struct mio283qt2_lcd_s *dev);
 #endif
 static void stm32_write(FAR struct mio283qt2_lcd_s *dev, uint16_t data);
@@ -165,7 +165,7 @@ static struct stm32f4_dev_s g_stm32f4_lcd =
     .select    = stm32_select,
     .deselect  = stm32_deselect,
     .index     = stm32_index,
-#if !defined(CONFIG_MIO283QT2_WRONLY) && CONFIG_LCD_NOGETRUN != 1
+#if !defined(CONFIG_MIO283QT2_WRONLY) && !defined(CONFIG_LCD_NOGETRUN)
     .read      = stm32_read,
 #endif
     .write     = stm32_write,
@@ -308,7 +308,7 @@ static void stm32_index(FAR struct mio283qt2_lcd_s *dev, uint8_t index)
  *
  **************************************************************************************/
 
-#if !defined(CONFIG_MIO283QT2_WRONLY) && CONFIG_LCD_NOGETRUN != 1
+#if !defined(CONFIG_MIO283QT2_WRONLY) && !defined(CONFIG_LCD_NOGETRUN)
 static uint16_t stm32_read(FAR struct mio283qt2_lcd_s *dev)
 {
   FAR struct stm32f4_dev_s *priv = (FAR struct stm32f4_dev_s *)dev;
diff --git a/configs/mikroe-stm32f4/src/stm32_mio283qt9a.c b/configs/mikroe-stm32f4/src/stm32_mio283qt9a.c
index 7ef040f869..38e03e859c 100644
--- a/configs/mikroe-stm32f4/src/stm32_mio283qt9a.c
+++ b/configs/mikroe-stm32f4/src/stm32_mio283qt9a.c
@@ -148,7 +148,7 @@ struct stm32f4_dev_s
 static void stm32_select(FAR struct mio283qt9a_lcd_s *dev);
 static void stm32_deselect(FAR struct mio283qt9a_lcd_s *dev);
 static void stm32_index(FAR struct mio283qt9a_lcd_s *dev, uint8_t index);
-#if !defined(CONFIG_MIO283QT2_WRONLY) && CONFIG_LCD_NOGETRUN != 1
+#if !defined(CONFIG_MIO283QT2_WRONLY) && !defined(CONFIG_LCD_NOGETRUN)
 static uint16_t stm32_read(FAR struct mio283qt9a_lcd_s *dev);
 #endif
 static void stm32_write(FAR struct mio283qt9a_lcd_s *dev, uint16_t data);
@@ -166,7 +166,7 @@ static struct stm32f4_dev_s g_stm32f4_lcd =
     .select    = stm32_select,
     .deselect  = stm32_deselect,
     .index     = stm32_index,
-#if !defined(CONFIG_MIO283QT2_WRONLY) && CONFIG_LCD_NOGETRUN != 1
+#if !defined(CONFIG_MIO283QT2_WRONLY) && !defined(CONFIG_LCD_NOGETRUN)
     .read      = stm32_read,
 #endif
     .write     = stm32_write,
@@ -309,7 +309,7 @@ static void stm32_index(FAR struct mio283qt9a_lcd_s *dev, uint8_t index)
  *
  **************************************************************************************/
 
-#if !defined(CONFIG_MIO283QT2_WRONLY) && CONFIG_LCD_NOGETRUN != 1
+#if !defined(CONFIG_MIO283QT2_WRONLY) && !defined(CONFIG_LCD_NOGETRUN)
 static uint16_t stm32_read(FAR struct mio283qt9a_lcd_s *dev)
 {
   FAR struct stm32f4_dev_s *priv = (FAR struct stm32f4_dev_s *)dev;
diff --git a/configs/olimexino-stm32/tiny/defconfig b/configs/olimexino-stm32/tiny/defconfig
index 797ff61618..457e1b0e92 100644
--- a/configs/olimexino-stm32/tiny/defconfig
+++ b/configs/olimexino-stm32/tiny/defconfig
@@ -412,6 +412,9 @@ CONFIG_ARCH_HAVE_RAMVECTORS=y
 #
 CONFIG_BOARD_LOOPSPERMSEC=5483
 # CONFIG_ARCH_CALIBRATION is not set
+CONFIG_LIB_BOARDCTL=y
+CONFIG_BOARDCTL_CANINIT=y
+
 
 #
 # Interrupt options
diff --git a/configs/stm3220g-eval/dhcpd/defconfig b/configs/stm3220g-eval/dhcpd/defconfig
index 56019ef275..a4c05c99b6 100644
--- a/configs/stm3220g-eval/dhcpd/defconfig
+++ b/configs/stm3220g-eval/dhcpd/defconfig
@@ -602,6 +602,7 @@ CONFIG_NET_ICMP=y
 # CONFIG_NET_IGMP is not set
 # CONFIG_NET_STATISTICS is not set
 CONFIG_NET_ETH_TCP_RECVWNDO=536
+CONFIG_NET_ARP=y
 CONFIG_NET_ARPTAB_SIZE=16
 # CONFIG_NET_ARP_IPIN is not set
 
diff --git a/configs/stm32f429i-disco/include/board.h b/configs/stm32f429i-disco/include/board.h
index 08e7d4ca6b..9c0418ca34 100644
--- a/configs/stm32f429i-disco/include/board.h
+++ b/configs/stm32f429i-disco/include/board.h
@@ -295,6 +295,7 @@
 # define BOARD_LTDC_HEIGHT              320
 #endif
 
+#define BOARD_LTDC_OUTPUT_BPP           16
 #define BOARD_LTDC_HFP                  10
 #define BOARD_LTDC_HBP                  20
 #define BOARD_LTDC_VFP                  4
diff --git a/configs/stm32f4discovery/src/stm32_idle.c b/configs/stm32f4discovery/src/stm32_idle.c
index 40af29c5ee..3b7de2b0e9 100644
--- a/configs/stm32f4discovery/src/stm32_idle.c
+++ b/configs/stm32f4discovery/src/stm32_idle.c
@@ -88,7 +88,7 @@
  * Private Data
  ****************************************************************************/
 
-#if defined(CONFIG_PM) && defined(CONFIG_RTC_ALARM)
+#if 0 /* Not used */
 static void up_alarmcb(void);
 #endif
 
@@ -107,9 +107,6 @@ static void up_alarmcb(void);
 #ifdef CONFIG_PM
 static void stm32_idlepm(void)
 {
-#ifdef CONFIG_RTC_ALARM
-  struct timespec alarmtime;
-#endif
   static enum pm_state_e oldstate = PM_NORMAL;
   enum pm_state_e newstate;
   irqstate_t flags;
@@ -229,7 +226,7 @@ errout:
  *
  ************************************************************************************/
 
-#if defined(CONFIG_PM) && defined(CONFIG_RTC_ALARM)
+#if 0 /* Not used */
 static void up_alarmcb(void)
 {
   /* This alarm occurs because there wasn't any EXTI interrupt during the
diff --git a/configs/teensy-3.x/src/teensy-3x.h b/configs/teensy-3.x/src/teensy-3x.h
index 6f94a66015..d62beddc52 100644
--- a/configs/teensy-3.x/src/teensy-3x.h
+++ b/configs/teensy-3.x/src/teensy-3x.h
@@ -43,6 +43,7 @@
 #include <nuttx/config.h>
 #include <nuttx/compiler.h>
 #include <stdint.h>
+#include <arch/kinetis/chip.h>
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/configs/twr-k60n512/src/twrk60-internal.h b/configs/twr-k60n512/src/twrk60-internal.h
index 006682bbcf..06b4d7f91b 100644
--- a/configs/twr-k60n512/src/twrk60-internal.h
+++ b/configs/twr-k60n512/src/twrk60-internal.h
@@ -43,6 +43,7 @@
 #include <nuttx/config.h>
 #include <nuttx/compiler.h>
 #include <stdint.h>
+#include <arch/kinetis/chip.h>
 
 /************************************************************************************
  * Pre-processor Definitions