From 2437e68d885ae01ad197a5cd838df74c9e6a26cc Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Sat, 7 Dec 2019 10:17:22 -0600
Subject: [PATCH] boards/arm/stm32/nucleo-f4x1re/src:  board.h must always be
 the last header file included.

---
 boards/arm/stm32/nucleo-f4x1re/src/stm32_adc.c      | 3 ++-
 boards/arm/stm32/nucleo-f4x1re/src/stm32_appinit.c  | 4 ++--
 boards/arm/stm32/nucleo-f4x1re/src/stm32_autoleds.c | 3 ++-
 boards/arm/stm32/nucleo-f4x1re/src/stm32_boot.c     | 3 ++-
 boards/arm/stm32/nucleo-f4x1re/src/stm32_bringup.c  | 3 ++-
 boards/arm/stm32/nucleo-f4x1re/src/stm32_buttons.c  | 4 +++-
 boards/arm/stm32/nucleo-f4x1re/src/stm32_qencoder.c | 3 ++-
 boards/arm/stm32/nucleo-f4x1re/src/stm32_spi.c      | 3 ++-
 boards/arm/stm32/nucleo-f4x1re/src/stm32_userleds.c | 3 ++-
 9 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/boards/arm/stm32/nucleo-f4x1re/src/stm32_adc.c b/boards/arm/stm32/nucleo-f4x1re/src/stm32_adc.c
index 97e8ae741f1..e370117c296 100644
--- a/boards/arm/stm32/nucleo-f4x1re/src/stm32_adc.c
+++ b/boards/arm/stm32/nucleo-f4x1re/src/stm32_adc.c
@@ -44,7 +44,6 @@
 
 #include <nuttx/board.h>
 #include <nuttx/analog/adc.h>
-#include <arch/board/board.h>
 
 #include "chip.h"
 #include "up_arch.h"
@@ -52,6 +51,8 @@
 #include "stm32_pwm.h"
 #include "nucleo-f4x1re.h"
 
