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

configs/cloudctrl/include/board.h

@@ -48,7 +48,7 @@
 #endif
 #include "stm32_rcc.h"
 #include "stm32_sdio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 
 #include <nuttx/arch.h>
 

configs/cloudctrl/src/up_autoleds.c

@@ -51,7 +51,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "cloudctrl-internal.h"
 
 /****************************************************************************

configs/cloudctrl/src/up_nsh.c

@@ -46,7 +46,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "cloudctrl-internal.h"
 
 /****************************************************************************

configs/cloudctrl/src/up_spi.c

@@ -50,7 +50,7 @@
 
 #include "up_arch.h"
 #include "chip.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "cloudctrl-internal.h"
 
 #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI3)

configs/cloudctrl/src/up_usb.c

@@ -53,7 +53,7 @@
 #include <nuttx/usb/usbdev_trace.h>
 
 #include "up_arch.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "cloudctrl-internal.h"
 
 #ifdef CONFIG_STM32_OTGFS

configs/cloudctrl/src/up_usbmsc.c

@@ -46,7 +46,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include "stm32_internal.h"
+#include "stm32.h"
 
 /****************************************************************************
  * Pre-Processor Definitions

configs/cloudctrl/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 "cloudctrl-internal.h"
 
 #ifndef CONFIG_ARCH_LEDS

configs/fire-stm32v2/include/board.h

@@ -47,7 +47,7 @@
 #endif
 #include "stm32_rcc.h"
 #include "stm32_sdio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 
 /************************************************************************************
  * Definitions

configs/fire-stm32v2/src/up_autoleds.c

@@ -50,7 +50,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "fire-internal.h"
 
 /****************************************************************************

configs/fire-stm32v2/src/up_nsh.c

@@ -45,7 +45,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "fire-internal.h"
 
 /****************************************************************************

configs/fire-stm32v2/src/up_selectlcd.c

@@ -51,7 +51,7 @@
 
 #include "stm32_fsmc.h"
 #include "stm32_gpio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "fire-internal.h"
 
 #ifdef CONFIG_STM32_FSMC

configs/fire-stm32v2/src/up_spi.c

@@ -49,7 +49,7 @@
 
 #include "up_arch.h"
 #include "chip.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "fire-internal.h"
 
 #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2)

configs/fire-stm32v2/src/up_usbdev.c

@@ -49,7 +49,7 @@
 #include <nuttx/usb/usbdev_trace.h>
 
 #include "up_arch.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "fire-internal.h"
 
 /************************************************************************************

configs/fire-stm32v2/src/up_usbmsc.c

@@ -45,7 +45,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include "stm32_internal.h"
+#include "stm32.h"
 
 /****************************************************************************
  * Pre-Processor Definitions

configs/fire-stm32v2/src/up_userleds.c

@@ -49,7 +49,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "fire-internal.h"
 
 #ifndef CONFIG_ARCH_LEDS

configs/hymini-stm32v/include/board.h

@@ -52,7 +52,7 @@
 #endif
 #include "stm32_rcc.h"
 #include "stm32_sdio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 
 /************************************************************************************
  * Definitions

configs/hymini-stm32v/src/ssd1289.c

@@ -51,7 +51,6 @@
 
 #include "up_arch.h"
 #include "stm32.h"
-#include "stm32_internal.h"
 #include "hymini_stm32v-internal.h"
 
 #include "ssd1289.h"

configs/hymini-stm32v/src/up_leds.c

@@ -50,7 +50,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "hymini_stm32v-internal.h"
 
 /****************************************************************************

configs/hymini-stm32v/src/up_nsh.c

@@ -55,7 +55,7 @@
 #  include <nuttx/mmcsd.h>
 #endif
 
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "hymini_stm32v-internal.h"
 
 /****************************************************************************

configs/hymini-stm32v/src/up_spi.c

@@ -50,7 +50,7 @@
 
 #include "up_arch.h"
 #include "chip.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "hymini_stm32v-internal.h"
 
 #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2)

configs/hymini-stm32v/src/up_ts.c

@@ -43,7 +43,6 @@
 #include <debug.h>
 
 #include "stm32.h"
-#include "stm32_internal.h"
 #include "hymini_stm32v-internal.h"
 
 #include <nuttx/input/touchscreen.h>

configs/hymini-stm32v/src/up_usbdev.c

@@ -49,7 +49,7 @@
 #include <nuttx/usb/usbdev_trace.h>
 
 #include "up_arch.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "hymini_stm32v-internal.h"
 
 /************************************************************************************

configs/hymini-stm32v/src/up_usbmsc.c

@@ -48,7 +48,7 @@
 #include <nuttx/sdio.h>
 #include <nuttx/mmcsd.h>
 
-#include "stm32_internal.h"
+#include "stm32.h"
 
 /* There is nothing to do here if SDIO support is not selected. */
 

configs/olimex-stm32-p107/include/board.h

