Removed stm32_internal.h; Changes for clean compile of STM32F3Discovery configuration with SPI and USB

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

9 files changed, 9 insertions, 10 deletions

diff --git a/nuttx/configs/stm32f4discovery/include/board.h b/nuttx/configs/stm32f4discovery/include/board.h
index 6171c3e40..793592b0b 100644
--- a/nuttx/configs/stm32f4discovery/include/board.h
+++ b/nuttx/configs/stm32f4discovery/include/board.h
@@ -49,7 +49,7 @@
 
 #include "stm32_rcc.h"
 #include "stm32_sdio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 
 /************************************************************************************
  * Definitions
diff --git a/nuttx/configs/stm32f4discovery/src/up_autoleds.c b/nuttx/configs/stm32f4discovery/src/up_autoleds.c
index e38d2f3b1..c72a54a02 100644
--- a/nuttx/configs/stm32f4discovery/src/up_autoleds.c
+++ b/nuttx/configs/stm32f4discovery/src/up_autoleds.c
@@ -49,7 +49,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm32f4discovery-internal.h"
 
 #ifdef CONFIG_ARCH_LEDS
diff --git a/nuttx/configs/stm32f4discovery/src/up_boot.c b/nuttx/configs/stm32f4discovery/src/up_boot.c
index 3e9b7242d..51ec4b977 100644
--- a/nuttx/configs/stm32f4discovery/src/up_boot.c
+++ b/nuttx/configs/stm32f4discovery/src/up_boot.c
@@ -84,8 +84,8 @@ void stm32_boardinitialize(void)
 
   /* Initialize USB if the 1) OTG FS controller is in the configuration and 2)
    * disabled, and 3) the weak function stm32_usbinitialize() has been brought 
-   * the weak function stm32_usbinitialize() has been brought into the build.
-   * Presumeably either CONFIG_USBDEV or CONFIG_USBHOST is also selected.
+   * into the build. Presumeably either CONFIG_USBDEV or CONFIG_USBHOST is also
+   * selected.
    */
 
 #ifdef CONFIG_STM32_OTGFS
diff --git a/nuttx/configs/stm32f4discovery/src/up_extmem.c b/nuttx/configs/stm32f4discovery/src/up_extmem.c
index 083321578..f58d567e2 100644
--- a/nuttx/configs/stm32f4discovery/src/up_extmem.c
+++ b/nuttx/configs/stm32f4discovery/src/up_extmem.c
@@ -51,7 +51,7 @@
 
 #include "stm32_fsmc.h"
 #include "stm32_gpio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm32f4discovery-internal.h"
 
 /************************************************************************************
diff --git a/nuttx/configs/stm32f4discovery/src/up_nsh.c b/nuttx/configs/stm32f4discovery/src/up_nsh.c
index 565aac724..2e78a58d8 100644
--- a/nuttx/configs/stm32f4discovery/src/up_nsh.c
+++ b/nuttx/configs/stm32f4discovery/src/up_nsh.c
@@ -58,7 +58,7 @@
 #  include "stm32_usbhost.h"
 #endif
 
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm32f4discovery-internal.h"
 
 /****************************************************************************
diff --git a/nuttx/configs/stm32f4discovery/src/up_spi.c b/nuttx/configs/stm32f4discovery/src/up_spi.c
index 5b812d50c..d51a6d3d4 100644
--- a/nuttx/configs/stm32f4discovery/src/up_spi.c
+++ b/nuttx/configs/stm32f4discovery/src/up_spi.c
@@ -50,7 +50,7 @@
 
 #include "up_arch.h"
 #include "chip.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm32f4discovery-internal.h"
 
 #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2) || defined(CONFIG_STM32_SPI3)
diff --git a/nuttx/configs/stm32f4discovery/src/up_ssd1289.c b/nuttx/configs/stm32f4discovery/src/up_ssd1289.c
index 4d5a4ab7a..6eab054d3 100644
--- a/nuttx/configs/stm32f4discovery/src/up_ssd1289.c
+++ b/nuttx/configs/stm32f4discovery/src/up_ssd1289.c
@@ -59,7 +59,6 @@
 
 #include "up_arch.h"
 #include "stm32.h"
-#include "stm32_internal.h"
 #include "stm32f4discovery-internal.h"
 
 #ifdef CONFIG_LCD_SSD1289
diff --git a/nuttx/configs/stm32f4discovery/src/up_usb.c b/nuttx/configs/stm32f4discovery/src/up_usb.c
index 653dd9a88..b06f587f3 100644
--- a/nuttx/configs/stm32f4discovery/src/up_usb.c
+++ b/nuttx/configs/stm32f4discovery/src/up_usb.c
@@ -52,7 +52,7 @@
 #include <nuttx/usb/usbdev_trace.h>
 
 #include "up_arch.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm32f4discovery-internal.h"
 
 #ifdef CONFIG_STM32_OTGFS
diff --git a/nuttx/configs/stm32f4discovery/src/up_userleds.c b/nuttx/configs/stm32f4discovery/src/up_userleds.c
index 173c12696..5981a12e6 100644
--- a/nuttx/configs/stm32f4discovery/src/up_userleds.c
+++ b/nuttx/configs/stm32f4discovery/src/up_userleds.c
@@ -50,7 +50,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm32f4discovery-internal.h"
 
 #ifndef CONFIG_ARCH_LEDS