+#include <arch/board/board.h>
+
 #ifdef CONFIG_STM32_ADC1
 
 /****************************************************************************
diff --git a/boards/arm/stm32/nucleo-f4x1re/src/stm32_appinit.c b/boards/arm/stm32/nucleo-f4x1re/src/stm32_appinit.c
index 6e447afc7e3..249b7494c13 100644
--- a/boards/arm/stm32/nucleo-f4x1re/src/stm32_appinit.c
+++ b/boards/arm/stm32/nucleo-f4x1re/src/stm32_appinit.c
@@ -41,10 +41,10 @@
 
 #include <stdint.h>
 
-#include <nuttx/board.h>
-
 #include "nucleo-f4x1re.h"
 
+#include <nuttx/board.h>
+
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
diff --git a/boards/arm/stm32/nucleo-f4x1re/src/stm32_autoleds.c b/boards/arm/stm32/nucleo-f4x1re/src/stm32_autoleds.c
index 285922b4b42..6c25ced0642 100644
--- a/boards/arm/stm32/nucleo-f4x1re/src/stm32_autoleds.c
+++ b/boards/arm/stm32/nucleo-f4x1re/src/stm32_autoleds.c
@@ -44,7 +44,6 @@
 #include <debug.h>
 
 #include <nuttx/board.h>
-#include <arch/board/board.h>
 
 #include "chip.h"
 #include "up_arch.h"
@@ -52,6 +51,8 @@
 #include "stm32.h"
 #include "nucleo-f4x1re.h"
 
+#include <arch/board/board.h>
+
 #ifdef CONFIG_ARCH_LEDS
 
 /****************************************************************************
diff --git a/boards/arm/stm32/nucleo-f4x1re/src/stm32_boot.c b/boards/arm/stm32/nucleo-f4x1re/src/stm32_boot.c
index 0299924228e..07fb0bdd98b 100644
--- a/boards/arm/stm32/nucleo-f4x1re/src/stm32_boot.c
+++ b/boards/arm/stm32/nucleo-f4x1re/src/stm32_boot.c
@@ -43,7 +43,6 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/board.h>
 #include <nuttx/spi/spi.h>
 
 #include <arch/board/board.h>
@@ -51,6 +50,8 @@
 #include "up_arch.h"
 #include "nucleo-f4x1re.h"
 
+#include <nuttx/board.h>
+
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
diff --git a/boards/arm/stm32/nucleo-f4x1re/src/stm32_bringup.c b/boards/arm/stm32/nucleo-f4x1re/src/stm32_bringup.c
index 7b812e7c321..aaa0e2f0ca0 100644
--- a/boards/arm/stm32/nucleo-f4x1re/src/stm32_bringup.c
+++ b/boards/arm/stm32/nucleo-f4x1re/src/stm32_bringup.c
@@ -44,7 +44,6 @@
 #include <errno.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/board.h>
 #include <nuttx/sdio.h>
 #include <nuttx/mmcsd.h>
 
@@ -55,6 +54,8 @@
 
 #include "nucleo-f4x1re.h"
 
+#include <nuttx/board.h>
+
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
diff --git a/boards/arm/stm32/nucleo-f4x1re/src/stm32_buttons.c b/boards/arm/stm32/nucleo-f4x1re/src/stm32_buttons.c
index a77a6750e7c..93a1bec47ba 100644
--- a/boards/arm/stm32/nucleo-f4x1re/src/stm32_buttons.c
+++ b/boards/arm/stm32/nucleo-f4x1re/src/stm32_buttons.c
@@ -43,11 +43,13 @@
 #include <errno.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/board.h>
 #include <arch/board/board.h>
 
+#include "stm32_gpio.h"
 #include "nucleo-f4x1re.h"
 
+#include <nuttx/board.h>
+
 #ifdef CONFIG_ARCH_BUTTONS
 
 /****************************************************************************
diff --git a/boards/arm/stm32/nucleo-f4x1re/src/stm32_qencoder.c b/boards/arm/stm32/nucleo-f4x1re/src/stm32_qencoder.c
index d8aca4b06a4..aef64c37342 100644
--- a/boards/arm/stm32/nucleo-f4x1re/src/stm32_qencoder.c
+++ b/boards/arm/stm32/nucleo-f4x1re/src/stm32_qencoder.c
@@ -43,13 +43,14 @@
 #include <debug.h>
 
 #include <nuttx/sensors/qencoder.h>
-#include <arch/board/board.h>
 
 #include "chip.h"
 #include "up_arch.h"
 #include "stm32_qencoder.h"
 #include "nucleo-f4x1re.h"
 
+#include <arch/board/board.h>
+
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
diff --git a/boards/arm/stm32/nucleo-f4x1re/src/stm32_spi.c b/boards/arm/stm32/nucleo-f4x1re/src/stm32_spi.c
index 4e82d72a3ac..7d4762fd4bc 100644
--- a/boards/arm/stm32/nucleo-f4x1re/src/stm32_spi.c
+++ b/boards/arm/stm32/nucleo-f4x1re/src/stm32_spi.c
@@ -45,7 +45,6 @@
 #include <errno.h>
 
 #include <nuttx/spi/spi.h>
-#include <arch/board/board.h>
 
 #include "up_arch.h"
 #include "chip.h"
@@ -53,6 +52,8 @@
 
 #include "nucleo-f4x1re.h"
 
+#include <arch/board/board.h>
+
 #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2) || \
     defined(CONFIG_STM32_SPI3)
 
diff --git a/boards/arm/stm32/nucleo-f4x1re/src/stm32_userleds.c b/boards/arm/stm32/nucleo-f4x1re/src/stm32_userleds.c
index 738aa49ff71..5eb688469b9 100644
--- a/boards/arm/stm32/nucleo-f4x1re/src/stm32_userleds.c
+++ b/boards/arm/stm32/nucleo-f4x1re/src/stm32_userleds.c
@@ -43,7 +43,6 @@
 #include <stdbool.h>
 #include <debug.h>
 
-#include <arch/board/board.h>
 #include <nuttx/power/pm.h>
 
 #include "chip.h"
@@ -52,6 +51,8 @@
 #include "stm32.h"
 #include "nucleo-f4x1re.h"
 
+#include <arch/board/board.h>
+
 #ifndef CONFIG_ARCH_LEDS
 
 /****************************************************************************