From 9f1b0571589985f9aaed28f12a0af9c55c56a0c1 Mon Sep 17 00:00:00 2001 From: patacongo Date: Sat, 9 Feb 2013 15:03:49 +0000 Subject: 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 --- nuttx/configs/stm3240g-eval/include/board.h | 2 +- nuttx/configs/stm3240g-eval/src/up_autoleds.c | 2 +- nuttx/configs/stm3240g-eval/src/up_extmem.c | 2 +- nuttx/configs/stm3240g-eval/src/up_lcd.c | 1 - nuttx/configs/stm3240g-eval/src/up_nsh.c | 2 +- nuttx/configs/stm3240g-eval/src/up_spi.c | 2 +- nuttx/configs/stm3240g-eval/src/up_stmpe811.c | 2 +- nuttx/configs/stm3240g-eval/src/up_usb.c | 2 +- nuttx/configs/stm3240g-eval/src/up_userleds.c | 2 +- 9 files changed, 8 insertions(+), 9 deletions(-) (limited to 'nuttx/configs/stm3240g-eval') diff --git a/nuttx/configs/stm3240g-eval/include/board.h b/nuttx/configs/stm3240g-eval/include/board.h index 8fa7d0dd4..f9c8a437c 100644 --- a/nuttx/configs/stm3240g-eval/include/board.h +++ b/nuttx/configs/stm3240g-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 diff --git a/nuttx/configs/stm3240g-eval/src/up_autoleds.c b/nuttx/configs/stm3240g-eval/src/up_autoleds.c index 6c2cba455..8e7f40da3 100644 --- a/nuttx/configs/stm3240g-eval/src/up_autoleds.c +++ b/nuttx/configs/stm3240g-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 "stm3240g-internal.h" #ifdef CONFIG_ARCH_LEDS diff --git a/nuttx/configs/stm3240g-eval/src/up_extmem.c b/nuttx/configs/stm3240g-eval/src/up_extmem.c index a87c07741..e6ccfade2 100644 --- a/nuttx/configs/stm3240g-eval/src/up_extmem.c +++ b/nuttx/configs/stm3240g-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 "stm3240g-internal.h" /************************************************************************************ diff --git a/nuttx/configs/stm3240g-eval/src/up_lcd.c b/nuttx/configs/stm3240g-eval/src/up_lcd.c index 74088dc5e..ff8c174df 100644 --- a/nuttx/configs/stm3240g-eval/src/up_lcd.c +++ b/nuttx/configs/stm3240g-eval/src/up_lcd.c @@ -61,7 +61,6 @@ #include "up_arch.h" #include "stm32.h" -#include "stm32_internal.h" #include "stm3240g-internal.h" #if !defined(CONFIG_STM32_ILI9320_DISABLE) || !defined(CONFIG_STM32_ILI9325_DISABLE) diff --git a/nuttx/configs/stm3240g-eval/src/up_nsh.c b/nuttx/configs/stm3240g-eval/src/up_nsh.c index 596f902db..49d833297 100644 --- a/nuttx/configs/stm3240g-eval/src/up_nsh.c +++ b/nuttx/configs/stm3240g-eval/src/up_nsh.c @@ -59,7 +59,7 @@ # include "stm32_usbhost.h" #endif -#include "stm32_internal.h" +#include "stm32.h" #include "stm3240g-internal.h" /**************************************************************************** diff --git a/nuttx/configs/stm3240g-eval/src/up_spi.c b/nuttx/configs/stm3240g-eval/src/up_spi.c index 3ce9d7e29..e7e8684c1 100644 --- a/nuttx/configs/stm3240g-eval/src/up_spi.c +++ b/nuttx/configs/stm3240g-eval/src/up_spi.c @@ -49,7 +49,7 @@ #include "up_arch.h" #include "chip.h" -#include "stm32_internal.h" +#include "stm32.h" #include "stm3240g-internal.h" #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2) || defined(CONFIG_STM32_SPI3) diff --git a/nuttx/configs/stm3240g-eval/src/up_stmpe811.c b/nuttx/configs/stm3240g-eval/src/up_stmpe811.c index 257c886b9..f7f7adf05 100644 --- a/nuttx/configs/stm3240g-eval/src/up_stmpe811.c +++ b/nuttx/configs/stm3240g-eval/src/up_stmpe811.c @@ -51,7 +51,7 @@ #include -#include "stm32_internal.h" +#include "stm32.h" #include "stm3240g-internal.h" /**************************************************************************** diff --git a/nuttx/configs/stm3240g-eval/src/up_usb.c b/nuttx/configs/stm3240g-eval/src/up_usb.c index bc315a527..776d71a38 100644 --- a/nuttx/configs/stm3240g-eval/src/up_usb.c +++ b/nuttx/configs/stm3240g-eval/src/up_usb.c @@ -52,7 +52,7 @@ #include #include "up_arch.h" -#include "stm32_internal.h" +#include "stm32.h" #include "stm3240g-internal.h" #ifdef CONFIG_STM32_OTGFS diff --git a/nuttx/configs/stm3240g-eval/src/up_userleds.c b/nuttx/configs/stm3240g-eval/src/up_userleds.c index 01c4b36d6..4faf0dfd2 100644 --- a/nuttx/configs/stm3240g-eval/src/up_userleds.c +++ b/nuttx/configs/stm3240g-eval/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 "stm3240g-internal.h" #ifndef CONFIG_ARCH_LEDS -- cgit v1.2.3