Simple renames as a first step to a separate board config

This commit is contained in:
Titus von Boxberg 2017-07-14 22:35:28 +02:00
parent 80effadf6a
commit 08225bbb55
21 changed files with 72 additions and 72 deletions

View File

@ -3,6 +3,6 @@
# see the file kconfig-language.txt in the NuttX tools repository.
#
if ARCH_BOARD_STM32F746G_DISCO
if ARCH_BOARD_STM32F769I_DISCO
endif # ARCH_BOARD_STM32F746G_DISCO
endif # ARCH_BOARD_STM32F769I_DISCO

View File

@ -2,8 +2,8 @@ README
======
This README discusses issues unique to NuttX configurations for the
STMicro STM32F746G-DISCO development board featuring the STM32F746NGH6
MCU. The STM32F746NGH6 is a 216MHz Cortex-M7 operation with 1024Kb Flash
STMicro STM32F769I-DISCO development board featuring the STM32F769NIH6
MCU. The STM32F769NIH6 is a 216MHz Cortex-M7 operation with 1024Kb Flash
memory and 300Kb SRAM. The board features:
- On-board ST-LINK/V2 for programming and debugging,
@ -25,7 +25,7 @@ memory and 300Kb SRAM. The board features:
- Ethernet connector compliant with IEEE-802.3-2002
Refer to the http://www.st.com website for further information about this
board (search keyword: stm32f746g-disco)
board (search keyword: stm32f769i-disco)
Contents
========
@ -36,7 +36,7 @@ Contents
- Serial Console
- Porting STM32 F4 Drivers
- FPU
- STM32F746G-DISCO-specific Configuration Options
- STM32F769I-DISCO-specific Configuration Options
- Configurations
STATUS
@ -52,17 +52,17 @@ STATUS
Development Environment
=======================
The Development environments for the STM32F746G-DISCO board are identical
The Development environments for the STM32F769I-DISCO board are identical
to the environments for other STM32F boards. For full details on the
environment options and setup, see the README.txt file in the
config/stm32f746g-disco directory.
config/stm32f769i-disco directory.
LEDs and Buttons
================
LEDs
----
The STM32F746G-DISCO board has numerous LEDs but only one, LD1 located
The STM32F769I-DISCO board has numerous LEDs but only one, LD1 located
near the reset button, that can be controlled by software (LD2 is a power
indicator, LD3-6 indicate USB status, LD7 is controlled by the ST-Link).
@ -112,7 +112,7 @@ Serial Console
Porting STM32 F4 Drivers
========================
The STM32F746 is very similar to the STM32 F429 and many of the drivers
The STM32F769 is very similar to the STM32 F429 and many of the drivers
in the stm32/ directory could be ported here: ADC, BBSRAM, CAN, DAC,
DMA2D, FLASH, I2C, IWDG, LSE, LSI, LTDC, OTGFS, OTGHS, PM, Quadrature
Encoder, RNG, RTCC, SDMMC (was SDIO), Timer/counters, and WWDG.
@ -178,7 +178,7 @@ There are two version of the FPU support built into the STM32 port.
+ENTRY(__start) /* Treat __start as the anchor for dead code stripping */
+EXTERN(_vectors) /* Force the vectors to be included in the output */
STM32F746G-DISCO-specific Configuration Options
STM32F769I-DISCO-specific Configuration Options
===============================================
CONFIG_ARCH - Identifies the arch/ subdirectory. This should
@ -201,7 +201,7 @@ STM32F746G-DISCO-specific Configuration Options
CONFIG_ARCH_CHIP_name - For use in C code to identify the exact
chip:
CONFIG_ARCH_CHIP_STM32F746=y
CONFIG_ARCH_CHIP_STM32F769=y
CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG - Enables special STM32 clock
configuration features.
@ -211,11 +211,11 @@ STM32F746G-DISCO-specific Configuration Options
CONFIG_ARCH_BOARD - Identifies the configs/ subdirectory and,
hence, the board that supports the particular chip or SoC.
CONFIG_ARCH_BOARD=stm32f746g-disco (for the STM32F746G-DISCO development board)
CONFIG_ARCH_BOARD=stm32f769i-disco (for the STM32F769I-DISCO development board)
CONFIG_ARCH_BOARD_name - For use in C code
CONFIG_ARCH_BOARD_STM32F746G_DISCO=y
CONFIG_ARCH_BOARD_STM32F769I_DISCO=y
CONFIG_ARCH_LOOPSPERMSEC - Must be calibrated for correct operation
of delay loops
@ -249,7 +249,7 @@ STM32F746G-DISCO-specific Configuration Options
CONFIG_HEAP2_SIZE - The size of the SRAM in the FSMC address space (decimal)
CONFIG_ARCH_FPU - The STM32F746G-DISCO supports a floating point unit (FPU)
CONFIG_ARCH_FPU - The STM32F769I-DISCO supports a floating point unit (FPU)
CONFIG_ARCH_FPU=y
@ -379,7 +379,7 @@ STM32F746G-DISCO-specific Configuration Options
each of the four channels with different duty cycles. That capability is
not supported by this driver: Only one output channel per timer.
STM32F746G-DISCO specific device driver settings
STM32F769I-DISCO specific device driver settings
CONFIG_U[S]ARTn_SERIAL_CONSOLE - selects the USARTn (n=1,2,3) or UART
m (m=4,5) for the console and ttys0 (default is the USART1).
@ -392,7 +392,7 @@ STM32F746G-DISCO-specific Configuration Options
CONFIG_U[S]ARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity
CONFIG_U[S]ARTn_2STOP - Two stop bits
STM32F746G-DISCO CAN Configuration
STM32F769I-DISCO CAN Configuration
CONFIG_CAN - Enables CAN support (one or both of CONFIG_STM32F7_CAN1 or
CONFIG_STM32F7_CAN2 must also be defined)
@ -411,7 +411,7 @@ STM32F746G-DISCO-specific Configuration Options
CONFIG_STM32_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an
dump of all CAN registers.
STM32F746G-DISCO SPI Configuration
STM32F769I-DISCO SPI Configuration
CONFIG_STM32F7_SPI_INTERRUPTS - Select to enable interrupt driven SPI
support. Non-interrupt-driven, poll-waiting is recommended if the
@ -419,7 +419,7 @@ STM32F746G-DISCO-specific Configuration Options
CONFIG_STM32F7_SPI_DMA - Use DMA to improve SPI transfer performance.
Cannot be used with CONFIG_STM32F7_SPI_INTERRUPT.
STM32F746G-DISCO DMA Configuration
STM32F769I-DISCO DMA Configuration
CONFIG_SDIO_DMA - Support DMA data transfers. Requires CONFIG_STM32F7_SDIO
and CONFIG_STM32F7_DMA2.
@ -459,11 +459,11 @@ Configurations
Common Configuration Information
--------------------------------
Each STM32F746G-DISCO configuration is maintained in a sub-directory and
Each STM32F769I-DISCO configuration is maintained in a sub-directory and
can be selected as follow:
cd tools
./configure.sh stm32f746g-disco/<subdir>
./configure.sh stm32f769i-disco/<subdir>
cd -
Where <subdir> is one of the sub-directories listed below.