@@ -47,7 +47,7 @@
 #endif
 #include "stm32_rcc.h"
 #include "stm32_sdio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 
 /************************************************************************************
  * Pre-processor Definitions

configs/shenzhou/include/board.h

@@ -47,7 +47,7 @@
 #endif
 #include "stm32_rcc.h"
 #include "stm32_sdio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 
 #include <nuttx/arch.h>
 

configs/shenzhou/src/up_autoleds.c

@@ -50,7 +50,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "shenzhou-internal.h"
 
 /****************************************************************************

configs/shenzhou/src/up_ili93xx.c

@@ -128,7 +128,6 @@
 
 #include "up_arch.h"
 #include "stm32.h"
-#include "stm32_internal.h"
 #include "shenzhou-internal.h"
 
 /************************************************************************************

configs/shenzhou/src/up_nsh.c

@@ -45,7 +45,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "shenzhou-internal.h"
 
 /****************************************************************************

configs/shenzhou/src/up_spi.c

@@ -49,7 +49,7 @@
 
 #include "up_arch.h"
 #include "chip.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "shenzhou-internal.h"
 
 #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI3)

configs/shenzhou/src/up_ssd1289.c

@@ -59,7 +59,6 @@
 
 #include "up_arch.h"
 #include "stm32.h"
-#include "stm32_internal.h"
 #include "shenzhou-internal.h"
 
 #ifdef CONFIG_LCD_SSD1289

configs/shenzhou/src/up_touchscreen.c

@@ -51,7 +51,7 @@
 #include <nuttx/input/touchscreen.h>
 #include <nuttx/input/ads7843e.h>
 
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "shenzhou-internal.h"
 
 /****************************************************************************

configs/shenzhou/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 "shenshou-internal.h"
 
 #ifdef CONFIG_STM32_OTGFS

configs/shenzhou/src/up_usbmsc.c

@@ -45,7 +45,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include "stm32_internal.h"
+#include "stm32.h"
 
 /****************************************************************************
  * Pre-Processor Definitions

configs/shenzhou/src/up_userleds.c

@@ -49,7 +49,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "shenzhou-internal.h"
 
 #ifndef CONFIG_ARCH_LEDS

configs/stm3210e-eval/include/board.h

@@ -47,7 +47,7 @@
 #endif
 #include "stm32_rcc.h"
 #include "stm32_sdio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 
 /************************************************************************************
  * Definitions

configs/stm3210e-eval/src/up_composite.c

@@ -49,7 +49,7 @@
 #include <nuttx/mmcsd.h>
 #include <nuttx/usb/composite.h>
 
-#include "stm32_internal.h"
+#include "stm32.h"
 
 /* There is nothing to do here if SDIO support is not selected. */
 

configs/stm3210e-eval/src/up_extmem.c

@@ -51,7 +51,7 @@
 
 #include "stm32_fsmc.h"
 #include "stm32_gpio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm3210e-internal.h"
 
 /************************************************************************************

configs/stm3210e-eval/src/up_lcd.c

@@ -76,7 +76,6 @@
 
 #include "up_arch.h"
 #include "stm32.h"
-#include "stm32_internal.h"
 #include "stm3210e-internal.h"
 
 /**************************************************************************************

configs/stm3210e-eval/src/up_leds.c

@@ -50,7 +50,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm3210e-internal.h"
 
 /****************************************************************************

configs/stm3210e-eval/src/up_nsh.c

@@ -55,7 +55,7 @@
 #  include <nuttx/mmcsd.h>
 #endif
 
-#include "stm32_internal.h"
+#include "stm32.h"
 
 /****************************************************************************
  * Pre-Processor Definitions

configs/stm3210e-eval/src/up_spi.c

@@ -49,7 +49,7 @@
 
 #include "up_arch.h"
 #include "chip.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm3210e-internal.h"
 
 #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2)

configs/stm3210e-eval/src/up_usbdev.c

@@ -49,7 +49,7 @@
 #include <nuttx/usb/usbdev_trace.h>
 
 #include "up_arch.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm3210e-internal.h"
 
 /************************************************************************************

configs/stm3210e-eval/src/up_usbmsc.c

@@ -48,7 +48,7 @@
 #include <nuttx/sdio.h>
 #include <nuttx/mmcsd.h>
 
-#include "stm32_internal.h"
+#include "stm32.h"
 
 /* There is nothing to do here if SDIO support is not selected. */
 

configs/stm3220g-eval/include/board.h

@@ -49,7 +49,7 @@
 
 #include "stm32_rcc.h"
 #include "stm32_sdio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 
 /************************************************************************************
  * Definitions

configs/stm3220g-eval/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 "stm3220g-internal.h"
 
 #ifdef CONFIG_ARCH_LEDS

configs/stm3220g-eval/src/up_extmem.c

@@ -51,7 +51,7 @@
 
 #include "stm32_fsmc.h"
 #include "stm32_gpio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm3220g-internal.h"
 
 /************************************************************************************

configs/stm3220g-eval/src/up_lcd.c

@@ -61,7 +61,6 @@
 
 #include "up_arch.h"
 #include "stm32.h"
-#include "stm32_internal.h"
 #include "stm3220g-internal.h"
 
 #if !defined(CONFIG_STM32_ILI9320_DISABLE) || !defined(CONFIG_STM32_ILI9325_DISABLE)

configs/stm3220g-eval/src/up_nsh.c

@@ -59,7 +59,7 @@
 #  include "stm32_usbhost.h"
 #endif
 
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm3220g-internal.h"
 
 /****************************************************************************

configs/stm3220g-eval/src/up_spi.c

@@ -49,7 +49,7 @@
 
 #include "up_arch.h"
 #include "chip.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm3220g-internal.h"
 
 #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2) || defined(CONFIG_STM32_SPI3)

configs/stm3220g-eval/src/up_stmpe811.c

@@ -51,7 +51,7 @@
 
 #include <arch/irq.h>
 
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm3220g-internal.h"
 
 /****************************************************************************