diff --git a/Documentation/README.html b/Documentation/README.html index bf1a205a52..e3e6a7fd51 100644 --- a/Documentation/README.html +++ b/Documentation/README.html @@ -134,8 +134,8 @@ | | |- ntosd-dm320/ | | | |- doc/README.txt | | | `- README.txt - | | |- nucleo-f401re/ - | | | `- README.txt + | | |- nucleo-f4x1re/ + | | | `- README.txt | | |- nucleus2g/ | | | `- README.txt | | |- nutiny-nuc120/ diff --git a/README.txt b/README.txt index 248ee08296..5208badcd6 100644 --- a/README.txt +++ b/README.txt @@ -1015,7 +1015,7 @@ nuttx | |- ntosd-dm320/ | | |- doc/README.txt | | `- README.txt - | |- nucleo-f401re/ + | |- nucleo-f4x1re/ | | `- README.txt | |- nucleus2g/ | | `- README.txt diff --git a/configs/Kconfig b/configs/Kconfig index a3d9d5d96c..8104c8705e 100755 --- a/configs/Kconfig +++ b/configs/Kconfig @@ -1008,7 +1008,7 @@ config ARCH_BOARD default "pic32mx7mmb" if ARCH_BOARD_PIC32MX7MMB default "pirelli_dpl10" if ARCH_BOARD_PIRELLI_DPL10 default "px4fmu-v2_upstream" if ARCH_BOARD_PX4FMU_V2 - default "nucleo-f401re" if ARCH_BOARD_NUCLEO_F401RE || ARCH_BOARD_NUCLEO_F411RE + default "nucleo-f4x1re" if ARCH_BOARD_NUCLEO_F401RE || ARCH_BOARD_NUCLEO_F411RE default "qemu-i486" if ARCH_BOARD_QEMU_I486 default "rgmp" if ARCH_BOARD_RGMP default "sama5d3x-ek" if ARCH_BOARD_SAMA5D3X_EK @@ -1251,8 +1251,8 @@ endif if ARCH_BOARD_PIRELLI_DPL10 source "configs/pirelli_dpl10/Kconfig" endif -if ARCH_BOARD_NUCLEO_F401RE -source "configs/nucleo-f401re/Kconfig" +if ARCH_BOARD_NUCLEO_F401RE || ARCH_BOARD_NUCLEO_F411RE +source "configs/nucleo-f4x1re/Kconfig" endif if ARCH_BOARD_PX4FMU_V2 source "configs/px4fmu-v2_upstream/Kconfig" diff --git a/configs/README.txt b/configs/README.txt index 0f56b99cfd..3f7e4ae979 100644 --- a/configs/README.txt +++ b/configs/README.txt @@ -330,7 +330,7 @@ configs/ntosd-dm320 STATUS: This port is code complete, verified, and included in the NuttX 0.2.1 release. -configs/nucleo-f401re +configs/nucleo-f4x1re STMicro ST Nucleo F401RE and F411RE boards. See http://mbed.org/platforms/ST-Nucleo-F401RE and http://developer.mbed.org/platforms/ST-Nucleo-F411RE for more diff --git a/configs/nucleo-f401re/Kconfig b/configs/nucleo-f4x1re/Kconfig similarity index 100% rename from configs/nucleo-f401re/Kconfig rename to configs/nucleo-f4x1re/Kconfig diff --git a/configs/nucleo-f401re/README.txt b/configs/nucleo-f4x1re/README.txt similarity index 97% rename from configs/nucleo-f401re/README.txt rename to configs/nucleo-f4x1re/README.txt index a6cb71e54b..f701e6b67c 100644 --- a/configs/nucleo-f401re/README.txt +++ b/configs/nucleo-f4x1re/README.txt @@ -20,7 +20,9 @@ NucleoF411RE: Microprocessor: 32-bit ARM Cortex M4 at 100MHz STM32F411RE Memory: 512 KB Flash and 128 KB SRAM -Other board features are identical: +The NucleoF411RE also has additional DMA and SPI peripheral capabilities. + +Board features, however, are identical: I/O Pins Out: 37, 17 On the Connector ADCs: 1 (at 12-bit resolution) @@ -207,11 +209,11 @@ NuttX EABI "buildroot" Toolchain 1. You must have already configured Nuttx in /nuttx. - $ (cd tools; ./configure.sh nucleo-f401re/f401-nsh) + $ (cd tools; ./configure.sh nucleo-f4x1re/f401-nsh) $ make qconfig $ V=1 make context all 2>&1 | tee mout - use the f411-nsh configuration if you have the Nucleo-F411RE board. + Use the f411-nsh configuration if you have the Nucleo-F411RE board. 2. Download the latest buildroot package into @@ -315,7 +317,7 @@ Hardware LEDs ---- - The Nucleo F401RE and Nucleo F401RE provide a single user LED, LD2. LD2 + The Nucleo F401RE and Nucleo F411RE provide a single user LED, LD2. LD2 is the green LED connected to Arduino signal D13 corresponding to MCU I/O PA5 (pin 21) or PB13 (pin 34) depending on the STM32target. @@ -360,7 +362,7 @@ Serial Consoles TTL to RS-232 converter connection: - Nucleo CN10 STM32F401RE + Nucleo CN10 STM32F4x1RE ----------- ------------ Pin 21 PA9 USART2_RX Pin 33 PA10 USART2_TX @@ -392,7 +394,7 @@ Serial Consoles TTL to RS-232 converter connection: - Nucleo CN9 STM32F401RE + Nucleo CN9 STM32F4x1RE ----------- ------------ Pin 1 PA3 USART2_RX Pin 2 PA2 USART2_TX @@ -470,7 +472,7 @@ Shields RS-232 from Cutedigi.com. Supports a single RS-232 connected via - Nucleo CN9 STM32F401RE Cutedigi + Nucleo CN9 STM32F4x1RE Cutedigi ----------- ------------ -------- Pin 1 PA3 USART2_RX RXD Pin 2 PA2 USART2_TX TXD @@ -511,7 +513,7 @@ Configurations Consoles). I have been using a TTL-to-RS-232 converted connected as shown below: - Nucleo CN10 STM32F401RE + Nucleo CN10 STM32F4x1RE ----------- ------------ Pin 21 PA9 USART2_RX Pin 33 PA10 USART2_TX diff --git a/configs/nucleo-f401re/f401-nsh/Make.defs b/configs/nucleo-f4x1re/f401-nsh/Make.defs similarity index 99% rename from configs/nucleo-f401re/f401-nsh/Make.defs rename to configs/nucleo-f4x1re/f401-nsh/Make.defs index 8f5ae76fbd..529325ee81 100644 --- a/configs/nucleo-f401re/f401-nsh/Make.defs +++ b/configs/nucleo-f4x1re/f401-nsh/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# configs/nucleo-f401re/f401-nsh/Make.defs +# configs/nucleo-f4x1re/f401-nsh/Make.defs # # Copyright (C) 2014 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/configs/nucleo-f401re/f401-nsh/defconfig b/configs/nucleo-f4x1re/f401-nsh/defconfig similarity index 99% rename from configs/nucleo-f401re/f401-nsh/defconfig rename to configs/nucleo-f4x1re/f401-nsh/defconfig index ea3bc72105..ba0a19c667 100644 --- a/configs/nucleo-f401re/f401-nsh/defconfig +++ b/configs/nucleo-f4x1re/f401-nsh/defconfig @@ -385,7 +385,7 @@ CONFIG_RAM_SIZE=98304 # CONFIG_ARCH_BOARD_NUCLEO_F401RE=y # CONFIG_ARCH_BOARD_CUSTOM is not set -CONFIG_ARCH_BOARD="nucleo-f401re" +CONFIG_ARCH_BOARD="nucleo-f4x1re" # # Common Board Options diff --git a/configs/nucleo-f401re/f401-nsh/setenv.sh b/configs/nucleo-f4x1re/f401-nsh/setenv.sh similarity index 98% rename from configs/nucleo-f401re/f401-nsh/setenv.sh rename to configs/nucleo-f4x1re/f401-nsh/setenv.sh index 5bc75d41da..4608ee3d4e 100644 --- a/configs/nucleo-f401re/f401-nsh/setenv.sh +++ b/configs/nucleo-f4x1re/f401-nsh/setenv.sh @@ -1,5 +1,5 @@ #!/bin/bash -# configs/nucleo-f401re/f401nsh/setenv.sh +# configs/nucleo-f4x1re/f401nsh/setenv.sh # # Copyright (C) 2014 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/configs/nucleo-f401re/f411-nsh/Make.defs b/configs/nucleo-f4x1re/f411-nsh/Make.defs similarity index 99% rename from configs/nucleo-f401re/f411-nsh/Make.defs rename to configs/nucleo-f4x1re/f411-nsh/Make.defs index a626670384..2c488f47ea 100755 --- a/configs/nucleo-f401re/f411-nsh/Make.defs +++ b/configs/nucleo-f4x1re/f411-nsh/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# configs/nucleo-f410re/f411-nsh/Make.defs +# configs/nucleo-f4x1re/f411-nsh/Make.defs # # Copyright (C) 2014 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/configs/nucleo-f401re/f411-nsh/defconfig b/configs/nucleo-f4x1re/f411-nsh/defconfig similarity index 99% rename from configs/nucleo-f401re/f411-nsh/defconfig rename to configs/nucleo-f4x1re/f411-nsh/defconfig index 67654b6265..7b438c986e 100755 --- a/configs/nucleo-f401re/f411-nsh/defconfig +++ b/configs/nucleo-f4x1re/f411-nsh/defconfig @@ -385,7 +385,7 @@ CONFIG_RAM_SIZE=131072 # CONFIG_ARCH_BOARD_NUCLEO_F411RE=y # CONFIG_ARCH_BOARD_CUSTOM is not set -CONFIG_ARCH_BOARD="nucleo-f401re" +CONFIG_ARCH_BOARD="nucleo-f4x1re" # # Common Board Options diff --git a/configs/nucleo-f401re/f411-nsh/setenv.sh b/configs/nucleo-f4x1re/f411-nsh/setenv.sh similarity index 98% rename from configs/nucleo-f401re/f411-nsh/setenv.sh rename to configs/nucleo-f4x1re/f411-nsh/setenv.sh index ad9fa4ee25..e102562e27 100755 --- a/configs/nucleo-f401re/f411-nsh/setenv.sh +++ b/configs/nucleo-f4x1re/f411-nsh/setenv.sh @@ -1,5 +1,5 @@ #!/bin/bash -# configs/nucleo-f401re/f411-nsh/setenv.sh +# configs/nucleo-f4x1re/f411-nsh/setenv.sh # # Copyright (C) 2014 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/configs/nucleo-f401re/include/board.h b/configs/nucleo-f4x1re/include/board.h similarity index 99% rename from configs/nucleo-f401re/include/board.h rename to configs/nucleo-f4x1re/include/board.h index 95558489e9..145f0377f9 100644 --- a/configs/nucleo-f401re/include/board.h +++ b/configs/nucleo-f4x1re/include/board.h @@ -1,5 +1,5 @@ /************************************************************************************ - * configs/nucleo-f401re/include/board.h + * configs/nucleo-f4x1re/include/board.h * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/nucleo-f401re/include/nucleo-f401re.h b/configs/nucleo-f4x1re/include/nucleo-f401re.h similarity index 99% rename from configs/nucleo-f401re/include/nucleo-f401re.h rename to configs/nucleo-f4x1re/include/nucleo-f401re.h index 17e8ddd266..581c154e70 100644 --- a/configs/nucleo-f401re/include/nucleo-f401re.h +++ b/configs/nucleo-f4x1re/include/nucleo-f401re.h @@ -1,5 +1,5 @@ /************************************************************************************ - * configs/nucleo-f401re/include/nucleo-f401re.h + * configs/nucleo-f4x1re/include/nucleo-f401re.h * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/nucleo-f401re/include/nucleo-f411re.h b/configs/nucleo-f4x1re/include/nucleo-f411re.h similarity index 99% rename from configs/nucleo-f401re/include/nucleo-f411re.h rename to configs/nucleo-f4x1re/include/nucleo-f411re.h index e257100ac6..84018f7d4b 100644 --- a/configs/nucleo-f401re/include/nucleo-f411re.h +++ b/configs/nucleo-f4x1re/include/nucleo-f411re.h @@ -1,5 +1,5 @@ /************************************************************************************ - * configs/nucleo-f401re/include/nucleo-f411re.h + * configs/nucleo-f4x1re/include/nucleo-f411re.h * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/nucleo-f401re/scripts/f401re.ld b/configs/nucleo-f4x1re/scripts/f401re.ld similarity index 98% rename from configs/nucleo-f401re/scripts/f401re.ld rename to configs/nucleo-f4x1re/scripts/f401re.ld index 6c914c553d..0fdf32397a 100644 --- a/configs/nucleo-f401re/scripts/f401re.ld +++ b/configs/nucleo-f4x1re/scripts/f401re.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/nucleo-f401re/scripts/f401re.ld + * configs/nucleo-f4x1re/scripts/f401re.ld * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/nucleo-f401re/scripts/f411re.ld b/configs/nucleo-f4x1re/scripts/f411re.ld similarity index 98% rename from configs/nucleo-f401re/scripts/f411re.ld rename to configs/nucleo-f4x1re/scripts/f411re.ld index 182ae08982..865cae4885 100755 --- a/configs/nucleo-f401re/scripts/f411re.ld +++ b/configs/nucleo-f4x1re/scripts/f411re.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/nucleo-f411re/scripts/f411re.ld + * configs/nucleo-f4x1re/scripts/f411re.ld * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/nucleo-f401re/src/Makefile b/configs/nucleo-f4x1re/src/Makefile similarity index 98% rename from configs/nucleo-f401re/src/Makefile rename to configs/nucleo-f4x1re/src/Makefile index 66c0a83bf8..60a6aa0b68 100644 --- a/configs/nucleo-f401re/src/Makefile +++ b/configs/nucleo-f4x1re/src/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# configs/nucleo-f401re/src/Makefile +# configs/nucleo-f4x1re/src/Makefile # # Copyright (C) 2014 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/configs/nucleo-f401re/src/nucleo-f401re.h b/configs/nucleo-f4x1re/src/nucleo-f4x1re.h similarity index 99% rename from configs/nucleo-f401re/src/nucleo-f401re.h rename to configs/nucleo-f4x1re/src/nucleo-f4x1re.h index 32a14dff9a..1d99e7d359 100644 --- a/configs/nucleo-f401re/src/nucleo-f401re.h +++ b/configs/nucleo-f4x1re/src/nucleo-f4x1re.h @@ -1,5 +1,5 @@ /************************************************************************************ - * configs/nucleo-f401re/src/nucleo-f401re.h + * configs/nucleo-f4x1re/src/nucleo-f4x1re.h * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Authors: Frank Bennett diff --git a/configs/nucleo-f401re/src/stm32_autoleds.c b/configs/nucleo-f4x1re/src/stm32_autoleds.c similarity index 98% rename from configs/nucleo-f401re/src/stm32_autoleds.c rename to configs/nucleo-f4x1re/src/stm32_autoleds.c index 6d80551e44..323f6a8600 100644 --- a/configs/nucleo-f401re/src/stm32_autoleds.c +++ b/configs/nucleo-f4x1re/src/stm32_autoleds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/nucleo-f401re/src/stm32_autoleds.c + * configs/nucleo-f4x1re/src/stm32_autoleds.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -49,7 +49,7 @@ #include "up_arch.h" #include "up_internal.h" #include "stm32.h" -#include "nucleo-f401re.h" +#include "nucleo-f4x1re.h" #ifdef CONFIG_ARCH_LEDS diff --git a/configs/nucleo-f401re/src/stm32_boot.c b/configs/nucleo-f4x1re/src/stm32_boot.c similarity index 98% rename from configs/nucleo-f401re/src/stm32_boot.c rename to configs/nucleo-f4x1re/src/stm32_boot.c index 28766791ed..92f17e4892 100644 --- a/configs/nucleo-f401re/src/stm32_boot.c +++ b/configs/nucleo-f4x1re/src/stm32_boot.c @@ -1,5 +1,5 @@ /************************************************************************************ - * configs/nucleo-f401re/src/stm32_boot.c + * configs/nucleo-f4x1re/src/stm32_boot.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -48,7 +48,7 @@ #include #include "up_arch.h" -#include "nucleo-f401re.h" +#include "nucleo-f4x1re.h" /************************************************************************************ * Pre-processor Definitions diff --git a/configs/nucleo-f401re/src/stm32_buttons.c b/configs/nucleo-f4x1re/src/stm32_buttons.c similarity index 98% rename from configs/nucleo-f401re/src/stm32_buttons.c rename to configs/nucleo-f4x1re/src/stm32_buttons.c index e4ced37680..4375d23d00 100644 --- a/configs/nucleo-f401re/src/stm32_buttons.c +++ b/configs/nucleo-f4x1re/src/stm32_buttons.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/nucleo-f401re/src/stm32_buttons.c + * configs/nucleo-f4x1re/src/stm32_buttons.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -44,7 +44,7 @@ #include #include -#include "nucleo-f401re.h" +#include "nucleo-f4x1re.h" #ifdef CONFIG_ARCH_BUTTONS diff --git a/configs/nucleo-f401re/src/stm32_cxxinitialize.c b/configs/nucleo-f4x1re/src/stm32_cxxinitialize.c similarity index 99% rename from configs/nucleo-f401re/src/stm32_cxxinitialize.c rename to configs/nucleo-f4x1re/src/stm32_cxxinitialize.c index ed1a4d9684..9f5d924143 100644 --- a/configs/nucleo-f401re/src/stm32_cxxinitialize.c +++ b/configs/nucleo-f4x1re/src/stm32_cxxinitialize.c @@ -1,5 +1,5 @@ /************************************************************************************ - * configs/nucleo-f401re/src/stm32_cxxinitialize.c + * configs/nucleo-f4x1re/src/stm32_cxxinitialize.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/nucleo-f401re/src/stm32_io.c b/configs/nucleo-f4x1re/src/stm32_io.c similarity index 98% rename from configs/nucleo-f401re/src/stm32_io.c rename to configs/nucleo-f4x1re/src/stm32_io.c index 520d4af827..72563330d6 100644 --- a/configs/nucleo-f401re/src/stm32_io.c +++ b/configs/nucleo-f4x1re/src/stm32_io.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/nucleo-f401re/src/stm32_io.c + * configs/nucleo-f4x1re/src/stm32_io.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -44,7 +44,7 @@ #include #include "chip/stm32_tim.h" -#include "nucleo-f401re.h" +#include "nucleo-f4x1re.h" #ifndef CONFIG_CC3000_PROBES diff --git a/configs/nucleo-f401re/src/stm32_nsh.c b/configs/nucleo-f4x1re/src/stm32_nsh.c similarity index 98% rename from configs/nucleo-f401re/src/stm32_nsh.c rename to configs/nucleo-f4x1re/src/stm32_nsh.c index 43aef2c59e..458c87988e 100644 --- a/configs/nucleo-f401re/src/stm32_nsh.c +++ b/configs/nucleo-f4x1re/src/stm32_nsh.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/nucleo-f401re/src/stm32_nsh.c + * configs/nucleo-f4x1re/src/stm32_nsh.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -52,7 +52,7 @@ #include -#include "nucleo-f401re.h" +#include "nucleo-f4x1re.h" /**************************************************************************** * Pre-Processor Definitions diff --git a/configs/nucleo-f401re/src/stm32_spi.c b/configs/nucleo-f4x1re/src/stm32_spi.c similarity index 99% rename from configs/nucleo-f401re/src/stm32_spi.c rename to configs/nucleo-f4x1re/src/stm32_spi.c index 66d3a04b35..b080169034 100644 --- a/configs/nucleo-f401re/src/stm32_spi.c +++ b/configs/nucleo-f4x1re/src/stm32_spi.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/nucleo-f401re/src/stm32_spi.c + * configs/nucleo-f4x1re/src/stm32_spi.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -50,7 +50,7 @@ #include #include -#include "nucleo-f401re.h" +#include "nucleo-f4x1re.h" #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2) || defined(CONFIG_STM32_SPI3) diff --git a/configs/nucleo-f401re/src/stm32_userleds.c b/configs/nucleo-f4x1re/src/stm32_userleds.c similarity index 98% rename from configs/nucleo-f401re/src/stm32_userleds.c rename to configs/nucleo-f4x1re/src/stm32_userleds.c index c79790583b..5ebd3ce2cc 100644 --- a/configs/nucleo-f401re/src/stm32_userleds.c +++ b/configs/nucleo-f4x1re/src/stm32_userleds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/nucleo-f401re/src/stm32_userleds.c + * configs/nucleo-f4x1re/src/stm32_userleds.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -50,7 +50,7 @@ #include "up_arch.h" #include "up_internal.h" #include "stm32.h" -#include "nucleo-f401re.h" +#include "nucleo-f4x1re.h" #ifndef CONFIG_ARCH_LEDS diff --git a/configs/nucleo-f401re/src/stm32_wireless.c b/configs/nucleo-f4x1re/src/stm32_wireless.c similarity index 99% rename from configs/nucleo-f401re/src/stm32_wireless.c rename to configs/nucleo-f4x1re/src/stm32_wireless.c index cf58094437..9191679557 100644 --- a/configs/nucleo-f401re/src/stm32_wireless.c +++ b/configs/nucleo-f4x1re/src/stm32_wireless.c @@ -1,5 +1,5 @@ /************************************************************************************ - * configs/nucleo-f401re/src/stm32_wireless.c + * configs/nucleo-f4x1re/src/stm32_wireless.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Laurent Latil @@ -52,7 +52,7 @@ #include #include "stm32.h" -#include "nucleo-f401re.h" +#include "nucleo-f4x1re.h" /**************************************************************************** * Pre-Processor Definitions