View File

@ -1,5 +1,5 @@
/************************************************************************************
* configs/stm32f746g-disco/include/board.h
* configs/stm32f769i-disco/include/board.h
*
* Copyright (C) 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __CONFIG_STM32F746G_DISCO_INCLUDE_BOARD_H
#define __CONFIG_STM32F746G_DISCO_INCLUDE_BOARD_H
#ifndef __CONFIG_STM32F769I_DISCO_INCLUDE_BOARD_H
#define __CONFIG_STM32F769I_DISCO_INCLUDE_BOARD_H
/************************************************************************************
* Included Files
@ -59,8 +59,8 @@
/* The STM32F7 Discovery board provides the following clock sources:
*
* X1: 24 MHz oscillator for USB OTG HS PHY and camera module (daughter board)
* X2: 25 MHz oscillator for STM32F746NGH6 microcontroller and Ethernet PHY.
* X3: 32.768 KHz crystal for STM32F746NGH6 embedded RTC
* X2: 25 MHz oscillator for STM32F769NIH6 microcontroller and Ethernet PHY.
* X3: 32.768 KHz crystal for STM32F769NIH6 embedded RTC
*
* So we have these clock source available within the STM32
*
@ -259,7 +259,7 @@
#define BOARD_FLASH_WAITSTATES 7
/* LED definitions ******************************************************************/
/* The STM32F746G-DISCO board has numerous LEDs but only one, LD1 located near the
/* The STM32F769I-DISCO board has numerous LEDs but only one, LD1 located near the
* reset button, that can be controlled by software (LD2 is a power indicator, LD3-6
* indicate USB status, LD7 is controlled by the ST-Link).
*
@ -400,4 +400,4 @@ void stm32_boardinitialize(void);
#endif
#endif /* __ASSEMBLY__ */
#endif /* __CONFIG_STM32F746G_DISCO_INCLUDE_BOARD_H */
#endif /* __CONFIG_STM32F769I_DISCO_INCLUDE_BOARD_H */

View File

@ -1,5 +1,5 @@
############################################################################
# configs/stm32f746g-disco/kernel/Makefile
# configs/stm32f769i-disco/kernel/Makefile
#
# Copyright (C) 2015 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/****************************************************************************
* configs/stm32f746g-disco/kernel/stm32_userspace.c
* configs/stm32f769i-disco/kernel/stm32_userspace.c
*
* Copyright (C) 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

8
configs/stm32f769i-disco/nsh/defconfig Normal file → Executable file
View File

@ -1,11 +1,11 @@
# CONFIG_ARCH_FPU is not set
# CONFIG_NSH_DISABLE_IFCONFIG is not set
# CONFIG_NSH_DISABLE_PS is not set
CONFIG_ARCH_BOARD_STM32F746G_DISCO=y
CONFIG_ARCH_BOARD="stm32f746g-disco"
CONFIG_ARCH_BOARD_STM32F769I_DISCO=y
CONFIG_ARCH_BOARD="stm32f769i-disco"
CONFIG_ARCH_BUTTONS=y
CONFIG_ARCH_CHIP_STM32F7=y
CONFIG_ARCH_CHIP_STM32F746NG=y
CONFIG_ARCH_CHIP_STM32F769NI=y
CONFIG_ARCH_STACKDUMP=y
CONFIG_ARCH="arm"
CONFIG_ARMV7M_DCACHE_WRITETHROUGH=y
@ -21,7 +21,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
CONFIG_EXAMPLES_NSH=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HOST_WINDOWS=y
CONFIG_HOST_LINUX=y
CONFIG_INTELHEX_BINARY=y
CONFIG_MAX_TASKS=16
CONFIG_MAX_WDOGPARMS=2

View File

@ -1,5 +1,5 @@
############################################################################
# configs/stm32f746g-disco/scripts/Make.defs
# configs/stm32f769i-disco/scripts/Make.defs
#
# Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/****************************************************************************
* configs/stm32f746g-disco/scripts/flash.ld
* configs/stm32f769i-disco/scripts/flash.ld
*
* Copyright (C) 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -35,14 +35,14 @@
*
****************************************************************************/
/* The STM32F746NGH6 has 1024Kb of main FLASH memory. This FLASH memory can
/* The STM32F769NIH6 has 1024Kb of main FLASH memory. This FLASH memory can
* be accessed from either the AXIM interface at address 0x0800:0000 or from
* the ITCM interface at address 0x0020:0000.
*
* Additional information, including the option bytes, is available at at
* FLASH at address 0x1ff0:0000 (AXIM) or 0x0010:0000 (ITCM).
*
* In the STM32F746NGH6, two different boot spaces can be selected through
* In the STM32F769NIH6, two different boot spaces can be selected through
* the BOOT pin and the boot base address programmed in the BOOT_ADD0 and
* BOOT_ADD1 option bytes:
*
@ -51,11 +51,11 @@
* 2) BOOT=1: Boot address defined by user option byte BOOT_ADD1[15:0].
* ST programmed value: System bootloader at 0x0010:0000
*
* NuttX does not modify these option byes. On the unmodified STM32F746G
* NuttX does not modify these option byes. On the unmodified STM32F769I
* DISCO board, the BOOT0 pin is at ground so by default, the STM32 will boot
* to address 0x0020:0000 in ITCM FLASH.
*
* The STM32F746NGH6 also has 320Kb of data SRAM (in addition to ITCM SRAM).
* The STM32F769NIH6 also has 320Kb of data SRAM (in addition to ITCM SRAM).
* SRAM is split up into three blocks:
*
* 1) 64Kb of DTCM SRM beginning at address 0x2000:0000

View File

@ -1,5 +1,5 @@
/****************************************************************************
* configs/stm32f746g-disco/scripts/kernel-space.ld
* configs/stm32f769i-disco/scripts/kernel-space.ld
*
* Copyright (C) 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/****************************************************************************
* configs/stm32f746g-disco/scripts/memory.ld
* configs/stm32f769i-disco/scripts/memory.ld
*
* Copyright (C) 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,14 +33,14 @@
*
****************************************************************************/
/* The STM32F746NGH6 has 1024Kb of main FLASH memory. This FLASH memory can
/* The STM32F769NIH6 has 1024Kb of main FLASH memory. This FLASH memory can
* be accessed from either the AXIM interface at address 0x0800:0000 or from
* the ITCM interface at address 0x0020:0000.
*
* Additional information, including the option bytes, is available at at
* FLASH at address 0x1ff0:0000 (AXIM) or 0x0010:0000 (ITCM).
*
* In the STM32F746NGH6, two different boot spaces can be selected through
* In the STM32F769NIH6, two different boot spaces can be selected through
* the BOOT pin and the boot base address programmed in the BOOT_ADD0 and
* BOOT_ADD1 option bytes:
*
@ -49,11 +49,11 @@
* 2) BOOT=1: Boot address defined by user option byte BOOT_ADD1[15:0].
* ST programmed value: System bootloader at 0x0010:0000
*
* NuttX does not modify these option byes. On the unmodified STM32F746G
* NuttX does not modify these option byes. On the unmodified STM32F769I
* DISCO board, the BOOT0 pin is at ground so by default, the STM32 will boot
* to address 0x0020:0000 in ITCM FLASH.
*
* The STM32F746NGH6 also has 320Kb of data SRAM (in addition to ITCM SRAM).
* The STM32F769NIH6 also has 320Kb of data SRAM (in addition to ITCM SRAM).
* SRAM is split up into three blocks:
*
* 1) 64Kb of DTCM SRM beginning at address 0x2000:0000
@ -67,7 +67,7 @@
* For MPU support, the kernel-mode NuttX section is assumed to be 128Kb of
* FLASH and 4Kb of SRAM. That is an excessive amount for the kernel which
* should fit into 64KB and, of course, can be optimized as needed (See
* also configs/stm32f746g-disco/scripts/kernel-space.ld). Allowing the
* also configs/stm32f769i-disco/scripts/kernel-space.ld). Allowing the
* additional does permit addition debug instrumentation to be added to the
* kernel space without overflowing the partition.
*

View File

@ -1,5 +1,5 @@
/****************************************************************************
* configs/stm32f746g-disco/scripts/user-space.ld
* configs/stm32f769i-disco/scripts/user-space.ld
*
* Copyright (C) 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
############################################################################
# configs/stm32f746g-disco/src/Makefile
# configs/stm32f769i-disco/src/Makefile
#
# Copyright (C) 2015 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/****************************************************************************
* config/stm32f746g-disco/src/stm32_appinitilaize.c
* config/stm32f769i-disco/src/stm32_appinitilaize.c
*
* Copyright (C) 2015-2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -40,7 +40,7 @@
#include <nuttx/config.h>
#include "stm32_ccm.h"
#include "stm32f746g-disco.h"
#include "stm32f769i-disco.h"
/****************************************************************************
* Public Functions

View File

@ -1,5 +1,5 @@
/****************************************************************************
* configs/stm32f746g-disco/src/stm32_autoleds.c
* configs/stm32f769i-disco/src/stm32_autoleds.c
*
* Copyright (C) 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -45,7 +45,7 @@
#include <nuttx/board.h>
#include "stm32_gpio.h"
#include "stm32f746g-disco.h"
#include "stm32f769i-disco.h"
#ifdef CONFIG_ARCH_LEDS

View File

@ -1,5 +1,5 @@
/************************************************************************************
* configs/stm32f746g-disco/src/stm32_boot.c
* configs/stm32f769i-disco/src/stm32_boot.c
*
* Copyright (C) 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -45,7 +45,7 @@
#include <arch/board/board.h>
#include "up_arch.h"
#include "stm32f746g-disco.h"
#include "stm32f769i-disco.h"
/************************************************************************************
* Pre-processor Definitions

View File

@ -1,5 +1,5 @@
/****************************************************************************
* configs/stm32f746g-disco/src/stm32_buttons.c
* configs/stm32f769i-disco/src/stm32_buttons.c
*
* Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -45,7 +45,7 @@
#include <nuttx/board.h>
#include "stm32_gpio.h"
#include "stm32f746g-disco.h"
#include "stm32f769i-disco.h"
#ifdef CONFIG_ARCH_BUTTONS

View File

@ -1,5 +1,5 @@
/************************************************************************************
* configs/stm32f746g-disco/src/stm32_ostest.c
* configs/stm32f769i-disco/src/stm32_ostest.c
*
* Copyright (C) 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -49,7 +49,7 @@
#include "up_arch.h"
#include "up_internal.h"
#include "stm32f746g-disco.h"
#include "stm32f769i-disco.h"
/************************************************************************************
* Pre-processor Definitions

View File

@ -1,5 +1,5 @@
/************************************************************************************
* configs/stm32f746g-disco/src/stm32_spi.c
* configs/stm32f769i-disco/src/stm32_spi.c
*
* Copyright (C) 2015 Gregory Nutt. All rights reserved.
* Authors: Gregory Nutt <gnutt@nuttx.org>
@ -51,7 +51,7 @@
#include "chip.h"
#include "stm32_spi.h"
#include "stm32f746g-disco.h"
#include "stm32f769i-disco.h"
#if defined(CONFIG_STM32F7_SPI1) || defined(CONFIG_STM32F7_SPI2) || \
defined(CONFIG_STM32F7_SPI3) || defined(CONFIG_STM32F7_SPI4) || \
@ -65,7 +65,7 @@
* Name: stm32_spidev_initialize
*
* Description:
* Called to configure SPI chip select GPIO pins for the stm32f746g-disco board.
* Called to configure SPI chip select GPIO pins for the stm32f769i-disco board.
*
************************************************************************************/

View File

@ -1,5 +1,5 @@
/****************************************************************************
* configs/stm32f746g-disco/src/stm32_sporadic.c
* configs/stm32f769i-disco/src/stm32_sporadic.c
*
* Copyright (C) 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -44,7 +44,7 @@
#include <nuttx/sched.h>
#include "stm32_gpio.h"
#include "stm32f746g-disco.h"
#include "stm32f769i-disco.h"
#ifdef CONFIG_SPORADIC_INSTRUMENTATION

View File

@ -1,5 +1,5 @@
/****************************************************************************
* configs/stm32f746g-disco/src/stm32_userleds.c
* configs/stm32f769i-disco/src/stm32_userleds.c
*
* Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -43,7 +43,7 @@
#include <debug.h>
#include "stm32_gpio.h"
#include "stm32f746g-disco.h"
#include "stm32f769i-disco.h"
#ifndef CONFIG_ARCH_LEDS

View File

@ -1,5 +1,5 @@
/****************************************************************************************************
* configs/stm32f746g-disco/src/stm32f746g-disco.h
* configs/stm32f769i-disco/src/stm32f769i-disco.h
*
* Copyright (C) 2015 Gregory Nutt. All rights reserved.
* Authors: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
****************************************************************************************************/
#ifndef __CONFIGS_STM32F746G_DISCO_SRC_STM32F746G_DISCO__H
#define __CONFIGS_STM32F746G_DISCO_SRC_STM32F746G_DISCO__H
#ifndef __CONFIGS_STM32F769I_DISCO_SRC_STM32F769I_DISCO__H
#define __CONFIGS_STM32F769I_DISCO_SRC_STM32F769I_DISCO__H
/****************************************************************************************************
* Included Files
@ -58,7 +58,7 @@
#endif
/* STM32F736G Discovery GPIOs ***********************************************************************/
/* The STM32F746G-DISCO board has numerous LEDs but only one, LD1 located near the reset button, that
/* The STM32F769I-DISCO board has numerous LEDs but only one, LD1 located near the reset button, that
* can be controlled by software (LD2 is a power indicator, LD3-6 indicate USB status, LD7 is
* controlled by the ST-Link).
*
@ -104,7 +104,7 @@
* Name: stm32_spidev_initialize
*
* Description:
* Called to configure SPI chip select GPIO pins for the stm32f746g-disco board.
* Called to configure SPI chip select GPIO pins for the stm32f769i-disco board.
*
****************************************************************************************************/
@ -123,5 +123,5 @@ void arch_sporadic_initialize(void);
#endif
#endif /* __ASSEMBLY__ */
#endif /* __CONFIGS_STM32F746G_DISCO_SRC_STM32F746G_DISCO_H */
#endif /* __CONFIGS_STM32F769I_DISCO_SRC_STM32F769I_DISCO_H */