You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2024/10/21 01:23:49 UTC
(nuttx) branch master updated (d73d34b1a0 -> 6f8953ed0b)
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
from d73d34b1a0 Doc: Migrate Semihosting
new 6657f2abb7 boards/arm/stm32f7: separate nucleo-144 board into individual boards
new b606c17619 boards/arm/stm32f7: move CAN init logic to a common directory
new d4e158f86d boards/arm/stm32f7: move ROMFS logic to common directory
new dadace3638 boards/arm/stm32f7: move reset logic to common
new 56e07b0606 boards/arm/stm32f7/nucleo: remove not used stm32_dma_alloc.c
new 6f8953ed0b boards/arm/stm32f7: move SPI test logic to common
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../{nucleo-f722 => nucleo-f722ze}/index.rst | 16 +-
.../{nucleo-f746 => nucleo-f746zg}/index.rst | 14 +-
.../{nucleo-f767 => nucleo-f767zi}/index.rst | 16 +-
LICENSE | 8 +-
boards/Kconfig | 64 +++--
boards/arm/stm32f7/common/Kconfig | 175 +++++++++++++
.../include/stm32_can_setup.h} | 68 +++---
.../include/stm32_cansock_setup.h} | 68 +++---
.../src => common/include}/stm32_romfs.h | 12 +-
.../include/stm32_spitest.h} | 69 +++---
boards/arm/stm32f7/common/src/CMakeLists.txt | 21 ++
boards/arm/stm32f7/common/src/Make.defs | 21 ++
.../stm32_can.c => common/src/stm32_can_setup.c} | 3 +-
.../src/stm32_cansock_setup.c} | 2 +-
.../{nucleo-144 => common}/src/stm32_reset.c | 6 +-
.../src/stm32_romfs_initialize.c | 34 ++-
boards/arm/stm32f7/common/src/stm32_spitest.c | 174 +++++++++++++
boards/arm/stm32f7/nucleo-144/Kconfig | 272 ---------------------
.../stm32f7/nucleo-144/configs/f722-can/Make.defs | 39 ---
.../nucleo-144/configs/f722-cansock/Make.defs | 39 ---
.../nucleo-144/configs/f722-composite/Make.defs | 39 ---
.../nucleo-144/configs/f746-evalos/Make.defs | 39 ---
.../nucleo-144/configs/f746-pysim/Make.defs | 39 ---
.../nucleo-144/configs/f767-evalos/Make.defs | 39 ---
.../nucleo-144/configs/f767-netnsh/Make.defs | 39 ---
.../arm/stm32f7/nucleo-144/src/stm32_dma_alloc.c | 119 ---------
.../{nucleo-144 => nucleo-f722ze}/CMakeLists.txt | 2 +-
boards/arm/stm32f7/nucleo-f722ze/Kconfig | 96 ++++++++
.../configs/can}/defconfig | 9 +-
.../configs/cansock}/defconfig | 9 +-
.../configs/composite}/defconfig | 6 +-
.../configs/nsh}/defconfig | 4 +-
.../{nucleo-144 => nucleo-f722ze}/include/board.h | 22 +-
.../f767-nsh => nucleo-f722ze/scripts}/Make.defs | 4 +-
.../scripts/flash.ld} | 2 +-
.../scripts/kernel-space.ld | 2 +-
.../scripts/user-space.ld | 2 +-
.../src/CMakeLists.txt | 17 +-
.../{nucleo-144 => nucleo-f722ze}/src/Make.defs | 19 +-
.../src/nucleo-f722ze.h} | 46 +---
.../{nucleo-144 => nucleo-f722ze}/src/stm32_adc.c | 4 +-
.../src/stm32_appinitialize.c | 4 +-
.../src/stm32_autoleds.c | 4 +-
.../src/stm32_bbsram.c | 4 +-
.../{nucleo-144 => nucleo-f722ze}/src/stm32_boot.c | 4 +-
.../src/stm32_bringup.c | 28 ++-
.../src/stm32_buttons.c | 4 +-
.../src/stm32_composite.c | 2 +-
.../{nucleo-144 => nucleo-f722ze}/src/stm32_gpio.c | 6 +-
.../{nucleo-144 => nucleo-f722ze}/src/stm32_pwm.c | 4 +-
.../src/stm32_qencoder.c | 4 +-
.../{nucleo-144 => nucleo-f722ze}/src/stm32_sdio.c | 4 +-
.../{nucleo-144 => nucleo-f722ze}/src/stm32_spi.c | 123 +---------
.../{nucleo-144 => nucleo-f722ze}/src/stm32_usb.c | 6 +-
.../src/stm32_userleds.c | 4 +-
.../{nucleo-144 => nucleo-f746zg}/CMakeLists.txt | 2 +-
boards/arm/stm32f7/nucleo-f746zg/Kconfig | 96 ++++++++
.../configs/evalos}/defconfig | 6 +-
.../configs/nsh}/defconfig | 6 +-
.../configs/pysim}/defconfig | 7 +-
.../{nucleo-144 => nucleo-f746zg}/include/board.h | 22 +-
.../f722-nsh => nucleo-f746zg/scripts}/Make.defs | 4 +-
.../scripts/flash.ld} | 2 +-
.../scripts/kernel-space.ld | 2 +-
.../scripts/memory.ld | 2 +-
.../scripts/user-space.ld | 2 +-
.../src/CMakeLists.txt | 26 +-
.../{nucleo-144 => nucleo-f746zg}/src/Make.defs | 19 +-
.../src/nucleo-f746zg.h} | 35 +--
.../{nucleo-144 => nucleo-f746zg}/src/stm32_adc.c | 4 +-
.../src/stm32_appinitialize.c | 4 +-
.../src/stm32_autoleds.c | 4 +-
.../src/stm32_bbsram.c | 4 +-
.../{nucleo-144 => nucleo-f746zg}/src/stm32_boot.c | 4 +-
.../src/stm32_bringup.c | 28 ++-
.../src/stm32_buttons.c | 4 +-
.../src/stm32_composite.c | 2 +-
.../{nucleo-144 => nucleo-f746zg}/src/stm32_gpio.c | 6 +-
.../{nucleo-144 => nucleo-f746zg}/src/stm32_pwm.c | 4 +-
.../src/stm32_qencoder.c | 4 +-
.../{nucleo-144 => nucleo-f746zg}/src/stm32_sdio.c | 4 +-
.../{nucleo-144 => nucleo-f746zg}/src/stm32_spi.c | 123 +---------
.../{nucleo-144 => nucleo-f746zg}/src/stm32_usb.c | 6 +-
.../src/stm32_userleds.c | 4 +-
.../{nucleo-144 => nucleo-f767zi}/CMakeLists.txt | 2 +-
boards/arm/stm32f7/nucleo-f767zi/Kconfig | 96 ++++++++
.../configs/evalos}/defconfig | 6 +-
.../configs/netnsh}/defconfig | 6 +-
.../configs/nsh}/defconfig | 6 +-
.../{nucleo-144 => nucleo-f767zi}/include/board.h | 22 +-
.../f746-nsh => nucleo-f767zi/scripts}/Make.defs | 4 +-
.../scripts/flash.ld} | 2 +-
.../scripts/kernel-space.ld | 2 +-
.../scripts/user-space.ld | 2 +-
.../src/CMakeLists.txt | 26 +-
.../{nucleo-144 => nucleo-f767zi}/src/Make.defs | 19 +-
.../src/nucleo-f767zi.h} | 35 +--
.../{nucleo-144 => nucleo-f767zi}/src/stm32_adc.c | 4 +-
.../src/stm32_appinitialize.c | 4 +-
.../src/stm32_autoleds.c | 4 +-
.../src/stm32_bbsram.c | 4 +-
.../{nucleo-144 => nucleo-f767zi}/src/stm32_boot.c | 4 +-
.../src/stm32_bringup.c | 28 ++-
.../src/stm32_buttons.c | 4 +-
.../src/stm32_composite.c | 2 +-
.../{nucleo-144 => nucleo-f767zi}/src/stm32_gpio.c | 6 +-
.../{nucleo-144 => nucleo-f767zi}/src/stm32_pwm.c | 4 +-
.../src/stm32_qencoder.c | 4 +-
.../{nucleo-144 => nucleo-f767zi}/src/stm32_sdio.c | 4 +-
.../{nucleo-144 => nucleo-f767zi}/src/stm32_spi.c | 123 +---------
.../{nucleo-144 => nucleo-f767zi}/src/stm32_usb.c | 6 +-
.../src/stm32_userleds.c | 4 +-
tools/ci/testlist/arm-13.dat | 20 +-
113 files changed, 1143 insertions(+), 1626 deletions(-)
rename Documentation/platforms/arm/stm32f7/boards/{nucleo-f722 => nucleo-f722ze}/index.rst (98%)
rename Documentation/platforms/arm/stm32f7/boards/{nucleo-f746 => nucleo-f746zg}/index.rst (98%)
rename Documentation/platforms/arm/stm32f7/boards/{nucleo-f767 => nucleo-f767zi}/index.rst (98%)
copy boards/arm/stm32f7/{nucleo-144/src/stm32_cansock.c => common/include/stm32_can_setup.h} (63%)
copy boards/arm/stm32f7/{nucleo-144/src/stm32_cansock.c => common/include/stm32_cansock_setup.h} (63%)
rename boards/arm/stm32f7/{nucleo-144/src => common/include}/stm32_romfs.h (91%)
copy boards/arm/stm32f7/{nucleo-144/src/stm32_cansock.c => common/include/stm32_spitest.h} (60%)
rename boards/arm/stm32f7/{nucleo-144/src/stm32_can.c => common/src/stm32_can_setup.c} (97%)
rename boards/arm/stm32f7/{nucleo-144/src/stm32_cansock.c => common/src/stm32_cansock_setup.c} (97%)
rename boards/arm/stm32f7/{nucleo-144 => common}/src/stm32_reset.c (95%)
rename boards/arm/stm32f7/{nucleo-144 => common}/src/stm32_romfs_initialize.c (84%)
create mode 100644 boards/arm/stm32f7/common/src/stm32_spitest.c
delete mode 100644 boards/arm/stm32f7/nucleo-144/Kconfig
delete mode 100644 boards/arm/stm32f7/nucleo-144/configs/f722-can/Make.defs
delete mode 100644 boards/arm/stm32f7/nucleo-144/configs/f722-cansock/Make.defs
delete mode 100644 boards/arm/stm32f7/nucleo-144/configs/f722-composite/Make.defs
delete mode 100644 boards/arm/stm32f7/nucleo-144/configs/f746-evalos/Make.defs
delete mode 100644 boards/arm/stm32f7/nucleo-144/configs/f746-pysim/Make.defs
delete mode 100644 boards/arm/stm32f7/nucleo-144/configs/f767-evalos/Make.defs
delete mode 100644 boards/arm/stm32f7/nucleo-144/configs/f767-netnsh/Make.defs
delete mode 100644 boards/arm/stm32f7/nucleo-144/src/stm32_dma_alloc.c
copy boards/arm/stm32f7/{nucleo-144 => nucleo-f722ze}/CMakeLists.txt (95%)
create mode 100644 boards/arm/stm32f7/nucleo-f722ze/Kconfig
rename boards/arm/stm32f7/{nucleo-144/configs/f722-can => nucleo-f722ze/configs/can}/defconfig (89%)
rename boards/arm/stm32f7/{nucleo-144/configs/f722-cansock => nucleo-f722ze/configs/cansock}/defconfig (90%)
rename boards/arm/stm32f7/{nucleo-144/configs/f722-composite => nucleo-f722ze/configs/composite}/defconfig (95%)
rename boards/arm/stm32f7/{nucleo-144/configs/f722-nsh => nucleo-f722ze/configs/nsh}/defconfig (95%)
copy boards/arm/stm32f7/{nucleo-144 => nucleo-f722ze}/include/board.h (96%)
rename boards/arm/stm32f7/{nucleo-144/configs/f767-nsh => nucleo-f722ze/scripts}/Make.defs (95%)
rename boards/arm/stm32f7/{nucleo-144/scripts/f722-flash.ld => nucleo-f722ze/scripts/flash.ld} (98%)
copy boards/arm/stm32f7/{nucleo-144 => nucleo-f722ze}/scripts/kernel-space.ld (97%)
copy boards/arm/stm32f7/{nucleo-144 => nucleo-f722ze}/scripts/user-space.ld (98%)
copy boards/arm/stm32f7/{nucleo-144 => nucleo-f722ze}/src/CMakeLists.txt (78%)
copy boards/arm/stm32f7/{nucleo-144 => nucleo-f722ze}/src/Make.defs (84%)
copy boards/arm/stm32f7/{nucleo-144/src/nucleo-144.h => nucleo-f722ze/src/nucleo-f722ze.h} (88%)
copy boards/arm/stm32f7/{nucleo-144 => nucleo-f722ze}/src/stm32_adc.c (98%)
copy boards/arm/stm32f7/{nucleo-144 => nucleo-f722ze}/src/stm32_appinitialize.c (96%)
copy boards/arm/stm32f7/{nucleo-144 => nucleo-f722ze}/src/stm32_autoleds.c (98%)
copy boards/arm/stm32f7/{nucleo-144 => nucleo-f722ze}/src/stm32_bbsram.c (99%)
copy boards/arm/stm32f7/{nucleo-144 => nucleo-f722ze}/src/stm32_boot.c (97%)
copy boards/arm/stm32f7/{nucleo-144 => nucleo-f722ze}/src/stm32_bringup.c (93%)
copy boards/arm/stm32f7/{nucleo-144 => nucleo-f722ze}/src/stm32_buttons.c (97%)
copy boards/arm/stm32f7/{nucleo-144 => nucleo-f722ze}/src/stm32_composite.c (99%)
copy boards/arm/stm32f7/{nucleo-144 => nucleo-f722ze}/src/stm32_gpio.c (98%)
copy boards/arm/stm32f7/{nucleo-144 => nucleo-f722ze}/src/stm32_pwm.c (98%)
copy boards/arm/stm32f7/{nucleo-144 => nucleo-f722ze}/src/stm32_qencoder.c (96%)
copy boards/arm/stm32f7/{nucleo-144 => nucleo-f722ze}/src/stm32_sdio.c (98%)
copy boards/arm/stm32f7/{nucleo-144 => nucleo-f722ze}/src/stm32_spi.c (72%)
copy boards/arm/stm32f7/{nucleo-144 => nucleo-f722ze}/src/stm32_usb.c (98%)
copy boards/arm/stm32f7/{nucleo-144 => nucleo-f722ze}/src/stm32_userleds.c (97%)
copy boards/arm/stm32f7/{nucleo-144 => nucleo-f746zg}/CMakeLists.txt (95%)
create mode 100644 boards/arm/stm32f7/nucleo-f746zg/Kconfig
rename boards/arm/stm32f7/{nucleo-144/configs/f746-evalos => nucleo-f746zg/configs/evalos}/defconfig (94%)
rename boards/arm/stm32f7/{nucleo-144/configs/f746-nsh => nucleo-f746zg/configs/nsh}/defconfig (92%)
rename boards/arm/stm32f7/{nucleo-144/configs/f746-pysim => nucleo-f746zg/configs/pysim}/defconfig (96%)
copy boards/arm/stm32f7/{nucleo-144 => nucleo-f746zg}/include/board.h (96%)
rename boards/arm/stm32f7/{nucleo-144/configs/f722-nsh => nucleo-f746zg/scripts}/Make.defs (95%)
rename boards/arm/stm32f7/{nucleo-144/scripts/f746-flash.ld => nucleo-f746zg/scripts/flash.ld} (98%)
copy boards/arm/stm32f7/{nucleo-144 => nucleo-f746zg}/scripts/kernel-space.ld (97%)
rename boards/arm/stm32f7/{nucleo-144 => nucleo-f746zg}/scripts/memory.ld (98%)
copy boards/arm/stm32f7/{nucleo-144 => nucleo-f746zg}/scripts/user-space.ld (98%)
copy boards/arm/stm32f7/{nucleo-144 => nucleo-f746zg}/src/CMakeLists.txt (71%)
copy boards/arm/stm32f7/{nucleo-144 => nucleo-f746zg}/src/Make.defs (84%)
copy boards/arm/stm32f7/{nucleo-144/src/nucleo-144.h => nucleo-f746zg/src/nucleo-f746zg.h} (91%)
copy boards/arm/stm32f7/{nucleo-144 => nucleo-f746zg}/src/stm32_adc.c (98%)
copy boards/arm/stm32f7/{nucleo-144 => nucleo-f746zg}/src/stm32_appinitialize.c (96%)
copy boards/arm/stm32f7/{nucleo-144 => nucleo-f746zg}/src/stm32_autoleds.c (98%)
copy boards/arm/stm32f7/{nucleo-144 => nucleo-f746zg}/src/stm32_bbsram.c (99%)
copy boards/arm/stm32f7/{nucleo-144 => nucleo-f746zg}/src/stm32_boot.c (97%)
copy boards/arm/stm32f7/{nucleo-144 => nucleo-f746zg}/src/stm32_bringup.c (93%)
copy boards/arm/stm32f7/{nucleo-144 => nucleo-f746zg}/src/stm32_buttons.c (97%)
copy boards/arm/stm32f7/{nucleo-144 => nucleo-f746zg}/src/stm32_composite.c (99%)
copy boards/arm/stm32f7/{nucleo-144 => nucleo-f746zg}/src/stm32_gpio.c (98%)
copy boards/arm/stm32f7/{nucleo-144 => nucleo-f746zg}/src/stm32_pwm.c (98%)
copy boards/arm/stm32f7/{nucleo-144 => nucleo-f746zg}/src/stm32_qencoder.c (96%)
copy boards/arm/stm32f7/{nucleo-144 => nucleo-f746zg}/src/stm32_sdio.c (98%)
copy boards/arm/stm32f7/{nucleo-144 => nucleo-f746zg}/src/stm32_spi.c (72%)
copy boards/arm/stm32f7/{nucleo-144 => nucleo-f746zg}/src/stm32_usb.c (98%)
copy boards/arm/stm32f7/{nucleo-144 => nucleo-f746zg}/src/stm32_userleds.c (97%)
rename boards/arm/stm32f7/{nucleo-144 => nucleo-f767zi}/CMakeLists.txt (95%)
create mode 100644 boards/arm/stm32f7/nucleo-f767zi/Kconfig
rename boards/arm/stm32f7/{nucleo-144/configs/f767-evalos => nucleo-f767zi/configs/evalos}/defconfig (94%)
rename boards/arm/stm32f7/{nucleo-144/configs/f767-netnsh => nucleo-f767zi/configs/netnsh}/defconfig (94%)
rename boards/arm/stm32f7/{nucleo-144/configs/f767-nsh => nucleo-f767zi/configs/nsh}/defconfig (92%)
rename boards/arm/stm32f7/{nucleo-144 => nucleo-f767zi}/include/board.h (96%)
rename boards/arm/stm32f7/{nucleo-144/configs/f746-nsh => nucleo-f767zi/scripts}/Make.defs (95%)
rename boards/arm/stm32f7/{nucleo-144/scripts/f767-flash.ld => nucleo-f767zi/scripts/flash.ld} (98%)
rename boards/arm/stm32f7/{nucleo-144 => nucleo-f767zi}/scripts/kernel-space.ld (97%)
rename boards/arm/stm32f7/{nucleo-144 => nucleo-f767zi}/scripts/user-space.ld (98%)
rename boards/arm/stm32f7/{nucleo-144 => nucleo-f767zi}/src/CMakeLists.txt (71%)
rename boards/arm/stm32f7/{nucleo-144 => nucleo-f767zi}/src/Make.defs (84%)
rename boards/arm/stm32f7/{nucleo-144/src/nucleo-144.h => nucleo-f767zi/src/nucleo-f767zi.h} (91%)
rename boards/arm/stm32f7/{nucleo-144 => nucleo-f767zi}/src/stm32_adc.c (98%)
rename boards/arm/stm32f7/{nucleo-144 => nucleo-f767zi}/src/stm32_appinitialize.c (96%)
rename boards/arm/stm32f7/{nucleo-144 => nucleo-f767zi}/src/stm32_autoleds.c (98%)
rename boards/arm/stm32f7/{nucleo-144 => nucleo-f767zi}/src/stm32_bbsram.c (99%)
rename boards/arm/stm32f7/{nucleo-144 => nucleo-f767zi}/src/stm32_boot.c (97%)
rename boards/arm/stm32f7/{nucleo-144 => nucleo-f767zi}/src/stm32_bringup.c (93%)
rename boards/arm/stm32f7/{nucleo-144 => nucleo-f767zi}/src/stm32_buttons.c (97%)
rename boards/arm/stm32f7/{nucleo-144 => nucleo-f767zi}/src/stm32_composite.c (99%)
rename boards/arm/stm32f7/{nucleo-144 => nucleo-f767zi}/src/stm32_gpio.c (98%)
rename boards/arm/stm32f7/{nucleo-144 => nucleo-f767zi}/src/stm32_pwm.c (98%)
rename boards/arm/stm32f7/{nucleo-144 => nucleo-f767zi}/src/stm32_qencoder.c (96%)
rename boards/arm/stm32f7/{nucleo-144 => nucleo-f767zi}/src/stm32_sdio.c (98%)
rename boards/arm/stm32f7/{nucleo-144 => nucleo-f767zi}/src/stm32_spi.c (72%)
rename boards/arm/stm32f7/{nucleo-144 => nucleo-f767zi}/src/stm32_usb.c (98%)
rename boards/arm/stm32f7/{nucleo-144 => nucleo-f767zi}/src/stm32_userleds.c (97%)
(nuttx) 04/06: boards/arm/stm32f7: move reset logic to common
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit dadace363835fecc0dbe16f02f38e7305fedf799
Author: raiden00pl <ra...@railab.me>
AuthorDate: Sun Oct 20 16:54:52 2024 +0200
boards/arm/stm32f7: move reset logic to common
move stm32f7 reset logic to common
---
boards/arm/stm32f7/common/src/CMakeLists.txt | 4 ++
boards/arm/stm32f7/common/src/Make.defs | 4 ++
.../{nucleo-f722ze => common}/src/stm32_reset.c | 6 +--
.../arm/stm32f7/nucleo-f722ze/src/CMakeLists.txt | 4 --
boards/arm/stm32f7/nucleo-f722ze/src/Make.defs | 4 --
.../arm/stm32f7/nucleo-f746zg/src/CMakeLists.txt | 4 --
boards/arm/stm32f7/nucleo-f746zg/src/Make.defs | 4 --
boards/arm/stm32f7/nucleo-f746zg/src/stm32_reset.c | 62 ----------------------
.../arm/stm32f7/nucleo-f767zi/src/CMakeLists.txt | 4 --
boards/arm/stm32f7/nucleo-f767zi/src/Make.defs | 4 --
boards/arm/stm32f7/nucleo-f767zi/src/stm32_reset.c | 62 ----------------------
11 files changed, 9 insertions(+), 153 deletions(-)
diff --git a/boards/arm/stm32f7/common/src/CMakeLists.txt b/boards/arm/stm32f7/common/src/CMakeLists.txt
index 28a0318dd2..4c99128057 100644
--- a/boards/arm/stm32f7/common/src/CMakeLists.txt
+++ b/boards/arm/stm32f7/common/src/CMakeLists.txt
@@ -45,4 +45,8 @@ if(CONFIG_STM32F7_ROMFS)
list(APPEND SRCS stm32_romfs_initialize.c)
endif()
+if(CONFIG_BOARDCTL_RESET)
+ list(APPEND SRCS stm32_reset.c)
+endif()
+
target_sources(board PRIVATE ${SRCS})
diff --git a/boards/arm/stm32f7/common/src/Make.defs b/boards/arm/stm32f7/common/src/Make.defs
index eb7a96916f..2f1a7b4544 100644
--- a/boards/arm/stm32f7/common/src/Make.defs
+++ b/boards/arm/stm32f7/common/src/Make.defs
@@ -45,6 +45,10 @@ ifeq ($(CONFIG_STM32F7_ROMFS),y)
CSRCS += stm32_romfs_initialize.c
endif
+ifeq ($(CONFIG_BOARDCTL_RESET),y)
+CSRCS += stm32_reset.c
+endif
+
DEPPATH += --dep-path src
VPATH += :src
CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)src
diff --git a/boards/arm/stm32f7/nucleo-f722ze/src/stm32_reset.c b/boards/arm/stm32f7/common/src/stm32_reset.c
similarity index 94%
rename from boards/arm/stm32f7/nucleo-f722ze/src/stm32_reset.c
rename to boards/arm/stm32f7/common/src/stm32_reset.c
index c08b820c05..2a223d8004 100644
--- a/boards/arm/stm32f7/nucleo-f722ze/src/stm32_reset.c
+++ b/boards/arm/stm32f7/common/src/stm32_reset.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-f722ze/src/stm32_reset.c
+ * boards/arm/stm32f7/common/src/stm32_reset.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -27,8 +27,6 @@
#include <nuttx/arch.h>
#include <nuttx/board.h>
-#ifdef CONFIG_BOARDCTL_RESET
-
/****************************************************************************
* Public Functions
****************************************************************************/
@@ -58,5 +56,3 @@ int board_reset(int status)
up_systemreset();
return 0;
}
-
-#endif /* CONFIG_BOARDCTL_RESET */
diff --git a/boards/arm/stm32f7/nucleo-f722ze/src/CMakeLists.txt b/boards/arm/stm32f7/nucleo-f722ze/src/CMakeLists.txt
index 6d78330177..bd9d8da214 100644
--- a/boards/arm/stm32f7/nucleo-f722ze/src/CMakeLists.txt
+++ b/boards/arm/stm32f7/nucleo-f722ze/src/CMakeLists.txt
@@ -62,10 +62,6 @@ if(CONFIG_STM32F7_BBSRAM)
list(APPEND SRCS stm32_bbsram.c)
endif()
-if(CONFIG_BOARDCTL_RESET)
- list(APPEND SRCS stm32_reset.c)
-endif()
-
if(CONFIG_SENSORS_QENCODER)
list(APPEND SRCS stm32_qencoder.c)
endif()
diff --git a/boards/arm/stm32f7/nucleo-f722ze/src/Make.defs b/boards/arm/stm32f7/nucleo-f722ze/src/Make.defs
index 8c1d6f881a..684c5f4786 100644
--- a/boards/arm/stm32f7/nucleo-f722ze/src/Make.defs
+++ b/boards/arm/stm32f7/nucleo-f722ze/src/Make.defs
@@ -64,10 +64,6 @@ ifeq ($(CONFIG_STM32F7_BBSRAM),y)
CSRCS += stm32_bbsram.c
endif
-ifeq ($(CONFIG_BOARDCTL_RESET),y)
-CSRCS += stm32_reset.c
-endif
-
ifeq ($(CONFIG_SENSORS_QENCODER),y)
CSRCS += stm32_qencoder.c
endif
diff --git a/boards/arm/stm32f7/nucleo-f746zg/src/CMakeLists.txt b/boards/arm/stm32f7/nucleo-f746zg/src/CMakeLists.txt
index 193920163f..c454797bc3 100644
--- a/boards/arm/stm32f7/nucleo-f746zg/src/CMakeLists.txt
+++ b/boards/arm/stm32f7/nucleo-f746zg/src/CMakeLists.txt
@@ -62,10 +62,6 @@ if(CONFIG_STM32F7_BBSRAM)
list(APPEND SRCS stm32_bbsram.c)
endif()
-if(CONFIG_BOARDCTL_RESET)
- list(APPEND SRCS stm32_reset.c)
-endif()
-
if(CONFIG_SENSORS_QENCODER)
list(APPEND SRCS stm32_qencoder.c)
endif()
diff --git a/boards/arm/stm32f7/nucleo-f746zg/src/Make.defs b/boards/arm/stm32f7/nucleo-f746zg/src/Make.defs
index b5db10b2a9..a506f3c893 100644
--- a/boards/arm/stm32f7/nucleo-f746zg/src/Make.defs
+++ b/boards/arm/stm32f7/nucleo-f746zg/src/Make.defs
@@ -64,10 +64,6 @@ ifeq ($(CONFIG_STM32F7_BBSRAM),y)
CSRCS += stm32_bbsram.c
endif
-ifeq ($(CONFIG_BOARDCTL_RESET),y)
-CSRCS += stm32_reset.c
-endif
-
ifeq ($(CONFIG_SENSORS_QENCODER),y)
CSRCS += stm32_qencoder.c
endif
diff --git a/boards/arm/stm32f7/nucleo-f746zg/src/stm32_reset.c b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_reset.c
deleted file mode 100644
index a95e8e5c8d..0000000000
--- a/boards/arm/stm32f7/nucleo-f746zg/src/stm32_reset.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/****************************************************************************
- * boards/arm/stm32f7/nucleo-f746zg/src/stm32_reset.c
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership. The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <nuttx/arch.h>
-#include <nuttx/board.h>
-
-#ifdef CONFIG_BOARDCTL_RESET
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: board_reset
- *
- * Description:
- * Reset board. Support for this function is required by board-level
- * logic if CONFIG_BOARDCTL_RESET is selected.
- *
- * Input Parameters:
- * status - Status information provided with the reset event. This
- * meaning of this status information is board-specific. If not
- * used by a board, the value zero may be provided in calls to
- * board_reset().
- *
- * Returned Value:
- * If this function returns, then it was not possible to power-off the
- * board due to some constraints. The return value int this case is a
- * board-specific reason for the failure to shutdown.
- *
- ****************************************************************************/
-
-int board_reset(int status)
-{
- up_systemreset();
- return 0;
-}
-
-#endif /* CONFIG_BOARDCTL_RESET */
diff --git a/boards/arm/stm32f7/nucleo-f767zi/src/CMakeLists.txt b/boards/arm/stm32f7/nucleo-f767zi/src/CMakeLists.txt
index 30e1c6b9bf..171173a94c 100644
--- a/boards/arm/stm32f7/nucleo-f767zi/src/CMakeLists.txt
+++ b/boards/arm/stm32f7/nucleo-f767zi/src/CMakeLists.txt
@@ -62,10 +62,6 @@ if(CONFIG_STM32F7_BBSRAM)
list(APPEND SRCS stm32_bbsram.c)
endif()
-if(CONFIG_BOARDCTL_RESET)
- list(APPEND SRCS stm32_reset.c)
-endif()
-
if(CONFIG_SENSORS_QENCODER)
list(APPEND SRCS stm32_qencoder.c)
endif()
diff --git a/boards/arm/stm32f7/nucleo-f767zi/src/Make.defs b/boards/arm/stm32f7/nucleo-f767zi/src/Make.defs
index 1eef7361c2..c3f6ba291d 100644
--- a/boards/arm/stm32f7/nucleo-f767zi/src/Make.defs
+++ b/boards/arm/stm32f7/nucleo-f767zi/src/Make.defs
@@ -64,10 +64,6 @@ ifeq ($(CONFIG_STM32F7_BBSRAM),y)
CSRCS += stm32_bbsram.c
endif
-ifeq ($(CONFIG_BOARDCTL_RESET),y)
-CSRCS += stm32_reset.c
-endif
-
ifeq ($(CONFIG_SENSORS_QENCODER),y)
CSRCS += stm32_qencoder.c
endif
diff --git a/boards/arm/stm32f7/nucleo-f767zi/src/stm32_reset.c b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_reset.c
deleted file mode 100644
index 8631659702..0000000000
--- a/boards/arm/stm32f7/nucleo-f767zi/src/stm32_reset.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/****************************************************************************
- * boards/arm/stm32f7/nucleo-f767zi/src/stm32_reset.c
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership. The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <nuttx/arch.h>
-#include <nuttx/board.h>
-
-#ifdef CONFIG_BOARDCTL_RESET
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: board_reset
- *
- * Description:
- * Reset board. Support for this function is required by board-level
- * logic if CONFIG_BOARDCTL_RESET is selected.
- *
- * Input Parameters:
- * status - Status information provided with the reset event. This
- * meaning of this status information is board-specific. If not
- * used by a board, the value zero may be provided in calls to
- * board_reset().
- *
- * Returned Value:
- * If this function returns, then it was not possible to power-off the
- * board due to some constraints. The return value int this case is a
- * board-specific reason for the failure to shutdown.
- *
- ****************************************************************************/
-
-int board_reset(int status)
-{
- up_systemreset();
- return 0;
-}
-
-#endif /* CONFIG_BOARDCTL_RESET */
(nuttx) 05/06: boards/arm/stm32f7/nucleo: remove not used stm32_dma_alloc.c
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 56e07b06065ffbc06a11044e24822351381a7a42
Author: raiden00pl <ra...@railab.me>
AuthorDate: Sun Oct 20 17:01:13 2024 +0200
boards/arm/stm32f7/nucleo: remove not used stm32_dma_alloc.c
remove not used stm32_dma_alloc.c
---
.../stm32f7/nucleo-f722ze/src/stm32_dma_alloc.c | 119 ---------------------
.../stm32f7/nucleo-f746zg/src/stm32_dma_alloc.c | 119 ---------------------
.../stm32f7/nucleo-f767zi/src/stm32_dma_alloc.c | 119 ---------------------
3 files changed, 357 deletions(-)
diff --git a/boards/arm/stm32f7/nucleo-f722ze/src/stm32_dma_alloc.c b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_dma_alloc.c
deleted file mode 100644
index 1419b589b0..0000000000
--- a/boards/arm/stm32f7/nucleo-f722ze/src/stm32_dma_alloc.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/****************************************************************************
- * boards/arm/stm32f7/nucleo-f722ze/src/stm32_dma_alloc.c
- *
- * Copyright (C) 2016 PX4 Development Team. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the name PX4 nor the names of its contributors may be
- * used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-#include <syslog.h>
-#include <stdint.h>
-#include <errno.h>
-#include <nuttx/mm/gran.h>
-
-#include "nucleo-f722ze.h"
-
-#if defined(CONFIG_FAT_DMAMEMORY)
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-#if !defined(CONFIG_GRAN)
-# error microSD DMA support requires CONFIG_GRAN
-#endif
-
-#define BOARD_DMA_ALLOC_POOL_SIZE (8*512)
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-static GRAN_HANDLE dma_allocator;
-
-/* The DMA heap size constrains the total number of things that can be
- * ready to do DMA at a time.
- *
- * For example, FAT DMA depends on one sector-sized buffer per filesystem
- * plus one sector-sized buffer per file.
- *
- * We use a fundamental alignment / granule size of 64B; this is sufficient
- * to guarantee alignment for the largest STM32 DMA burst
- * (16 beats x 32bits).
- */
-
-static
-uint8_t g_dma_heap[BOARD_DMA_ALLOC_POOL_SIZE] aligned_data(64);
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: stm32_dma_alloc_init
- *
- * Description:
- * All boards may optionally provide this API to instantiate a pool of
- * memory for uses with FAST FS DMA operations.
- *
- ****************************************************************************/
-
-int stm32_dma_alloc_init(void)
-{
- dma_allocator = gran_initialize(g_dma_heap,
- sizeof(g_dma_heap),
- 7, /* 128B granule - must be > alignment (XXX bug?) */
- 6); /* 64B alignment */
-
- if (dma_allocator == NULL)
- {
- return -ENOMEM;
- }
-
- return OK;
-}
-
-/* DMA-aware allocator stubs for the FAT filesystem. */
-
-void *fat_dma_alloc(size_t size)
-{
- return gran_alloc(dma_allocator, size);
-}
-
-void fat_dma_free(void *memory, size_t size)
-{
- gran_free(dma_allocator, memory, size);
-}
-
-#endif /* CONFIG_FAT_DMAMEMORY */
diff --git a/boards/arm/stm32f7/nucleo-f746zg/src/stm32_dma_alloc.c b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_dma_alloc.c
deleted file mode 100644
index fef0e2ebd7..0000000000
--- a/boards/arm/stm32f7/nucleo-f746zg/src/stm32_dma_alloc.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/****************************************************************************
- * boards/arm/stm32f7/nucleo-f746zg/src/stm32_dma_alloc.c
- *
- * Copyright (C) 2016 PX4 Development Team. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the name PX4 nor the names of its contributors may be
- * used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-#include <syslog.h>
-#include <stdint.h>
-#include <errno.h>
-#include <nuttx/mm/gran.h>
-
-#include "nucleo-f746zg.h"
-
-#if defined(CONFIG_FAT_DMAMEMORY)
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-#if !defined(CONFIG_GRAN)
-# error microSD DMA support requires CONFIG_GRAN
-#endif
-
-#define BOARD_DMA_ALLOC_POOL_SIZE (8*512)
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-static GRAN_HANDLE dma_allocator;
-
-/* The DMA heap size constrains the total number of things that can be
- * ready to do DMA at a time.
- *
- * For example, FAT DMA depends on one sector-sized buffer per filesystem
- * plus one sector-sized buffer per file.
- *
- * We use a fundamental alignment / granule size of 64B; this is sufficient
- * to guarantee alignment for the largest STM32 DMA burst
- * (16 beats x 32bits).
- */
-
-static
-uint8_t g_dma_heap[BOARD_DMA_ALLOC_POOL_SIZE] aligned_data(64);
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: stm32_dma_alloc_init
- *
- * Description:
- * All boards may optionally provide this API to instantiate a pool of
- * memory for uses with FAST FS DMA operations.
- *
- ****************************************************************************/
-
-int stm32_dma_alloc_init(void)
-{
- dma_allocator = gran_initialize(g_dma_heap,
- sizeof(g_dma_heap),
- 7, /* 128B granule - must be > alignment (XXX bug?) */
- 6); /* 64B alignment */
-
- if (dma_allocator == NULL)
- {
- return -ENOMEM;
- }
-
- return OK;
-}
-
-/* DMA-aware allocator stubs for the FAT filesystem. */
-
-void *fat_dma_alloc(size_t size)
-{
- return gran_alloc(dma_allocator, size);
-}
-
-void fat_dma_free(void *memory, size_t size)
-{
- gran_free(dma_allocator, memory, size);
-}
-
-#endif /* CONFIG_FAT_DMAMEMORY */
diff --git a/boards/arm/stm32f7/nucleo-f767zi/src/stm32_dma_alloc.c b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_dma_alloc.c
deleted file mode 100644
index f59388c06f..0000000000
--- a/boards/arm/stm32f7/nucleo-f767zi/src/stm32_dma_alloc.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/****************************************************************************
- * boards/arm/stm32f7/nucleo-f767zi/src/stm32_dma_alloc.c
- *
- * Copyright (C) 2016 PX4 Development Team. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the name PX4 nor the names of its contributors may be
- * used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-#include <syslog.h>
-#include <stdint.h>
-#include <errno.h>
-#include <nuttx/mm/gran.h>
-
-#include "nucleo-f767zi.h"
-
-#if defined(CONFIG_FAT_DMAMEMORY)
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-#if !defined(CONFIG_GRAN)
-# error microSD DMA support requires CONFIG_GRAN
-#endif
-
-#define BOARD_DMA_ALLOC_POOL_SIZE (8*512)
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-static GRAN_HANDLE dma_allocator;
-
-/* The DMA heap size constrains the total number of things that can be
- * ready to do DMA at a time.
- *
- * For example, FAT DMA depends on one sector-sized buffer per filesystem
- * plus one sector-sized buffer per file.
- *
- * We use a fundamental alignment / granule size of 64B; this is sufficient
- * to guarantee alignment for the largest STM32 DMA burst
- * (16 beats x 32bits).
- */
-
-static
-uint8_t g_dma_heap[BOARD_DMA_ALLOC_POOL_SIZE] aligned_data(64);
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: stm32_dma_alloc_init
- *
- * Description:
- * All boards may optionally provide this API to instantiate a pool of
- * memory for uses with FAST FS DMA operations.
- *
- ****************************************************************************/
-
-int stm32_dma_alloc_init(void)
-{
- dma_allocator = gran_initialize(g_dma_heap,
- sizeof(g_dma_heap),
- 7, /* 128B granule - must be > alignment (XXX bug?) */
- 6); /* 64B alignment */
-
- if (dma_allocator == NULL)
- {
- return -ENOMEM;
- }
-
- return OK;
-}
-
-/* DMA-aware allocator stubs for the FAT filesystem. */
-
-void *fat_dma_alloc(size_t size)
-{
- return gran_alloc(dma_allocator, size);
-}
-
-void fat_dma_free(void *memory, size_t size)
-{
- gran_free(dma_allocator, memory, size);
-}
-
-#endif /* CONFIG_FAT_DMAMEMORY */
(nuttx) 03/06: boards/arm/stm32f7: move ROMFS logic to common directory
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit d4e158f86df6c12138d631360c5acf4ccd73dcee
Author: raiden00pl <ra...@railab.me>
AuthorDate: Sun Oct 20 13:15:56 2024 +0200
boards/arm/stm32f7: move ROMFS logic to common directory
move ROMFS logic to common directory
---
LICENSE | 8 +-
boards/Kconfig | 3 +
boards/arm/stm32f7/common/Kconfig | 22 +++
.../src => common/include}/stm32_romfs.h | 12 +-
boards/arm/stm32f7/common/src/CMakeLists.txt | 4 +
boards/arm/stm32f7/common/src/Make.defs | 4 +
.../src/stm32_romfs_initialize.c | 34 +++--
boards/arm/stm32f7/nucleo-f722ze/Kconfig | 22 ---
.../arm/stm32f7/nucleo-f722ze/src/CMakeLists.txt | 4 -
boards/arm/stm32f7/nucleo-f722ze/src/Make.defs | 4 -
.../arm/stm32f7/nucleo-f722ze/src/stm32_bringup.c | 8 +-
boards/arm/stm32f7/nucleo-f722ze/src/stm32_romfs.h | 76 ----------
.../nucleo-f722ze/src/stm32_romfs_initialize.c | 153 ---------------------
boards/arm/stm32f7/nucleo-f746zg/Kconfig | 22 ---
.../arm/stm32f7/nucleo-f746zg/src/CMakeLists.txt | 4 -
boards/arm/stm32f7/nucleo-f746zg/src/Make.defs | 4 -
.../arm/stm32f7/nucleo-f746zg/src/stm32_bringup.c | 8 +-
boards/arm/stm32f7/nucleo-f746zg/src/stm32_romfs.h | 76 ----------
.../nucleo-f746zg/src/stm32_romfs_initialize.c | 153 ---------------------
boards/arm/stm32f7/nucleo-f767zi/Kconfig | 22 ---
.../arm/stm32f7/nucleo-f767zi/src/CMakeLists.txt | 4 -
boards/arm/stm32f7/nucleo-f767zi/src/Make.defs | 4 -
.../arm/stm32f7/nucleo-f767zi/src/stm32_bringup.c | 8 +-
23 files changed, 69 insertions(+), 590 deletions(-)
diff --git a/LICENSE b/LICENSE
index bcaf54b851..9d9c89e9ef 100644
--- a/LICENSE
+++ b/LICENSE
@@ -3355,12 +3355,8 @@ boards/arm/stm32/omnibusf4/src/stm32_romfs.h
boards/arm/stm32/omnibusf4/src/stm32_romfs_initialize.c
boards/arm/stm32/stm32f4discovery/src/stm32_romfs.h
boards/arm/stm32/stm32f4discovery/src/stm32_romfs_initialize.c
-boards/arm/stm32f7/nucleo-f722ze/src/stm32_romfs.h
-boards/arm/stm32f7/nucleo-f722ze/src/stm32_romfs_initialize.c
-boards/arm/stm32f7/nucleo-f746zg/src/stm32_romfs.h
-boards/arm/stm32f7/nucleo-f746zg/src/stm32_romfs_initialize.c
-boards/arm/stm32f7/nucleo-f767zi/src/stm32_romfs.h
-boards/arm/stm32f7/nucleo-f767zi/src/stm32_romfs_initialize.c
+boards/arm/stm32f7/common/include/stm32_romfs.h
+boards/arm/stm32f7/common/src/stm32_romfs_initialize.c
=============================================================
Copyright (C) 2017 Tomasz Wozniak. All rights reserved.
diff --git a/boards/Kconfig b/boards/Kconfig
index 653086ac44..9a97bc3a5f 100644
--- a/boards/Kconfig
+++ b/boards/Kconfig
@@ -4604,6 +4604,9 @@ endif
if ARCH_CHIP_STM32
source "boards/arm/stm32/common/Kconfig"
endif
+if ARCH_CHIP_STM32F7
+source "boards/arm/stm32f7/common/Kconfig"
+endif
if ARCH_CHIP_STM32F0L0G0
source "boards/arm/stm32f0l0g0/common/Kconfig"
endif
diff --git a/boards/arm/stm32f7/common/Kconfig b/boards/arm/stm32f7/common/Kconfig
index 18c7905aed..5d02131b7f 100644
--- a/boards/arm/stm32f7/common/Kconfig
+++ b/boards/arm/stm32f7/common/Kconfig
@@ -3,3 +3,25 @@
# see the file kconfig-language.txt in the NuttX tools repository.
#
+config STM32F7_ROMFS
+ bool "Automount baked-in ROMFS image"
+ default n
+ depends on FS_ROMFS
+ ---help---
+ Select STM32F7_ROMFS_IMAGEFILE, STM32F7_ROMFS_DEV_MINOR, STM32F7_ROMFS_MOUNTPOINT
+
+config STM32F7_ROMFS_DEV_MINOR
+ int "Minor for the block device backing the data"
+ depends on STM32F7_ROMFS
+ default 64
+
+config STM32F7_ROMFS_MOUNTPOINT
+ string "Mountpoint of the custom romfs image"
+ depends on STM32F7_ROMFS
+ default "/rom"
+
+config STM32F7_ROMFS_IMAGEFILE
+ string "ROMFS image file to include into build"
+ depends on STM32F7_ROMFS
+ default "../../../rom.img"
+
diff --git a/boards/arm/stm32f7/nucleo-f767zi/src/stm32_romfs.h b/boards/arm/stm32f7/common/include/stm32_romfs.h
similarity index 91%
rename from boards/arm/stm32f7/nucleo-f767zi/src/stm32_romfs.h
rename to boards/arm/stm32f7/common/include/stm32_romfs.h
index 9a1a0afab4..4c6355a1fe 100644
--- a/boards/arm/stm32f7/nucleo-f767zi/src/stm32_romfs.h
+++ b/boards/arm/stm32f7/common/include/stm32_romfs.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-f767zi/src/stm32_romfs.h
+ * boards/arm/stm32f7/common/include/stm32_romfs.h
*
* Copyright (C) 2017 Tomasz Wozniak. All rights reserved.
* Author: Tomasz Wozniak <t....@samsung.com>
@@ -33,8 +33,8 @@
*
****************************************************************************/
-#ifndef __BOARDS_ARM_STM32F7_NUCLEO144_SRC_STM32_ROMFS_H
-#define __BOARDS_ARM_STM32F7_NUCLEO144_SRC_STM32_ROMFS_H
+#ifndef __BOARDS_ARM_STM32F7_COMMON_INCLUDE_STM32_ROMFS_H
+#define __BOARDS_ARM_STM32F7_COMMON_INCLUDE_STM32_ROMFS_H
/****************************************************************************
* Included Files
@@ -42,7 +42,7 @@
#include <nuttx/config.h>
-#ifdef CONFIG_STM32_ROMFS
+#ifdef CONFIG_STM32F7_ROMFS
/****************************************************************************
* Pre-processor Definitions
@@ -71,6 +71,6 @@
int stm32_romfs_initialize(void);
-#endif /* CONFIG_STM32_ROMFS */
+#endif /* CONFIG_STM32F7_ROMFS */
-#endif /* __BOARDS_ARM_STM32F7_NUCLEO144_SRC_STM32_ROMFS_H */
+#endif /* __BOARDS_ARM_STM32F7_COMMON_INCLUDE_STM32_ROMFS_H */
diff --git a/boards/arm/stm32f7/common/src/CMakeLists.txt b/boards/arm/stm32f7/common/src/CMakeLists.txt
index 61ec6b8d57..28a0318dd2 100644
--- a/boards/arm/stm32f7/common/src/CMakeLists.txt
+++ b/boards/arm/stm32f7/common/src/CMakeLists.txt
@@ -41,4 +41,8 @@ if(CONFIG_STM32F7_CAN)
endif()
endif()
+if(CONFIG_STM32F7_ROMFS)
+ list(APPEND SRCS stm32_romfs_initialize.c)
+endif()
+
target_sources(board PRIVATE ${SRCS})
diff --git a/boards/arm/stm32f7/common/src/Make.defs b/boards/arm/stm32f7/common/src/Make.defs
index 15455395ee..eb7a96916f 100644
--- a/boards/arm/stm32f7/common/src/Make.defs
+++ b/boards/arm/stm32f7/common/src/Make.defs
@@ -41,6 +41,10 @@ CSRCS += stm32_cansock_setup.c
endif
endif
+ifeq ($(CONFIG_STM32F7_ROMFS),y)
+CSRCS += stm32_romfs_initialize.c
+endif
+
DEPPATH += --dep-path src
VPATH += :src
CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)src
diff --git a/boards/arm/stm32f7/nucleo-f767zi/src/stm32_romfs_initialize.c b/boards/arm/stm32f7/common/src/stm32_romfs_initialize.c
similarity index 84%
rename from boards/arm/stm32f7/nucleo-f767zi/src/stm32_romfs_initialize.c
rename to boards/arm/stm32f7/common/src/stm32_romfs_initialize.c
index 6d5bd3bb0a..c053c82b69 100644
--- a/boards/arm/stm32f7/nucleo-f767zi/src/stm32_romfs_initialize.c
+++ b/boards/arm/stm32f7/common/src/stm32_romfs_initialize.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-f767zi/src/stm32_romfs_initialize.c
+ * boards/arm/stm32f7/common/src/stm32_romfs_initialize.c
* This file provides contents of an optional ROMFS volume, mounted at boot.
*
* Copyright (C) 2017 Tomasz Wozniak. All rights reserved.
@@ -54,20 +54,20 @@
* Pre-processor Definitions
****************************************************************************/
-#ifndef CONFIG_STM32_ROMFS
-# error "CONFIG_STM32_ROMFS must be defined"
-#else
+#ifndef CONFIG_STM32F7_ROMFS
+# error "CONFIG_STM32F7_ROMFS must be defined"
+#endif
-#ifndef CONFIG_STM32_ROMFS_IMAGEFILE
-# error "CONFIG_STM32_ROMFS_IMAGEFILE must be defined"
+#ifndef CONFIG_STM32F7_ROMFS_IMAGEFILE
+# error "CONFIG_STM32F7_ROMFS_IMAGEFILE must be defined"
#endif
-#ifndef CONFIG_STM32_ROMFS_DEV_MINOR
-# error "CONFIG_STM32_ROMFS_DEV_MINOR must be defined"
+#ifndef CONFIG_STM32F7_ROMFS_DEV_MINOR
+# error "CONFIG_STM32F7_ROMFS_DEV_MINOR must be defined"
#endif
-#ifndef CONFIG_STM32_ROMFS_MOUNTPOINT
-# error "CONFIG_STM32_ROMFS_MOUNTPOINT must be defined"
+#ifndef CONFIG_STM32F7_ROMFS_MOUNTPOINT
+# error "CONFIG_STM32F7_ROMFS_MOUNTPOINT must be defined"
#endif
#define NSECTORS(size) (((size) + ROMFS_SECTOR_SIZE - 1)/ROMFS_SECTOR_SIZE)
@@ -76,7 +76,7 @@
#define STR(m) STR2(m)
#define MKMOUNT_DEVNAME(m) "/dev/ram" STR(m)
-#define MOUNT_DEVNAME MKMOUNT_DEVNAME(CONFIG_STM32_ROMFS_DEV_MINOR)
+#define MOUNT_DEVNAME MKMOUNT_DEVNAME(CONFIG_STM32F7_ROMFS_DEV_MINOR)
/****************************************************************************
* Private Data
@@ -87,7 +87,7 @@ __asm__ (
".balign 16\n"
".globl romfs_data_begin\n"
"romfs_data_begin:\n"
- ".incbin " STR(CONFIG_STM32_ROMFS_IMAGEFILE) "\n"\
+ ".incbin " STR(CONFIG_STM32F7_ROMFS_IMAGEFILE) "\n"\
\
".balign " STR(ROMFS_SECTOR_SIZE) "\n"
".globl romfs_data_end\n"
@@ -125,7 +125,7 @@ int stm32_romfs_initialize(void)
romfs_data_len = romfs_data_end - romfs_data_begin;
- ret = romdisk_register(CONFIG_STM32_ROMFS_DEV_MINOR, romfs_data_begin,
+ ret = romdisk_register(CONFIG_STM32F7_ROMFS_DEV_MINOR, romfs_data_begin,
NSECTORS(romfs_data_len), ROMFS_SECTOR_SIZE);
if (ret < 0)
{
@@ -136,18 +136,16 @@ int stm32_romfs_initialize(void)
/* Mount the file system */
finfo("Mounting ROMFS filesystem at target=%s with source=%s\n",
- CONFIG_STM32_ROMFS_MOUNTPOINT, MOUNT_DEVNAME);
+ CONFIG_STM32F7_ROMFS_MOUNTPOINT, MOUNT_DEVNAME);
- ret = nx_mount(MOUNT_DEVNAME, CONFIG_STM32_ROMFS_MOUNTPOINT,
+ ret = nx_mount(MOUNT_DEVNAME, CONFIG_STM32F7_ROMFS_MOUNTPOINT,
"romfs", MS_RDONLY, NULL);
if (ret < 0)
{
ferr("ERROR: nx_mount(%s,%s,romfs) failed: %d\n",
- MOUNT_DEVNAME, CONFIG_STM32_ROMFS_MOUNTPOINT, ret);
+ MOUNT_DEVNAME, CONFIG_STM32F7_ROMFS_MOUNTPOINT, ret);
return ret;
}
return OK;
}
-
-#endif /* CONFIG_STM32_ROMFS */
diff --git a/boards/arm/stm32f7/nucleo-f722ze/Kconfig b/boards/arm/stm32f7/nucleo-f722ze/Kconfig
index d57fb238a3..c34fa5de59 100644
--- a/boards/arm/stm32f7/nucleo-f722ze/Kconfig
+++ b/boards/arm/stm32f7/nucleo-f722ze/Kconfig
@@ -5,28 +5,6 @@
if ARCH_BOARD_NUCLEO_F722ZE
-config STM32_ROMFS
- bool "Automount baked-in ROMFS image"
- default n
- depends on FS_ROMFS
- ---help---
- Select STM32_ROMFS_IMAGEFILE, STM32_ROMFS_DEV_MINOR, STM32_ROMFS_MOUNTPOINT
-
-config STM32_ROMFS_DEV_MINOR
- int "Minor for the block device backing the data"
- depends on STM32_ROMFS
- default 64
-
-config STM32_ROMFS_MOUNTPOINT
- string "Mountpoint of the custom romfs image"
- depends on STM32_ROMFS
- default "/rom"
-
-config STM32_ROMFS_IMAGEFILE
- string "ROMFS image file to include into build"
- depends on STM32_ROMFS
- default "../../../rom.img"
-
choice
prompt "Select Console wiring."
default NUCLEO_F722ZE_CONSOLE_ARDUINO
diff --git a/boards/arm/stm32f7/nucleo-f722ze/src/CMakeLists.txt b/boards/arm/stm32f7/nucleo-f722ze/src/CMakeLists.txt
index 6f30cf4f8d..6d78330177 100644
--- a/boards/arm/stm32f7/nucleo-f722ze/src/CMakeLists.txt
+++ b/boards/arm/stm32f7/nucleo-f722ze/src/CMakeLists.txt
@@ -66,10 +66,6 @@ if(CONFIG_BOARDCTL_RESET)
list(APPEND SRCS stm32_reset.c)
endif()
-if(CONFIG_STM32_ROMFS)
- list(APPEND SRCS stm32_romfs_initialize.c)
-endif()
-
if(CONFIG_SENSORS_QENCODER)
list(APPEND SRCS stm32_qencoder.c)
endif()
diff --git a/boards/arm/stm32f7/nucleo-f722ze/src/Make.defs b/boards/arm/stm32f7/nucleo-f722ze/src/Make.defs
index 2c6e6ac046..8c1d6f881a 100644
--- a/boards/arm/stm32f7/nucleo-f722ze/src/Make.defs
+++ b/boards/arm/stm32f7/nucleo-f722ze/src/Make.defs
@@ -68,10 +68,6 @@ ifeq ($(CONFIG_BOARDCTL_RESET),y)
CSRCS += stm32_reset.c
endif
-ifeq ($(CONFIG_STM32_ROMFS),y)
-CSRCS += stm32_romfs_initialize.c
-endif
-
ifeq ($(CONFIG_SENSORS_QENCODER),y)
CSRCS += stm32_qencoder.c
endif
diff --git a/boards/arm/stm32f7/nucleo-f722ze/src/stm32_bringup.c b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_bringup.c
index 33c883333f..473460b5ed 100644
--- a/boards/arm/stm32f7/nucleo-f722ze/src/stm32_bringup.c
+++ b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_bringup.c
@@ -46,8 +46,8 @@
# include "stm32_cansock_setup.h"
#endif
-#ifdef CONFIG_STM32_ROMFS
-#include "stm32_romfs.h"
+#ifdef CONFIG_STM32F7_ROMFS
+# include "stm32_romfs.h"
#endif
#ifdef CONFIG_SYSTEMTICK_HOOK
@@ -94,14 +94,14 @@ int stm32_bringup(void)
}
#endif
-#ifdef CONFIG_STM32_ROMFS
+#ifdef CONFIG_STM32F7_ROMFS
/* Mount the romfs partition */
ret = stm32_romfs_initialize();
if (ret < 0)
{
syslog(LOG_ERR, "ERROR: Failed to mount romfs at %s: %d\n",
- CONFIG_STM32_ROMFS_MOUNTPOINT, ret);
+ CONFIG_STM32F7_ROMFS_MOUNTPOINT, ret);
}
#endif
diff --git a/boards/arm/stm32f7/nucleo-f722ze/src/stm32_romfs.h b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_romfs.h
deleted file mode 100644
index 1f309cd015..0000000000
--- a/boards/arm/stm32f7/nucleo-f722ze/src/stm32_romfs.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/****************************************************************************
- * boards/arm/stm32f7/nucleo-f722ze/src/stm32_romfs.h
- *
- * Copyright (C) 2017 Tomasz Wozniak. All rights reserved.
- * Author: Tomasz Wozniak <t....@samsung.com>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
- * used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-
-#ifndef __BOARDS_ARM_STM32F7_NUCLEO144_SRC_STM32_ROMFS_H
-#define __BOARDS_ARM_STM32F7_NUCLEO144_SRC_STM32_ROMFS_H
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#ifdef CONFIG_STM32_ROMFS
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-#define ROMFS_SECTOR_SIZE 64
-
-/****************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-/****************************************************************************
- * Name: stm32_romfs_initialize
- *
- * Description:
- * Registers built-in ROMFS image as block device and mounts it.
- *
- * Returned Value:
- * Zero (OK) on success, a negated errno value on error.
- *
- * Assumptions/Limitations:
- * Memory addresses [romfs_data_begin .. romfs_data_end) should contain
- * ROMFS volume data, as included in the assembly snippet above (l. 84).
- *
- ****************************************************************************/
-
-int stm32_romfs_initialize(void);
-
-#endif /* CONFIG_STM32_ROMFS */
-
-#endif /* __BOARDS_ARM_STM32F7_NUCLEO144_SRC_STM32_ROMFS_H */
diff --git a/boards/arm/stm32f7/nucleo-f722ze/src/stm32_romfs_initialize.c b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_romfs_initialize.c
deleted file mode 100644
index c433ee9014..0000000000
--- a/boards/arm/stm32f7/nucleo-f722ze/src/stm32_romfs_initialize.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/****************************************************************************
- * boards/arm/stm32f7/nucleo-f722ze/src/stm32_romfs_initialize.c
- * This file provides contents of an optional ROMFS volume, mounted at boot.
- *
- * Copyright (C) 2017 Tomasz Wozniak. All rights reserved.
- * Author: Tomasz Wozniak <t....@samsung.com>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
- * used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <sys/mount.h>
-#include <sys/types.h>
-#include <stdint.h>
-#include <debug.h>
-#include <errno.h>
-
-#include <nuttx/fs/fs.h>
-#include <nuttx/drivers/ramdisk.h>
-#include "stm32_romfs.h"
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-#ifndef CONFIG_STM32_ROMFS
-# error "CONFIG_STM32_ROMFS must be defined"
-#else
-
-#ifndef CONFIG_STM32_ROMFS_IMAGEFILE
-# error "CONFIG_STM32_ROMFS_IMAGEFILE must be defined"
-#endif
-
-#ifndef CONFIG_STM32_ROMFS_DEV_MINOR
-# error "CONFIG_STM32_ROMFS_DEV_MINOR must be defined"
-#endif
-
-#ifndef CONFIG_STM32_ROMFS_MOUNTPOINT
-# error "CONFIG_STM32_ROMFS_MOUNTPOINT must be defined"
-#endif
-
-#define NSECTORS(size) (((size) + ROMFS_SECTOR_SIZE - 1)/ROMFS_SECTOR_SIZE)
-
-#define STR2(m) #m
-#define STR(m) STR2(m)
-
-#define MKMOUNT_DEVNAME(m) "/dev/ram" STR(m)
-#define MOUNT_DEVNAME MKMOUNT_DEVNAME(CONFIG_STM32_ROMFS_DEV_MINOR)
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-__asm__ (
- ".section .rodata\n"
- ".balign 16\n"
- ".globl romfs_data_begin\n"
-"romfs_data_begin:\n"
- ".incbin " STR(CONFIG_STM32_ROMFS_IMAGEFILE) "\n"\
- \
- ".balign " STR(ROMFS_SECTOR_SIZE) "\n"
- ".globl romfs_data_end\n"
-"romfs_data_end:\n");
-
-extern const uint8_t romfs_data_begin[];
-extern const uint8_t romfs_data_end[];
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: stm32_romfs_initialize
- *
- * Description:
- * Registers the aboveincluded binary file as block device.
- * Then mounts the block device as ROMFS filesystems.
- *
- * Returned Value:
- * Zero (OK) on success, a negated errno value on error.
- *
- * Assumptions/Limitations:
- * Memory addresses [romfs_data_begin .. romfs_data_end) should contain
- * ROMFS volume data, as included in the assembly snippet above (l. 84).
- *
- ****************************************************************************/
-
-int stm32_romfs_initialize(void)
-{
- size_t romfs_data_len;
- int ret;
-
- /* Create a ROM disk for the /etc filesystem */
-
- romfs_data_len = romfs_data_end - romfs_data_begin;
-
- ret = romdisk_register(CONFIG_STM32_ROMFS_DEV_MINOR, romfs_data_begin,
- NSECTORS(romfs_data_len), ROMFS_SECTOR_SIZE);
- if (ret < 0)
- {
- ferr("ERROR: romdisk_register failed: %d\n", -ret);
- return ret;
- }
-
- /* Mount the file system */
-
- finfo("Mounting ROMFS filesystem at target=%s with source=%s\n",
- CONFIG_STM32_ROMFS_MOUNTPOINT, MOUNT_DEVNAME);
-
- ret = nx_mount(MOUNT_DEVNAME, CONFIG_STM32_ROMFS_MOUNTPOINT,
- "romfs", MS_RDONLY, NULL);
- if (ret < 0)
- {
- ferr("ERROR: nx_mount(%s,%s,romfs) failed: %d\n",
- MOUNT_DEVNAME, CONFIG_STM32_ROMFS_MOUNTPOINT, ret);
- return ret;
- }
-
- return OK;
-}
-
-#endif /* CONFIG_STM32_ROMFS */
diff --git a/boards/arm/stm32f7/nucleo-f746zg/Kconfig b/boards/arm/stm32f7/nucleo-f746zg/Kconfig
index d8ac578d2f..6697898410 100644
--- a/boards/arm/stm32f7/nucleo-f746zg/Kconfig
+++ b/boards/arm/stm32f7/nucleo-f746zg/Kconfig
@@ -5,28 +5,6 @@
if ARCH_BOARD_NUCLEO_F746ZG
-config STM32_ROMFS
- bool "Automount baked-in ROMFS image"
- default n
- depends on FS_ROMFS
- ---help---
- Select STM32_ROMFS_IMAGEFILE, STM32_ROMFS_DEV_MINOR, STM32_ROMFS_MOUNTPOINT
-
-config STM32_ROMFS_DEV_MINOR
- int "Minor for the block device backing the data"
- depends on STM32_ROMFS
- default 64
-
-config STM32_ROMFS_MOUNTPOINT
- string "Mountpoint of the custom romfs image"
- depends on STM32_ROMFS
- default "/rom"
-
-config STM32_ROMFS_IMAGEFILE
- string "ROMFS image file to include into build"
- depends on STM32_ROMFS
- default "../../../rom.img"
-
choice
prompt "Select Console wiring."
default NUCLEO_F746ZG_CONSOLE_ARDUINO
diff --git a/boards/arm/stm32f7/nucleo-f746zg/src/CMakeLists.txt b/boards/arm/stm32f7/nucleo-f746zg/src/CMakeLists.txt
index a5e418b383..193920163f 100644
--- a/boards/arm/stm32f7/nucleo-f746zg/src/CMakeLists.txt
+++ b/boards/arm/stm32f7/nucleo-f746zg/src/CMakeLists.txt
@@ -66,10 +66,6 @@ if(CONFIG_BOARDCTL_RESET)
list(APPEND SRCS stm32_reset.c)
endif()
-if(CONFIG_STM32_ROMFS)
- list(APPEND SRCS stm32_romfs_initialize.c)
-endif()
-
if(CONFIG_SENSORS_QENCODER)
list(APPEND SRCS stm32_qencoder.c)
endif()
diff --git a/boards/arm/stm32f7/nucleo-f746zg/src/Make.defs b/boards/arm/stm32f7/nucleo-f746zg/src/Make.defs
index ab7e5a4213..b5db10b2a9 100644
--- a/boards/arm/stm32f7/nucleo-f746zg/src/Make.defs
+++ b/boards/arm/stm32f7/nucleo-f746zg/src/Make.defs
@@ -68,10 +68,6 @@ ifeq ($(CONFIG_BOARDCTL_RESET),y)
CSRCS += stm32_reset.c
endif
-ifeq ($(CONFIG_STM32_ROMFS),y)
-CSRCS += stm32_romfs_initialize.c
-endif
-
ifeq ($(CONFIG_SENSORS_QENCODER),y)
CSRCS += stm32_qencoder.c
endif
diff --git a/boards/arm/stm32f7/nucleo-f746zg/src/stm32_bringup.c b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_bringup.c
index aff3bb55c0..5ef4a9699c 100644
--- a/boards/arm/stm32f7/nucleo-f746zg/src/stm32_bringup.c
+++ b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_bringup.c
@@ -46,8 +46,8 @@
# include "stm32_cansock_setup.h"
#endif
-#ifdef CONFIG_STM32_ROMFS
-#include "stm32_romfs.h"
+#ifdef CONFIG_STM32F7_ROMFS
+# include "stm32_romfs.h"
#endif
#ifdef CONFIG_SYSTEMTICK_HOOK
@@ -94,14 +94,14 @@ int stm32_bringup(void)
}
#endif
-#ifdef CONFIG_STM32_ROMFS
+#ifdef CONFIG_STM32F7_ROMFS
/* Mount the romfs partition */
ret = stm32_romfs_initialize();
if (ret < 0)
{
syslog(LOG_ERR, "ERROR: Failed to mount romfs at %s: %d\n",
- CONFIG_STM32_ROMFS_MOUNTPOINT, ret);
+ CONFIG_STM32F7_ROMFS_MOUNTPOINT, ret);
}
#endif
diff --git a/boards/arm/stm32f7/nucleo-f746zg/src/stm32_romfs.h b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_romfs.h
deleted file mode 100644
index e84db19ae5..0000000000
--- a/boards/arm/stm32f7/nucleo-f746zg/src/stm32_romfs.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/****************************************************************************
- * boards/arm/stm32f7/nucleo-f746zg/src/stm32_romfs.h
- *
- * Copyright (C) 2017 Tomasz Wozniak. All rights reserved.
- * Author: Tomasz Wozniak <t....@samsung.com>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
- * used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-
-#ifndef __BOARDS_ARM_STM32F7_NUCLEO144_SRC_STM32_ROMFS_H
-#define __BOARDS_ARM_STM32F7_NUCLEO144_SRC_STM32_ROMFS_H
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#ifdef CONFIG_STM32_ROMFS
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-#define ROMFS_SECTOR_SIZE 64
-
-/****************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-/****************************************************************************
- * Name: stm32_romfs_initialize
- *
- * Description:
- * Registers built-in ROMFS image as block device and mounts it.
- *
- * Returned Value:
- * Zero (OK) on success, a negated errno value on error.
- *
- * Assumptions/Limitations:
- * Memory addresses [romfs_data_begin .. romfs_data_end) should contain
- * ROMFS volume data, as included in the assembly snippet above (l. 84).
- *
- ****************************************************************************/
-
-int stm32_romfs_initialize(void);
-
-#endif /* CONFIG_STM32_ROMFS */
-
-#endif /* __BOARDS_ARM_STM32F7_NUCLEO144_SRC_STM32_ROMFS_H */
diff --git a/boards/arm/stm32f7/nucleo-f746zg/src/stm32_romfs_initialize.c b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_romfs_initialize.c
deleted file mode 100644
index 0f63609b32..0000000000
--- a/boards/arm/stm32f7/nucleo-f746zg/src/stm32_romfs_initialize.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/****************************************************************************
- * boards/arm/stm32f7/nucleo-f746zg/src/stm32_romfs_initialize.c
- * This file provides contents of an optional ROMFS volume, mounted at boot.
- *
- * Copyright (C) 2017 Tomasz Wozniak. All rights reserved.
- * Author: Tomasz Wozniak <t....@samsung.com>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
- * used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <sys/mount.h>
-#include <sys/types.h>
-#include <stdint.h>
-#include <debug.h>
-#include <errno.h>
-
-#include <nuttx/fs/fs.h>
-#include <nuttx/drivers/ramdisk.h>
-#include "stm32_romfs.h"
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-#ifndef CONFIG_STM32_ROMFS
-# error "CONFIG_STM32_ROMFS must be defined"
-#else
-
-#ifndef CONFIG_STM32_ROMFS_IMAGEFILE
-# error "CONFIG_STM32_ROMFS_IMAGEFILE must be defined"
-#endif
-
-#ifndef CONFIG_STM32_ROMFS_DEV_MINOR
-# error "CONFIG_STM32_ROMFS_DEV_MINOR must be defined"
-#endif
-
-#ifndef CONFIG_STM32_ROMFS_MOUNTPOINT
-# error "CONFIG_STM32_ROMFS_MOUNTPOINT must be defined"
-#endif
-
-#define NSECTORS(size) (((size) + ROMFS_SECTOR_SIZE - 1)/ROMFS_SECTOR_SIZE)
-
-#define STR2(m) #m
-#define STR(m) STR2(m)
-
-#define MKMOUNT_DEVNAME(m) "/dev/ram" STR(m)
-#define MOUNT_DEVNAME MKMOUNT_DEVNAME(CONFIG_STM32_ROMFS_DEV_MINOR)
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-__asm__ (
- ".section .rodata\n"
- ".balign 16\n"
- ".globl romfs_data_begin\n"
-"romfs_data_begin:\n"
- ".incbin " STR(CONFIG_STM32_ROMFS_IMAGEFILE) "\n"\
- \
- ".balign " STR(ROMFS_SECTOR_SIZE) "\n"
- ".globl romfs_data_end\n"
-"romfs_data_end:\n");
-
-extern const uint8_t romfs_data_begin[];
-extern const uint8_t romfs_data_end[];
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: stm32_romfs_initialize
- *
- * Description:
- * Registers the aboveincluded binary file as block device.
- * Then mounts the block device as ROMFS filesystems.
- *
- * Returned Value:
- * Zero (OK) on success, a negated errno value on error.
- *
- * Assumptions/Limitations:
- * Memory addresses [romfs_data_begin .. romfs_data_end) should contain
- * ROMFS volume data, as included in the assembly snippet above (l. 84).
- *
- ****************************************************************************/
-
-int stm32_romfs_initialize(void)
-{
- size_t romfs_data_len;
- int ret;
-
- /* Create a ROM disk for the /etc filesystem */
-
- romfs_data_len = romfs_data_end - romfs_data_begin;
-
- ret = romdisk_register(CONFIG_STM32_ROMFS_DEV_MINOR, romfs_data_begin,
- NSECTORS(romfs_data_len), ROMFS_SECTOR_SIZE);
- if (ret < 0)
- {
- ferr("ERROR: romdisk_register failed: %d\n", -ret);
- return ret;
- }
-
- /* Mount the file system */
-
- finfo("Mounting ROMFS filesystem at target=%s with source=%s\n",
- CONFIG_STM32_ROMFS_MOUNTPOINT, MOUNT_DEVNAME);
-
- ret = nx_mount(MOUNT_DEVNAME, CONFIG_STM32_ROMFS_MOUNTPOINT,
- "romfs", MS_RDONLY, NULL);
- if (ret < 0)
- {
- ferr("ERROR: nx_mount(%s,%s,romfs) failed: %d\n",
- MOUNT_DEVNAME, CONFIG_STM32_ROMFS_MOUNTPOINT, ret);
- return ret;
- }
-
- return OK;
-}
-
-#endif /* CONFIG_STM32_ROMFS */
diff --git a/boards/arm/stm32f7/nucleo-f767zi/Kconfig b/boards/arm/stm32f7/nucleo-f767zi/Kconfig
index 83086d2372..d9cfd182bd 100644
--- a/boards/arm/stm32f7/nucleo-f767zi/Kconfig
+++ b/boards/arm/stm32f7/nucleo-f767zi/Kconfig
@@ -5,28 +5,6 @@
if ARCH_BOARD_NUCLEO_F767ZI
-config STM32_ROMFS
- bool "Automount baked-in ROMFS image"
- default n
- depends on FS_ROMFS
- ---help---
- Select STM32_ROMFS_IMAGEFILE, STM32_ROMFS_DEV_MINOR, STM32_ROMFS_MOUNTPOINT
-
-config STM32_ROMFS_DEV_MINOR
- int "Minor for the block device backing the data"
- depends on STM32_ROMFS
- default 64
-
-config STM32_ROMFS_MOUNTPOINT
- string "Mountpoint of the custom romfs image"
- depends on STM32_ROMFS
- default "/rom"
-
-config STM32_ROMFS_IMAGEFILE
- string "ROMFS image file to include into build"
- depends on STM32_ROMFS
- default "../../../rom.img"
-
choice
prompt "Select Console wiring."
default NUCLEO_F767ZI_CONSOLE_ARDUINO
diff --git a/boards/arm/stm32f7/nucleo-f767zi/src/CMakeLists.txt b/boards/arm/stm32f7/nucleo-f767zi/src/CMakeLists.txt
index 73815d85c5..30e1c6b9bf 100644
--- a/boards/arm/stm32f7/nucleo-f767zi/src/CMakeLists.txt
+++ b/boards/arm/stm32f7/nucleo-f767zi/src/CMakeLists.txt
@@ -66,10 +66,6 @@ if(CONFIG_BOARDCTL_RESET)
list(APPEND SRCS stm32_reset.c)
endif()
-if(CONFIG_STM32_ROMFS)
- list(APPEND SRCS stm32_romfs_initialize.c)
-endif()
-
if(CONFIG_SENSORS_QENCODER)
list(APPEND SRCS stm32_qencoder.c)
endif()
diff --git a/boards/arm/stm32f7/nucleo-f767zi/src/Make.defs b/boards/arm/stm32f7/nucleo-f767zi/src/Make.defs
index bc0f0db9e4..1eef7361c2 100644
--- a/boards/arm/stm32f7/nucleo-f767zi/src/Make.defs
+++ b/boards/arm/stm32f7/nucleo-f767zi/src/Make.defs
@@ -68,10 +68,6 @@ ifeq ($(CONFIG_BOARDCTL_RESET),y)
CSRCS += stm32_reset.c
endif
-ifeq ($(CONFIG_STM32_ROMFS),y)
-CSRCS += stm32_romfs_initialize.c
-endif
-
ifeq ($(CONFIG_SENSORS_QENCODER),y)
CSRCS += stm32_qencoder.c
endif
diff --git a/boards/arm/stm32f7/nucleo-f767zi/src/stm32_bringup.c b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_bringup.c
index a6942a4f9a..2f32d07346 100644
--- a/boards/arm/stm32f7/nucleo-f767zi/src/stm32_bringup.c
+++ b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_bringup.c
@@ -46,8 +46,8 @@
# include "stm32_cansock_setup.h"
#endif
-#ifdef CONFIG_STM32_ROMFS
-#include "stm32_romfs.h"
+#ifdef CONFIG_STM32F7_ROMFS
+# include "stm32_romfs.h"
#endif
#ifdef CONFIG_SYSTEMTICK_HOOK
@@ -94,14 +94,14 @@ int stm32_bringup(void)
}
#endif
-#ifdef CONFIG_STM32_ROMFS
+#ifdef CONFIG_STM32F7_ROMFS
/* Mount the romfs partition */
ret = stm32_romfs_initialize();
if (ret < 0)
{
syslog(LOG_ERR, "ERROR: Failed to mount romfs at %s: %d\n",
- CONFIG_STM32_ROMFS_MOUNTPOINT, ret);
+ CONFIG_STM32F7_ROMFS_MOUNTPOINT, ret);
}
#endif
(nuttx) 02/06: boards/arm/stm32f7: move CAN init logic to a common directory
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit b606c17619f2f5ef64d3caa42cb28f9bd4428f97
Author: raiden00pl <ra...@railab.me>
AuthorDate: Sun Oct 20 12:57:58 2024 +0200
boards/arm/stm32f7: move CAN init logic to a common directory
move CAN init logic to a common directory
---
.../include/stm32_can_setup.h} | 68 +++++-------
.../include/stm32_cansock_setup.h} | 68 +++++-------
boards/arm/stm32f7/common/src/CMakeLists.txt | 9 ++
boards/arm/stm32f7/common/src/Make.defs | 9 ++
.../stm32_can.c => common/src/stm32_can_setup.c} | 3 +-
.../src/stm32_cansock_setup.c} | 2 +-
.../stm32f7/nucleo-f722ze/configs/can/defconfig | 1 +
.../nucleo-f722ze/configs/cansock/defconfig | 1 +
boards/arm/stm32f7/nucleo-f722ze/src/Make.defs | 9 --
.../arm/stm32f7/nucleo-f722ze/src/nucleo-f722ze.h | 16 ---
.../arm/stm32f7/nucleo-f722ze/src/stm32_bringup.c | 8 ++
boards/arm/stm32f7/nucleo-f722ze/src/stm32_can.c | 115 ---------------------
.../stm32f7/nucleo-f746zg/configs/pysim/defconfig | 1 +
.../arm/stm32f7/nucleo-f746zg/src/CMakeLists.txt | 9 --
boards/arm/stm32f7/nucleo-f746zg/src/Make.defs | 9 --
.../arm/stm32f7/nucleo-f746zg/src/nucleo-f746zg.h | 16 ---
.../arm/stm32f7/nucleo-f746zg/src/stm32_bringup.c | 8 ++
.../arm/stm32f7/nucleo-f767zi/src/CMakeLists.txt | 9 --
boards/arm/stm32f7/nucleo-f767zi/src/Make.defs | 9 --
.../arm/stm32f7/nucleo-f767zi/src/nucleo-f767zi.h | 16 ---
.../arm/stm32f7/nucleo-f767zi/src/stm32_bringup.c | 8 ++
boards/arm/stm32f7/nucleo-f767zi/src/stm32_can.c | 115 ---------------------
22 files changed, 103 insertions(+), 406 deletions(-)
diff --git a/boards/arm/stm32f7/nucleo-f722ze/src/stm32_cansock.c b/boards/arm/stm32f7/common/include/stm32_can_setup.h
similarity index 63%
rename from boards/arm/stm32f7/nucleo-f722ze/src/stm32_cansock.c
rename to boards/arm/stm32f7/common/include/stm32_can_setup.h
index 5f5ababb2a..0646310788 100644
--- a/boards/arm/stm32f7/nucleo-f722ze/src/stm32_cansock.c
+++ b/boards/arm/stm32f7/common/include/stm32_can_setup.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-f722ze/src/stm32_cansock.c
+ * boards/arm/stm32f7/common/include/stm32_can_setup.h
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -18,66 +18,54 @@
*
****************************************************************************/
+#ifndef __BOARDS_ARM_STM32F7_COMMON_INCLUDE_STM32_CAN_SETUP_H
+#define __BOARDS_ARM_STM32F7_COMMON_INCLUDE_STM32_CAN_SETUP_H
+
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
-#include <debug.h>
-
-#include "stm32_can.h"
-
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
-/* Configuration ************************************************************/
-
-#if !defined(CONFIG_STM32F7_CAN1) && !defined(CONFIG_STM32F7_CAN2)
-# error "No CAN is enable. Please eneable at least one CAN device"
-#endif
-
/****************************************************************************
- * Public Functions
+ * Public Types
****************************************************************************/
/****************************************************************************
- * Name: stm32_cansock_setup
- *
- * Description:
- * Initialize CAN socket interface
- *
+ * Public Data
****************************************************************************/
-int stm32_cansock_setup(void)
+#ifdef __cplusplus
+#define EXTERN extern "C"
+extern "C"
{
- int ret = OK;
-
- UNUSED(ret);
+#else
+#define EXTERN extern
+#endif
-#ifdef CONFIG_STM32F7_CAN1
- /* Call stm32_caninitialize() to get an instance of the CAN interface */
+/****************************************************************************
+ * Inline Functions
+ ****************************************************************************/
- ret = stm32_cansockinitialize(1);
- if (ret < 0)
- {
- canerr("ERROR: Failed to get CAN interface %d\n", ret);
- goto errout;
- }
-#endif
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
-#ifdef CONFIG_STM32F7_CAN2
- /* Call stm32_caninitialize() to get an instance of the CAN interface */
+/****************************************************************************
+ * Name: stm32_can_setup
+ ****************************************************************************/
- ret = stm32_cansockinitialize(2);
- if (ret < 0)
- {
- canerr("ERROR: Failed to get CAN interface %d\n", ret);
- goto errout;
- }
+#ifdef CONFIG_STM32F7_CAN_CHARDRIVER
+int stm32_can_setup(void);
#endif
-errout:
- return ret;
+#undef EXTERN
+#ifdef __cplusplus
}
+#endif
+
+#endif /* __BOARDS_ARM_STM32F7_COMMON_INCLUDE_STM32_CAN_SETUP_H */
diff --git a/boards/arm/stm32f7/nucleo-f746zg/src/stm32_cansock.c b/boards/arm/stm32f7/common/include/stm32_cansock_setup.h
similarity index 63%
rename from boards/arm/stm32f7/nucleo-f746zg/src/stm32_cansock.c
rename to boards/arm/stm32f7/common/include/stm32_cansock_setup.h
index 98452af5d8..800c4ed55d 100644
--- a/boards/arm/stm32f7/nucleo-f746zg/src/stm32_cansock.c
+++ b/boards/arm/stm32f7/common/include/stm32_cansock_setup.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-f746zg/src/stm32_cansock.c
+ * boards/arm/stm32f7/common/include/stm32_cansock_setup.h
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -18,66 +18,54 @@
*
****************************************************************************/
+#ifndef __BOARDS_ARM_STM32F7_COMMON_INCLUDE_STM32_CANSOCK_SETUP_H
+#define __BOARDS_ARM_STM32F7_COMMON_INCLUDE_STM32_CANSOCK_SETUP_H
+
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
-#include <debug.h>
-
-#include "stm32_can.h"
-
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
-/* Configuration ************************************************************/
-
-#if !defined(CONFIG_STM32F7_CAN1) && !defined(CONFIG_STM32F7_CAN2)
-# error "No CAN is enable. Please eneable at least one CAN device"
-#endif
-
/****************************************************************************
- * Public Functions
+ * Public Types
****************************************************************************/
/****************************************************************************
- * Name: stm32_cansock_setup
- *
- * Description:
- * Initialize CAN socket interface
- *
+ * Public Data
****************************************************************************/
-int stm32_cansock_setup(void)
+#ifdef __cplusplus
+#define EXTERN extern "C"
+extern "C"
{
- int ret = OK;
-
- UNUSED(ret);
+#else
+#define EXTERN extern
+#endif
-#ifdef CONFIG_STM32F7_CAN1
- /* Call stm32_caninitialize() to get an instance of the CAN interface */
+/****************************************************************************
+ * Inline Functions
+ ****************************************************************************/
- ret = stm32_cansockinitialize(1);
- if (ret < 0)
- {
- canerr("ERROR: Failed to get CAN interface %d\n", ret);
- goto errout;
- }
-#endif
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
-#ifdef CONFIG_STM32F7_CAN2
- /* Call stm32_caninitialize() to get an instance of the CAN interface */
+/****************************************************************************
+ * Name: stm32_cansock_setup
+ ****************************************************************************/
- ret = stm32_cansockinitialize(2);
- if (ret < 0)
- {
- canerr("ERROR: Failed to get CAN interface %d\n", ret);
- goto errout;
- }
+#ifdef CONFIG_STM32F7_CAN_SOCKET
+int stm32_cansock_setup(void);
#endif
-errout:
- return ret;
+#undef EXTERN
+#ifdef __cplusplus
}
+#endif
+
+#endif /* __BOARDS_ARM_STM32F7_COMMON_INCLUDE_STM32_CANSOCK_SETUP_H */
diff --git a/boards/arm/stm32f7/common/src/CMakeLists.txt b/boards/arm/stm32f7/common/src/CMakeLists.txt
index f2b17e2c09..61ec6b8d57 100644
--- a/boards/arm/stm32f7/common/src/CMakeLists.txt
+++ b/boards/arm/stm32f7/common/src/CMakeLists.txt
@@ -32,4 +32,13 @@ if(CONFIG_AUDIO_CS4344)
list(APPEND SRCS stm32_cs4344.c)
endif()
+if(CONFIG_STM32F7_CAN)
+ if(CONFIG_STM32F7_CAN_CHARDRIVER)
+ list(APPEND SRCS stm32_can.c)
+ endif()
+ if(CONFIG_STM32F7_CAN_SOCKET)
+ list(APPEND SRCS stm32_cansock.c)
+ endif()
+endif()
+
target_sources(board PRIVATE ${SRCS})
diff --git a/boards/arm/stm32f7/common/src/Make.defs b/boards/arm/stm32f7/common/src/Make.defs
index ae0d1bfe73..15455395ee 100644
--- a/boards/arm/stm32f7/common/src/Make.defs
+++ b/boards/arm/stm32f7/common/src/Make.defs
@@ -32,6 +32,15 @@ ifeq ($(CONFIG_AUDIO_CS4344),y)
CSRCS += stm32_cs4344.c
endif
+ifeq ($(CONFIG_STM32F7_CAN),y)
+ifeq ($(CONFIG_STM32F7_CAN_CHARDRIVER),y)
+CSRCS += stm32_can_setup.c
+endif
+ifeq ($(CONFIG_STM32F7_CAN_SOCKET),y)
+CSRCS += stm32_cansock_setup.c
+endif
+endif
+
DEPPATH += --dep-path src
VPATH += :src
CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)src
diff --git a/boards/arm/stm32f7/nucleo-f746zg/src/stm32_can.c b/boards/arm/stm32f7/common/src/stm32_can_setup.c
similarity index 97%
rename from boards/arm/stm32f7/nucleo-f746zg/src/stm32_can.c
rename to boards/arm/stm32f7/common/src/stm32_can_setup.c
index 8b4561de29..6593872876 100644
--- a/boards/arm/stm32f7/nucleo-f746zg/src/stm32_can.c
+++ b/boards/arm/stm32f7/common/src/stm32_can_setup.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-f746zg/src/stm32_can.c
+ * boards/arm/stm32f7/common/src/stm32_can_setup.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -31,7 +31,6 @@
#include <nuttx/can/can.h>
#include "stm32_can.h"
-#include "nucleo-f746zg.h"
#ifdef CONFIG_CAN
diff --git a/boards/arm/stm32f7/nucleo-f767zi/src/stm32_cansock.c b/boards/arm/stm32f7/common/src/stm32_cansock_setup.c
similarity index 97%
rename from boards/arm/stm32f7/nucleo-f767zi/src/stm32_cansock.c
rename to boards/arm/stm32f7/common/src/stm32_cansock_setup.c
index 72bde95d4b..a88059661b 100644
--- a/boards/arm/stm32f7/nucleo-f767zi/src/stm32_cansock.c
+++ b/boards/arm/stm32f7/common/src/stm32_cansock_setup.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-f767zi/src/stm32_cansock.c
+ * boards/arm/stm32f7/common/src/stm32_cansock_setup.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/boards/arm/stm32f7/nucleo-f722ze/configs/can/defconfig b/boards/arm/stm32f7/nucleo-f722ze/configs/can/defconfig
index 4f9ee4d9de..b960a5907c 100644
--- a/boards/arm/stm32f7/nucleo-f722ze/configs/can/defconfig
+++ b/boards/arm/stm32f7/nucleo-f722ze/configs/can/defconfig
@@ -8,6 +8,7 @@
# CONFIG_ARCH_FPU is not set
# CONFIG_STM32F7_USE_LEGACY_PINMAP is not set
CONFIG_ARCH="arm"
+CONFIG_ARCH_BOARD_COMMON=y
CONFIG_ARCH_BOARD="nucleo-f722ze"
CONFIG_ARCH_BOARD_NUCLEO_F722ZE=y
CONFIG_ARCH_BUTTONS=y
diff --git a/boards/arm/stm32f7/nucleo-f722ze/configs/cansock/defconfig b/boards/arm/stm32f7/nucleo-f722ze/configs/cansock/defconfig
index 4ca8520da5..532251939f 100644
--- a/boards/arm/stm32f7/nucleo-f722ze/configs/cansock/defconfig
+++ b/boards/arm/stm32f7/nucleo-f722ze/configs/cansock/defconfig
@@ -10,6 +10,7 @@
# CONFIG_NET_IPv4 is not set
# CONFIG_STM32F7_USE_LEGACY_PINMAP is not set
CONFIG_ARCH="arm"
+CONFIG_ARCH_BOARD_COMMON=y
CONFIG_ARCH_BOARD="nucleo-f722ze"
CONFIG_ARCH_BOARD_NUCLEO_F722ZE=y
CONFIG_ARCH_BUTTONS=y
diff --git a/boards/arm/stm32f7/nucleo-f722ze/src/Make.defs b/boards/arm/stm32f7/nucleo-f722ze/src/Make.defs
index 8399eb73e7..2c6e6ac046 100644
--- a/boards/arm/stm32f7/nucleo-f722ze/src/Make.defs
+++ b/boards/arm/stm32f7/nucleo-f722ze/src/Make.defs
@@ -76,15 +76,6 @@ ifeq ($(CONFIG_SENSORS_QENCODER),y)
CSRCS += stm32_qencoder.c
endif
-ifeq ($(CONFIG_STM32F7_CAN),y)
-ifeq ($(CONFIG_STM32F7_CAN_CHARDRIVER),y)
-CSRCS += stm32_can.c
-endif
-ifeq ($(CONFIG_STM32F7_CAN_SOCKET),y)
-CSRCS += stm32_cansock.c
-endif
-endif
-
ifeq ($(CONFIG_USBDEV_COMPOSITE),y)
CSRCS += stm32_composite.c
endif
diff --git a/boards/arm/stm32f7/nucleo-f722ze/src/nucleo-f722ze.h b/boards/arm/stm32f7/nucleo-f722ze/src/nucleo-f722ze.h
index 327476248e..5b45185c3d 100644
--- a/boards/arm/stm32f7/nucleo-f722ze/src/nucleo-f722ze.h
+++ b/boards/arm/stm32f7/nucleo-f722ze/src/nucleo-f722ze.h
@@ -325,22 +325,6 @@ int stm32_bbsram_int(void);
int stm32_qencoder_initialize(const char *devpath, int timer);
#endif
-/****************************************************************************
- * Name: stm32_can_setup
- ****************************************************************************/
-
-#ifdef CONFIG_STM32F7_CAN_CHARDRIVER
-int stm32_can_setup(void);
-#endif
-
-/****************************************************************************
- * Name: stm32_cansock_setup
- ****************************************************************************/
-
-#ifdef CONFIG_STM32F7_CAN_SOCKET
-int stm32_cansock_setup(void);
-#endif
-
/****************************************************************************
* Name: stm32f7_gpio_initialize
****************************************************************************/
diff --git a/boards/arm/stm32f7/nucleo-f722ze/src/stm32_bringup.c b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_bringup.c
index e961791581..33c883333f 100644
--- a/boards/arm/stm32f7/nucleo-f722ze/src/stm32_bringup.c
+++ b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_bringup.c
@@ -38,6 +38,14 @@
#include "stm32_i2c.h"
+#ifdef CONFIG_STM32F7_CAN_CHARDRIVER
+# include "stm32_can_setup.h"
+#endif
+
+#ifdef CONFIG_STM32F7_CAN_SOCKET
+# include "stm32_cansock_setup.h"
+#endif
+
#ifdef CONFIG_STM32_ROMFS
#include "stm32_romfs.h"
#endif
diff --git a/boards/arm/stm32f7/nucleo-f722ze/src/stm32_can.c b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_can.c
deleted file mode 100644
index 99119a88c7..0000000000
--- a/boards/arm/stm32f7/nucleo-f722ze/src/stm32_can.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/****************************************************************************
- * boards/arm/stm32f7/nucleo-f722ze/src/stm32_can.c
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership. The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <stdbool.h>
-#include <errno.h>
-#include <debug.h>
-
-#include <nuttx/can/can.h>
-
-#include "stm32_can.h"
-#include "nucleo-f722ze.h"
-
-#ifdef CONFIG_CAN
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-#ifdef CONFIG_STM32F7_CAN1
-# define CAN_PORT 1
-#else
-# define CAN_PORT 2
-#endif
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: stm32_can_setup
- *
- * Description:
- * Initialize CAN and register the CAN device
- *
- ****************************************************************************/
-
-int stm32_can_setup(void)
-{
-#if defined(CONFIG_STM32F7_CAN1)
- struct can_dev_s *can;
- int ret;
-
- /* Call stm32f7can_initialize() to get an instance of the CAN interface */
-
- can = stm32_caninitialize(CAN_PORT);
- if (can == NULL)
- {
- canerr("ERROR: Failed to get CAN interface\n");
- return -ENODEV;
- }
-
- /* Register the CAN driver at "/dev/can0" */
-
- ret = can_register("/dev/can0", can);
- if (ret < 0)
- {
- canerr("ERROR: can_register failed: %d\n", ret);
- return ret;
- }
-
- return OK;
-#endif
-
-#if defined(CONFIG_STM32F7_CAN2)
- struct can_dev_s *can;
- int ret;
-
- /* Call stm32f7can_initialize() to get an instance of the CAN interface */
-
- can = stm32_caninitialize(CAN_PORT);
- if (can == NULL)
- {
- canerr("ERROR: Failed to get CAN interface\n");
- return -ENODEV;
- }
-
- /* Register the CAN driver at "/dev/can1" */
-
- ret = can_register("/dev/can1", can);
- if (ret < 0)
- {
- canerr("ERROR: can_register failed: %d\n", ret);
- return ret;
- }
-
- return OK;
-#else
- return -ENODEV;
-#endif
-}
-
-#endif /* CONFIG_CAN */
diff --git a/boards/arm/stm32f7/nucleo-f746zg/configs/pysim/defconfig b/boards/arm/stm32f7/nucleo-f746zg/configs/pysim/defconfig
index 6536eda075..88d1b89769 100644
--- a/boards/arm/stm32f7/nucleo-f746zg/configs/pysim/defconfig
+++ b/boards/arm/stm32f7/nucleo-f746zg/configs/pysim/defconfig
@@ -12,6 +12,7 @@ CONFIG_ADC=y
CONFIG_ADC_FIFOSIZE=16
CONFIG_ANALOG=y
CONFIG_ARCH="arm"
+CONFIG_ARCH_BOARD_COMMON=y
CONFIG_ARCH_BOARD="nucleo-f746zg"
CONFIG_ARCH_BOARD_NUCLEO_F746ZG=y
CONFIG_ARCH_BUTTONS=y
diff --git a/boards/arm/stm32f7/nucleo-f746zg/src/CMakeLists.txt b/boards/arm/stm32f7/nucleo-f746zg/src/CMakeLists.txt
index 87e7107985..a5e418b383 100644
--- a/boards/arm/stm32f7/nucleo-f746zg/src/CMakeLists.txt
+++ b/boards/arm/stm32f7/nucleo-f746zg/src/CMakeLists.txt
@@ -74,15 +74,6 @@ if(CONFIG_SENSORS_QENCODER)
list(APPEND SRCS stm32_qencoder.c)
endif()
-if(CONFIG_STM32F7_CAN)
- if(CONFIG_STM32F7_CAN_CHARDRIVER)
- list(APPEND SRCS stm32_can.c)
- endif()
- if(CONFIG_STM32F7_CAN_SOCKET)
- list(APPEND SRCS stm32_cansock.c)
- endif()
-endif()
-
if(CONFIG_USBDEV_COMPOSITE)
list(APPEND SRCS stm32_composite.c)
endif()
diff --git a/boards/arm/stm32f7/nucleo-f746zg/src/Make.defs b/boards/arm/stm32f7/nucleo-f746zg/src/Make.defs
index cfa460bb76..ab7e5a4213 100644
--- a/boards/arm/stm32f7/nucleo-f746zg/src/Make.defs
+++ b/boards/arm/stm32f7/nucleo-f746zg/src/Make.defs
@@ -76,15 +76,6 @@ ifeq ($(CONFIG_SENSORS_QENCODER),y)
CSRCS += stm32_qencoder.c
endif
-ifeq ($(CONFIG_STM32F7_CAN),y)
-ifeq ($(CONFIG_STM32F7_CAN_CHARDRIVER),y)
-CSRCS += stm32_can.c
-endif
-ifeq ($(CONFIG_STM32F7_CAN_SOCKET),y)
-CSRCS += stm32_cansock.c
-endif
-endif
-
ifeq ($(CONFIG_USBDEV_COMPOSITE),y)
CSRCS += stm32_composite.c
endif
diff --git a/boards/arm/stm32f7/nucleo-f746zg/src/nucleo-f746zg.h b/boards/arm/stm32f7/nucleo-f746zg/src/nucleo-f746zg.h
index 5ed7b8cc22..131bcb041b 100644
--- a/boards/arm/stm32f7/nucleo-f746zg/src/nucleo-f746zg.h
+++ b/boards/arm/stm32f7/nucleo-f746zg/src/nucleo-f746zg.h
@@ -325,22 +325,6 @@ int stm32_bbsram_int(void);
int stm32_qencoder_initialize(const char *devpath, int timer);
#endif
-/****************************************************************************
- * Name: stm32_can_setup
- ****************************************************************************/
-
-#ifdef CONFIG_STM32F7_CAN_CHARDRIVER
-int stm32_can_setup(void);
-#endif
-
-/****************************************************************************
- * Name: stm32_cansock_setup
- ****************************************************************************/
-
-#ifdef CONFIG_STM32F7_CAN_SOCKET
-int stm32_cansock_setup(void);
-#endif
-
/****************************************************************************
* Name: stm32f7_gpio_initialize
****************************************************************************/
diff --git a/boards/arm/stm32f7/nucleo-f746zg/src/stm32_bringup.c b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_bringup.c
index b58aba9db6..aff3bb55c0 100644
--- a/boards/arm/stm32f7/nucleo-f746zg/src/stm32_bringup.c
+++ b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_bringup.c
@@ -38,6 +38,14 @@
#include "stm32_i2c.h"
+#ifdef CONFIG_STM32F7_CAN_CHARDRIVER
+# include "stm32_can_setup.h"
+#endif
+
+#ifdef CONFIG_STM32F7_CAN_SOCKET
+# include "stm32_cansock_setup.h"
+#endif
+
#ifdef CONFIG_STM32_ROMFS
#include "stm32_romfs.h"
#endif
diff --git a/boards/arm/stm32f7/nucleo-f767zi/src/CMakeLists.txt b/boards/arm/stm32f7/nucleo-f767zi/src/CMakeLists.txt
index 1591679715..73815d85c5 100644
--- a/boards/arm/stm32f7/nucleo-f767zi/src/CMakeLists.txt
+++ b/boards/arm/stm32f7/nucleo-f767zi/src/CMakeLists.txt
@@ -74,15 +74,6 @@ if(CONFIG_SENSORS_QENCODER)
list(APPEND SRCS stm32_qencoder.c)
endif()
-if(CONFIG_STM32F7_CAN)
- if(CONFIG_STM32F7_CAN_CHARDRIVER)
- list(APPEND SRCS stm32_can.c)
- endif()
- if(CONFIG_STM32F7_CAN_SOCKET)
- list(APPEND SRCS stm32_cansock.c)
- endif()
-endif()
-
if(CONFIG_USBDEV_COMPOSITE)
list(APPEND SRCS stm32_composite.c)
endif()
diff --git a/boards/arm/stm32f7/nucleo-f767zi/src/Make.defs b/boards/arm/stm32f7/nucleo-f767zi/src/Make.defs
index b345afc6a4..bc0f0db9e4 100644
--- a/boards/arm/stm32f7/nucleo-f767zi/src/Make.defs
+++ b/boards/arm/stm32f7/nucleo-f767zi/src/Make.defs
@@ -76,15 +76,6 @@ ifeq ($(CONFIG_SENSORS_QENCODER),y)
CSRCS += stm32_qencoder.c
endif
-ifeq ($(CONFIG_STM32F7_CAN),y)
-ifeq ($(CONFIG_STM32F7_CAN_CHARDRIVER),y)
-CSRCS += stm32_can.c
-endif
-ifeq ($(CONFIG_STM32F7_CAN_SOCKET),y)
-CSRCS += stm32_cansock.c
-endif
-endif
-
ifeq ($(CONFIG_USBDEV_COMPOSITE),y)
CSRCS += stm32_composite.c
endif
diff --git a/boards/arm/stm32f7/nucleo-f767zi/src/nucleo-f767zi.h b/boards/arm/stm32f7/nucleo-f767zi/src/nucleo-f767zi.h
index d7887943bf..f91291702a 100644
--- a/boards/arm/stm32f7/nucleo-f767zi/src/nucleo-f767zi.h
+++ b/boards/arm/stm32f7/nucleo-f767zi/src/nucleo-f767zi.h
@@ -325,22 +325,6 @@ int stm32_bbsram_int(void);
int stm32_qencoder_initialize(const char *devpath, int timer);
#endif
-/****************************************************************************
- * Name: stm32_can_setup
- ****************************************************************************/
-
-#ifdef CONFIG_STM32F7_CAN_CHARDRIVER
-int stm32_can_setup(void);
-#endif
-
-/****************************************************************************
- * Name: stm32_cansock_setup
- ****************************************************************************/
-
-#ifdef CONFIG_STM32F7_CAN_SOCKET
-int stm32_cansock_setup(void);
-#endif
-
/****************************************************************************
* Name: stm32f7_gpio_initialize
****************************************************************************/
diff --git a/boards/arm/stm32f7/nucleo-f767zi/src/stm32_bringup.c b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_bringup.c
index 9e36235fd9..a6942a4f9a 100644
--- a/boards/arm/stm32f7/nucleo-f767zi/src/stm32_bringup.c
+++ b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_bringup.c
@@ -38,6 +38,14 @@
#include "stm32_i2c.h"
+#ifdef CONFIG_STM32F7_CAN_CHARDRIVER
+# include "stm32_can_setup.h"
+#endif
+
+#ifdef CONFIG_STM32F7_CAN_SOCKET
+# include "stm32_cansock_setup.h"
+#endif
+
#ifdef CONFIG_STM32_ROMFS
#include "stm32_romfs.h"
#endif
diff --git a/boards/arm/stm32f7/nucleo-f767zi/src/stm32_can.c b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_can.c
deleted file mode 100644
index fa067d6311..0000000000
--- a/boards/arm/stm32f7/nucleo-f767zi/src/stm32_can.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/****************************************************************************
- * boards/arm/stm32f7/nucleo-f767zi/src/stm32_can.c
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership. The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <stdbool.h>
-#include <errno.h>
-#include <debug.h>
-
-#include <nuttx/can/can.h>
-
-#include "stm32_can.h"
-#include "nucleo-f767zi.h"
-
-#ifdef CONFIG_CAN
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-#ifdef CONFIG_STM32F7_CAN1
-# define CAN_PORT 1
-#else
-# define CAN_PORT 2
-#endif
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: stm32_can_setup
- *
- * Description:
- * Initialize CAN and register the CAN device
- *
- ****************************************************************************/
-
-int stm32_can_setup(void)
-{
-#if defined(CONFIG_STM32F7_CAN1)
- struct can_dev_s *can;
- int ret;
-
- /* Call stm32f7can_initialize() to get an instance of the CAN interface */
-
- can = stm32_caninitialize(CAN_PORT);
- if (can == NULL)
- {
- canerr("ERROR: Failed to get CAN interface\n");
- return -ENODEV;
- }
-
- /* Register the CAN driver at "/dev/can0" */
-
- ret = can_register("/dev/can0", can);
- if (ret < 0)
- {
- canerr("ERROR: can_register failed: %d\n", ret);
- return ret;
- }
-
- return OK;
-#endif
-
-#if defined(CONFIG_STM32F7_CAN2)
- struct can_dev_s *can;
- int ret;
-
- /* Call stm32f7can_initialize() to get an instance of the CAN interface */
-
- can = stm32_caninitialize(CAN_PORT);
- if (can == NULL)
- {
- canerr("ERROR: Failed to get CAN interface\n");
- return -ENODEV;
- }
-
- /* Register the CAN driver at "/dev/can1" */
-
- ret = can_register("/dev/can1", can);
- if (ret < 0)
- {
- canerr("ERROR: can_register failed: %d\n", ret);
- return ret;
- }
-
- return OK;
-#else
- return -ENODEV;
-#endif
-}
-
-#endif /* CONFIG_CAN */
(nuttx) 01/06: boards/arm/stm32f7: separate nucleo-144 board into individual boards
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 6657f2abb7f242aaf577a4d46afbded36391b8c6
Author: raiden00pl <ra...@railab.me>
AuthorDate: Sun Oct 20 09:58:25 2024 +0200
boards/arm/stm32f7: separate nucleo-144 board into individual boards
nucleo-144 combines 3 different ST boards. This approach is inconsistent with
the support for the rest of the nucleo boards, where each board is in separate folders.
Also nucleo-144 is no longer reserved for STM32F7 chips but other families also use this format.
After this commit nucleo-144 is divided into 3 boards:
- nucleo-f746zg
- nucleo-f767zi
- nucleo-f722ze
---
.../{nucleo-f722 => nucleo-f722ze}/index.rst | 16 +--
.../{nucleo-f746 => nucleo-f746zg}/index.rst | 14 +--
.../{nucleo-f767 => nucleo-f767zi}/index.rst | 16 +--
LICENSE | 12 ++-
boards/Kconfig | 61 ++++++-----
.../nucleo-144/configs/f722-cansock/Make.defs | 39 -------
.../nucleo-144/configs/f722-composite/Make.defs | 39 -------
.../nucleo-144/configs/f746-evalos/Make.defs | 39 -------
.../stm32f7/nucleo-144/configs/f746-nsh/Make.defs | 39 -------
.../nucleo-144/configs/f746-pysim/Make.defs | 39 -------
.../nucleo-144/configs/f767-evalos/Make.defs | 39 -------
.../nucleo-144/configs/f767-netnsh/Make.defs | 39 -------
.../{nucleo-144 => nucleo-f722ze}/CMakeLists.txt | 2 +-
.../stm32f7/{nucleo-144 => nucleo-f722ze}/Kconfig | 112 ++++++++++----------
.../configs/can}/defconfig | 8 +-
.../configs/cansock}/defconfig | 8 +-
.../configs/composite}/defconfig | 6 +-
.../configs/nsh}/defconfig | 4 +-
.../{nucleo-144 => nucleo-f722ze}/include/board.h | 22 ++--
.../f722-nsh => nucleo-f722ze/scripts}/Make.defs | 4 +-
.../scripts/flash.ld} | 2 +-
.../scripts/kernel-space.ld | 2 +-
.../scripts/user-space.ld | 2 +-
.../src/CMakeLists.txt | 9 +-
.../{nucleo-144 => nucleo-f722ze}/src/Make.defs | 2 +-
.../src/nucleo-f722ze.h} | 19 ++--
.../{nucleo-144 => nucleo-f722ze}/src/stm32_adc.c | 4 +-
.../src/stm32_appinitialize.c | 4 +-
.../src/stm32_autoleds.c | 4 +-
.../src/stm32_bbsram.c | 4 +-
.../{nucleo-144 => nucleo-f722ze}/src/stm32_boot.c | 4 +-
.../src/stm32_bringup.c | 6 +-
.../src/stm32_buttons.c | 4 +-
.../{nucleo-144 => nucleo-f722ze}/src/stm32_can.c | 4 +-
.../src/stm32_cansock.c | 2 +-
.../src/stm32_composite.c | 2 +-
.../src/stm32_dma_alloc.c | 4 +-
.../{nucleo-144 => nucleo-f722ze}/src/stm32_gpio.c | 6 +-
.../{nucleo-144 => nucleo-f722ze}/src/stm32_pwm.c | 4 +-
.../src/stm32_qencoder.c | 4 +-
.../src/stm32_reset.c | 2 +-
.../src/stm32_romfs.h | 2 +-
.../src/stm32_romfs_initialize.c | 2 +-
.../{nucleo-144 => nucleo-f722ze}/src/stm32_sdio.c | 4 +-
.../{nucleo-144 => nucleo-f722ze}/src/stm32_spi.c | 106 ++++++++++---------
.../{nucleo-144 => nucleo-f722ze}/src/stm32_usb.c | 6 +-
.../src/stm32_userleds.c | 4 +-
.../{nucleo-144 => nucleo-f746zg}/CMakeLists.txt | 2 +-
.../stm32f7/{nucleo-144 => nucleo-f746zg}/Kconfig | 112 ++++++++++----------
.../configs/evalos}/defconfig | 6 +-
.../configs/nsh}/defconfig | 6 +-
.../configs/pysim}/defconfig | 6 +-
.../{nucleo-144 => nucleo-f746zg}/include/board.h | 22 ++--
.../f722-can => nucleo-f746zg/scripts}/Make.defs | 4 +-
.../scripts/flash.ld} | 2 +-
.../scripts/kernel-space.ld | 2 +-
.../scripts/memory.ld | 2 +-
.../scripts/user-space.ld | 2 +-
.../src/CMakeLists.txt | 9 +-
.../{nucleo-144 => nucleo-f746zg}/src/Make.defs | 2 +-
.../src/nucleo-f746zg.h} | 19 ++--
.../{nucleo-144 => nucleo-f746zg}/src/stm32_adc.c | 4 +-
.../src/stm32_appinitialize.c | 4 +-
.../src/stm32_autoleds.c | 4 +-
.../src/stm32_bbsram.c | 4 +-
.../{nucleo-144 => nucleo-f746zg}/src/stm32_boot.c | 4 +-
.../src/stm32_bringup.c | 6 +-
.../src/stm32_buttons.c | 4 +-
.../{nucleo-144 => nucleo-f746zg}/src/stm32_can.c | 4 +-
.../src/stm32_cansock.c | 2 +-
.../src/stm32_composite.c | 2 +-
.../src/stm32_dma_alloc.c | 4 +-
.../{nucleo-144 => nucleo-f746zg}/src/stm32_gpio.c | 6 +-
.../{nucleo-144 => nucleo-f746zg}/src/stm32_pwm.c | 4 +-
.../src/stm32_qencoder.c | 4 +-
.../src/stm32_reset.c | 2 +-
.../src/stm32_romfs.h | 2 +-
.../src/stm32_romfs_initialize.c | 2 +-
.../{nucleo-144 => nucleo-f746zg}/src/stm32_sdio.c | 4 +-
.../{nucleo-144 => nucleo-f746zg}/src/stm32_spi.c | 114 +++++++++++----------
.../{nucleo-144 => nucleo-f746zg}/src/stm32_usb.c | 6 +-
.../src/stm32_userleds.c | 4 +-
.../{nucleo-144 => nucleo-f767zi}/CMakeLists.txt | 2 +-
.../stm32f7/{nucleo-144 => nucleo-f767zi}/Kconfig | 112 ++++++++++----------
.../configs/evalos}/defconfig | 6 +-
.../configs/netnsh}/defconfig | 6 +-
.../configs/nsh}/defconfig | 6 +-
.../{nucleo-144 => nucleo-f767zi}/include/board.h | 22 ++--
.../f767-nsh => nucleo-f767zi/scripts}/Make.defs | 4 +-
.../scripts/flash.ld} | 2 +-
.../scripts/kernel-space.ld | 2 +-
.../scripts/user-space.ld | 2 +-
.../src/CMakeLists.txt | 9 +-
.../{nucleo-144 => nucleo-f767zi}/src/Make.defs | 2 +-
.../src/nucleo-f767zi.h} | 19 ++--
.../{nucleo-144 => nucleo-f767zi}/src/stm32_adc.c | 4 +-
.../src/stm32_appinitialize.c | 4 +-
.../src/stm32_autoleds.c | 4 +-
.../src/stm32_bbsram.c | 4 +-
.../{nucleo-144 => nucleo-f767zi}/src/stm32_boot.c | 4 +-
.../src/stm32_bringup.c | 6 +-
.../src/stm32_buttons.c | 4 +-
.../{nucleo-144 => nucleo-f767zi}/src/stm32_can.c | 4 +-
.../src/stm32_cansock.c | 2 +-
.../src/stm32_composite.c | 2 +-
.../src/stm32_dma_alloc.c | 4 +-
.../{nucleo-144 => nucleo-f767zi}/src/stm32_gpio.c | 6 +-
.../{nucleo-144 => nucleo-f767zi}/src/stm32_pwm.c | 4 +-
.../src/stm32_qencoder.c | 4 +-
.../src/stm32_reset.c | 2 +-
.../src/stm32_romfs.h | 2 +-
.../src/stm32_romfs_initialize.c | 2 +-
.../{nucleo-144 => nucleo-f767zi}/src/stm32_sdio.c | 4 +-
.../{nucleo-144 => nucleo-f767zi}/src/stm32_spi.c | 114 +++++++++++----------
.../{nucleo-144 => nucleo-f767zi}/src/stm32_usb.c | 6 +-
.../src/stm32_userleds.c | 4 +-
tools/ci/testlist/arm-13.dat | 20 ++--
117 files changed, 654 insertions(+), 912 deletions(-)
diff --git a/Documentation/platforms/arm/stm32f7/boards/nucleo-f722/index.rst b/Documentation/platforms/arm/stm32f7/boards/nucleo-f722ze/index.rst
similarity index 98%
rename from Documentation/platforms/arm/stm32f7/boards/nucleo-f722/index.rst
rename to Documentation/platforms/arm/stm32f7/boards/nucleo-f722ze/index.rst
index 80c7acea6c..9e29021d11 100644
--- a/Documentation/platforms/arm/stm32f7/boards/nucleo-f722/index.rst
+++ b/Documentation/platforms/arm/stm32f7/boards/nucleo-f722ze/index.rst
@@ -272,8 +272,8 @@ and connect it as follows::
Configurations
==============
-f7xx-nsh
---------
+nsh
+---
Configures the NuttShell (nsh) located at apps/examples/nsh for the
Nucleo-144 boards. The Configuration enables the serial interfaces
@@ -290,11 +290,11 @@ NOTES:
b. If this is the initial configuration then execute::
- ./tools/configure.sh nucleo-144:nsh
+ ./tools/configure.sh nucleo-f722ze:nsh
in nuttx/ in order to start configuration process.
Caution: Doing this step more than once will overwrite .config with
- the contents of the nucleo-144/nsh/defconfig file.
+ the contents of the nucleo-f722ze/nsh/defconfig file.
c. Execute 'make oldconfig' in nuttx/ in order to refresh the
configuration.
@@ -334,8 +334,8 @@ NOTES:
Default values for other settings associated with the select USART should
be correct.
-f7xx-evalos:
-------------
+evalos:
+-------
This configuration is designed to test the features of the board.
@@ -358,11 +358,11 @@ NOTES:
b. If this is the initial configuration then execute::
- ./tools/configure.sh nucleo-144:evalos
+ ./tools/configure.sh nucleo-f722ze:evalos
in nuttx/ in order to start configuration process.
Caution: Doing this step more than once will overwrite .config with
- the contents of the nucleo-144/evalos/defconfig file.
+ the contents of the nucleo-f722ze/evalos/defconfig file.
c. Execute 'make oldconfig' in nuttx/ in order to refresh the
configuration.
diff --git a/Documentation/platforms/arm/stm32f7/boards/nucleo-f746/index.rst b/Documentation/platforms/arm/stm32f7/boards/nucleo-f746zg/index.rst
similarity index 98%
rename from Documentation/platforms/arm/stm32f7/boards/nucleo-f746/index.rst
rename to Documentation/platforms/arm/stm32f7/boards/nucleo-f746zg/index.rst
index 650b23bd63..c876a90404 100644
--- a/Documentation/platforms/arm/stm32f7/boards/nucleo-f746/index.rst
+++ b/Documentation/platforms/arm/stm32f7/boards/nucleo-f746zg/index.rst
@@ -314,8 +314,8 @@ and connect it as follows::
Configurations
==============
-f7xx-nsh
---------
+nsh
+---
Configures the NuttShell (nsh) located at apps/examples/nsh for the
Nucleo-144 boards. The Configuration enables the serial interfaces
@@ -332,11 +332,11 @@ NOTES:
b. If this is the initial configuration then execute::
- ./tools/configure.sh nucleo-144:nsh
+ ./tools/configure.sh nucleo-f746zg:nsh
in nuttx/ in order to start configuration process.
Caution: Doing this step more than once will overwrite .config with
- the contents of the nucleo-144/nsh/defconfig file.
+ the contents of the nucleo-f746zg/nsh/defconfig file.
c. Execute 'make oldconfig' in nuttx/ in order to refresh the
configuration.
@@ -376,8 +376,8 @@ NOTES:
Default values for other settings associated with the select USART should
be correct.
-f7xx-evalos:
-------------
+evalos:
+-------
This configuration is designed to test the features of the board.
@@ -404,7 +404,7 @@ NOTES:
in nuttx/ in order to start configuration process.
Caution: Doing this step more than once will overwrite .config with
- the contents of the nucleo-144/evalos/defconfig file.
+ the contents of the nucleo-f746zg/evalos/defconfig file.
c. Execute 'make oldconfig' in nuttx/ in order to refresh the
configuration.
diff --git a/Documentation/platforms/arm/stm32f7/boards/nucleo-f767/index.rst b/Documentation/platforms/arm/stm32f7/boards/nucleo-f767zi/index.rst
similarity index 98%
rename from Documentation/platforms/arm/stm32f7/boards/nucleo-f767/index.rst
rename to Documentation/platforms/arm/stm32f7/boards/nucleo-f767zi/index.rst
index 810403a926..14d097be4d 100644
--- a/Documentation/platforms/arm/stm32f7/boards/nucleo-f767/index.rst
+++ b/Documentation/platforms/arm/stm32f7/boards/nucleo-f767zi/index.rst
@@ -316,8 +316,8 @@ and connect it as follows::
Configurations
==============
-f7xx-nsh
---------
+nsh
+---
Configures the NuttShell (nsh) located at apps/examples/nsh for the
Nucleo-144 boards. The Configuration enables the serial interfaces
@@ -334,11 +334,11 @@ NOTES:
b. If this is the initial configuration then execute::
- ./tools/configure.sh nucleo-144:nsh
+ ./tools/configure.sh nucleo-f767zi:nsh
in nuttx/ in order to start configuration process.
Caution: Doing this step more than once will overwrite .config with
- the contents of the nucleo-144/nsh/defconfig file.
+ the contents of the nucleo-f767zi/nsh/defconfig file.
c. Execute 'make oldconfig' in nuttx/ in order to refresh the
configuration.
@@ -378,8 +378,8 @@ NOTES:
Default values for other settings associated with the select USART should
be correct.
-f7xx-evalos:
-------------
+evalos:
+-------
This configuration is designed to test the features of the board.
@@ -402,11 +402,11 @@ NOTES:
b. If this is the initial configuration then execute::
- ./tools/configure.sh nucleo-144:evalos
+ ./tools/configure.sh nucleo-f767zi:evalos
in nuttx/ in order to start configuration process.
Caution: Doing this step more than once will overwrite .config with
- the contents of the nucleo-144/evalos/defconfig file.
+ the contents of the nucleo-f767zi/evalos/defconfig file.
c. Execute 'make oldconfig' in nuttx/ in order to refresh the
configuration.
diff --git a/LICENSE b/LICENSE
index 0ea7752a49..bcaf54b851 100644
--- a/LICENSE
+++ b/LICENSE
@@ -3355,8 +3355,12 @@ boards/arm/stm32/omnibusf4/src/stm32_romfs.h
boards/arm/stm32/omnibusf4/src/stm32_romfs_initialize.c
boards/arm/stm32/stm32f4discovery/src/stm32_romfs.h
boards/arm/stm32/stm32f4discovery/src/stm32_romfs_initialize.c
-boards/arm/stm32f7/nucleo-144/src/stm32_romfs.h
-boards/arm/stm32f7/nucleo-144/src/stm32_romfs_initialize.c
+boards/arm/stm32f7/nucleo-f722ze/src/stm32_romfs.h
+boards/arm/stm32f7/nucleo-f722ze/src/stm32_romfs_initialize.c
+boards/arm/stm32f7/nucleo-f746zg/src/stm32_romfs.h
+boards/arm/stm32f7/nucleo-f746zg/src/stm32_romfs_initialize.c
+boards/arm/stm32f7/nucleo-f767zi/src/stm32_romfs.h
+boards/arm/stm32f7/nucleo-f767zi/src/stm32_romfs_initialize.c
=============================================================
Copyright (C) 2017 Tomasz Wozniak. All rights reserved.
@@ -3420,7 +3424,9 @@ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
-boards/arm/stm32f7/nucleo-144/src/stm32_dma_alloc.c
+boards/arm/stm32f7/nucleo-f722ze/src/stm32_dma_alloc.c
+boards/arm/stm32f7/nucleo-f746zg/src/stm32_dma_alloc.c
+boards/arm/stm32f7/nucleo-f767zi/src/stm32_dma_alloc.c
boards/arm/stm32f7/stm32f746-ws/src/stm32_dma_alloc.c
boards/arm/stm32l4/nucleo-l496zg/src/stm32_dma_alloc.c
boards/arm/tms570/tms570ls31x-usb-kit/include/nsh_romfsimg.h
diff --git a/boards/Kconfig b/boards/Kconfig
index ee66f5b135..653086ac44 100644
--- a/boards/Kconfig
+++ b/boards/Kconfig
@@ -1524,36 +1524,35 @@ config ARCH_BOARD_NUCLEO_F429ZI
---help---
STMicro Nucleo-F429zi board based on the STMicro STM32F429ZIT6 MCU.
-config ARCH_BOARD_NUCLEO_144
- bool "STMicro NUCLEO-144"
- depends on ARCH_CHIP_STM32F722ZE || ARCH_CHIP_STM32F746ZG || ARCH_CHIP_STM32F767ZI
+config ARCH_BOARD_NUCLEO_F722ZE
+ bool "STMicro NUCLEO-F722ZE"
+ depends on ARCH_CHIP_STM32F722ZE
select ARCH_HAVE_LEDS
select ARCH_HAVE_BUTTONS
select ARCH_HAVE_IRQBUTTONS
---help---
- STMicro Nucleo-144 development board featuring STMicroelectronics
- F2, F3, F4, F7 and L4 MCU families. The board is a "Hardware pattern"
- that can be populated with the 144 pin package of the following MCUs:
-
- Target STM32 Order code
- STM32F207ZGT6 NUCLEO-F207ZG
- STM32F303ZET6 NUCLEO-F303ZE
- STM32F429ZIT6 NUCLEO-F429ZI
- STM32F446ZET6 NUCLEO-F446ZE
- STM32F722ZET6 NUCLEO-F722ZE
- STM32F746ZGT6 NUCLEO-F746ZG
- STM32F767ZIT6 NUCLEO-F767ZI
- STM32L496ZGT6 NUCLEO-L496ZG
- STM32L496ZGT6P NUCLEO-L496ZG-P
+ STMicro Nucleo F722ZE board based on STM32F722ZET6,
+ a 216MHz Cortex-M7, w/FPU, 512KiB Flash memory and 256KiB SRAM.
- Supported in this configuration are:
+config ARCH_BOARD_NUCLEO_F746ZG
+ bool "STMicro NUCLEO-F746ZG"
+ depends on ARCH_CHIP_STM32F746ZG
+ select ARCH_HAVE_LEDS
+ select ARCH_HAVE_BUTTONS
+ select ARCH_HAVE_IRQBUTTONS
+ ---help---
+ STMicro Nucleo F746ZG board based on STM32F746ZGT6
+ a 216MHz Cortex-M7, w/FPU, 1024KiB Flash memory and 320KiB SRAM.
- NUCLEO-F722ZE - STM32F722ZET6 a 216MHz Cortex-M7, w/FPU -
- 512KiB Flash memory and 256KiB SRAM.
- NUCLEO-F746ZG - STM32F746ZGT6 a 216MHz Cortex-M7, w/FPU -
- 1024KiB Flash memory and 320KiB SRAM.
- NUCLEO-F767ZI - STM32F767ZIT6 a 216MHz Cortex-M7, w/DPFPU -
- 2048KiB Flash memory and 512KiB SRAM.
+config ARCH_BOARD_NUCLEO_F767ZI
+ bool "STMicro NUCLEO-F767ZI"
+ depends on ARCH_CHIP_STM32F767ZI
+ select ARCH_HAVE_LEDS
+ select ARCH_HAVE_BUTTONS
+ select ARCH_HAVE_IRQBUTTONS
+ ---help---
+ STMicro Nucleo F767ZI board based on STM32F767ZIT6,
+ a 216MHz Cortex-M7, w/DPFPU 2048KiB Flash memory and 512KiB SRAM.
config ARCH_BOARD_NUCLEO_L073RZ
bool "STM32L073RZU6 Nucleo L073RZ"
@@ -3356,7 +3355,9 @@ config ARCH_BOARD
default "thingy91-nrf52" if ARCH_BOARD_THINGY91_NRF52
default "nrf9160-dk-nrf52" if ARCH_BOARD_NRF9160_DK_NRF52
default "ntosd-dm320" if ARCH_BOARD_NTOSD_DM320
- default "nucleo-144" if ARCH_BOARD_NUCLEO_144
+ default "nucleo-f722ze" if ARCH_BOARD_NUCLEO_F722ZE
+ default "nucleo-f746zg" if ARCH_BOARD_NUCLEO_F746ZG
+ default "nucleo-f767zi" if ARCH_BOARD_NUCLEO_F767ZI
default "nucleo-f072rb" if ARCH_BOARD_NUCLEO_F072RB
default "nucleo-f091rc" if ARCH_BOARD_NUCLEO_F091RC
default "nucleo-f103rb" if ARCH_BOARD_NUCLEO_F103RB
@@ -4002,8 +4003,14 @@ endif
if ARCH_BOARD_STM32F072_DISCOVERY
source "boards/arm/stm32f0l0g0/stm32f072-discovery/Kconfig"
endif
-if ARCH_BOARD_NUCLEO_144
-source "boards/arm/stm32f7/nucleo-144/Kconfig"
+if ARCH_BOARD_NUCLEO_F722ZE
+source "boards/arm/stm32f7/nucleo-f722ze/Kconfig"
+endif
+if ARCH_BOARD_NUCLEO_F746ZG
+source "boards/arm/stm32f7/nucleo-f746zg/Kconfig"
+endif
+if ARCH_BOARD_NUCLEO_F767ZI
+source "boards/arm/stm32f7/nucleo-f767zi/Kconfig"
endif
if ARCH_BOARD_STM32F746_WS
source "boards/arm/stm32f7/stm32f746-ws/Kconfig"
diff --git a/boards/arm/stm32f7/nucleo-144/configs/f722-cansock/Make.defs b/boards/arm/stm32f7/nucleo-144/configs/f722-cansock/Make.defs
deleted file mode 100644
index 93f81a7741..0000000000
--- a/boards/arm/stm32f7/nucleo-144/configs/f722-cansock/Make.defs
+++ /dev/null
@@ -1,39 +0,0 @@
-############################################################################
-# boards/arm/stm32f7/nucleo-144/configs/f722-cansock/Make.defs
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership. The
-# ASF licenses this file to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance with the
-# License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-############################################################################
-
-include $(TOPDIR)/.config
-include $(TOPDIR)/tools/Config.mk
-include $(TOPDIR)/arch/arm/src/armv7-m/Toolchain.defs
-
-LDSCRIPT = f722-flash.ld
-ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)$(LDSCRIPT)
-
-ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10
-
-CFLAGS := $(ARCHCFLAGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
-CPICFLAGS = $(ARCHPICFLAGS) $(CFLAGS)
-CXXFLAGS := $(ARCHCXXFLAGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
-CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
-CPPFLAGS := $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
-AFLAGS := $(CFLAGS) -D__ASSEMBLY__
-
-NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
-LDNXFLATFLAGS = -e main -s 2048
diff --git a/boards/arm/stm32f7/nucleo-144/configs/f722-composite/Make.defs b/boards/arm/stm32f7/nucleo-144/configs/f722-composite/Make.defs
deleted file mode 100644
index 458ff7f99a..0000000000
--- a/boards/arm/stm32f7/nucleo-144/configs/f722-composite/Make.defs
+++ /dev/null
@@ -1,39 +0,0 @@
-############################################################################
-# boards/arm/stm32f7/nucleo-144/configs/f722-composite/Make.defs
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership. The
-# ASF licenses this file to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance with the
-# License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-############################################################################
-
-include $(TOPDIR)/.config
-include $(TOPDIR)/tools/Config.mk
-include $(TOPDIR)/arch/arm/src/armv7-m/Toolchain.defs
-
-LDSCRIPT = f722-flash.ld
-ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)$(LDSCRIPT)
-
-ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10
-
-CFLAGS := $(ARCHCFLAGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
-CPICFLAGS = $(ARCHPICFLAGS) $(CFLAGS)
-CXXFLAGS := $(ARCHCXXFLAGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
-CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
-CPPFLAGS := $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
-AFLAGS := $(CFLAGS) -D__ASSEMBLY__
-
-NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
-LDNXFLATFLAGS = -e main -s 2048
diff --git a/boards/arm/stm32f7/nucleo-144/configs/f746-evalos/Make.defs b/boards/arm/stm32f7/nucleo-144/configs/f746-evalos/Make.defs
deleted file mode 100644
index ac285179b8..0000000000
--- a/boards/arm/stm32f7/nucleo-144/configs/f746-evalos/Make.defs
+++ /dev/null
@@ -1,39 +0,0 @@
-############################################################################
-# boards/arm/stm32f7/nucleo-144/configs/f746-evalos/Make.defs
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership. The
-# ASF licenses this file to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance with the
-# License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-############################################################################
-
-include $(TOPDIR)/.config
-include $(TOPDIR)/tools/Config.mk
-include $(TOPDIR)/arch/arm/src/armv7-m/Toolchain.defs
-
-LDSCRIPT = f746-flash.ld
-ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)$(LDSCRIPT)
-
-ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10
-
-CFLAGS := $(ARCHCFLAGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
-CPICFLAGS = $(ARCHPICFLAGS) $(CFLAGS)
-CXXFLAGS := $(ARCHCXXFLAGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
-CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
-CPPFLAGS := $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
-AFLAGS := $(CFLAGS) -D__ASSEMBLY__
-
-NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
-LDNXFLATFLAGS = -e main -s 2048
diff --git a/boards/arm/stm32f7/nucleo-144/configs/f746-nsh/Make.defs b/boards/arm/stm32f7/nucleo-144/configs/f746-nsh/Make.defs
deleted file mode 100644
index 4b725d34cb..0000000000
--- a/boards/arm/stm32f7/nucleo-144/configs/f746-nsh/Make.defs
+++ /dev/null
@@ -1,39 +0,0 @@
-############################################################################
-# boards/arm/stm32f7/nucleo-144/configs/f746-nsh/Make.defs
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership. The
-# ASF licenses this file to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance with the
-# License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-############################################################################
-
-include $(TOPDIR)/.config
-include $(TOPDIR)/tools/Config.mk
-include $(TOPDIR)/arch/arm/src/armv7-m/Toolchain.defs
-
-LDSCRIPT = f746-flash.ld
-ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)$(LDSCRIPT)
-
-ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10
-
-CFLAGS := $(ARCHCFLAGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
-CPICFLAGS = $(ARCHPICFLAGS) $(CFLAGS)
-CXXFLAGS := $(ARCHCXXFLAGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
-CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
-CPPFLAGS := $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
-AFLAGS := $(CFLAGS) -D__ASSEMBLY__
-
-NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
-LDNXFLATFLAGS = -e main -s 2048
diff --git a/boards/arm/stm32f7/nucleo-144/configs/f746-pysim/Make.defs b/boards/arm/stm32f7/nucleo-144/configs/f746-pysim/Make.defs
deleted file mode 100644
index ee99d76709..0000000000
--- a/boards/arm/stm32f7/nucleo-144/configs/f746-pysim/Make.defs
+++ /dev/null
@@ -1,39 +0,0 @@
-############################################################################
-# boards/arm/stm32f7/nucleo-144/configs/f746-pysim/Make.defs
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership. The
-# ASF licenses this file to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance with the
-# License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-############################################################################
-
-include $(TOPDIR)/.config
-include $(TOPDIR)/tools/Config.mk
-include $(TOPDIR)/arch/arm/src/armv7-m/Toolchain.defs
-
-LDSCRIPT = f746-flash.ld
-ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)$(LDSCRIPT)
-
-ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10
-
-CFLAGS := $(ARCHCFLAGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
-CPICFLAGS = $(ARCHPICFLAGS) $(CFLAGS)
-CXXFLAGS := $(ARCHCXXFLAGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
-CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
-CPPFLAGS := $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
-AFLAGS := $(CFLAGS) -D__ASSEMBLY__
-
-NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
-LDNXFLATFLAGS = -e main -s 2048
diff --git a/boards/arm/stm32f7/nucleo-144/configs/f767-evalos/Make.defs b/boards/arm/stm32f7/nucleo-144/configs/f767-evalos/Make.defs
deleted file mode 100644
index fb8007c658..0000000000
--- a/boards/arm/stm32f7/nucleo-144/configs/f767-evalos/Make.defs
+++ /dev/null
@@ -1,39 +0,0 @@
-############################################################################
-# boards/arm/stm32f7/nucleo-144/configs/f767-evalos/Make.defs
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership. The
-# ASF licenses this file to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance with the
-# License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-############################################################################
-
-include $(TOPDIR)/.config
-include $(TOPDIR)/tools/Config.mk
-include $(TOPDIR)/arch/arm/src/armv7-m/Toolchain.defs
-
-LDSCRIPT = f767-flash.ld
-ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)$(LDSCRIPT)
-
-ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10
-
-CFLAGS := $(ARCHCFLAGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
-CPICFLAGS = $(ARCHPICFLAGS) $(CFLAGS)
-CXXFLAGS := $(ARCHCXXFLAGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
-CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
-CPPFLAGS := $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
-AFLAGS := $(CFLAGS) -D__ASSEMBLY__
-
-NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
-LDNXFLATFLAGS = -e main -s 2048
diff --git a/boards/arm/stm32f7/nucleo-144/configs/f767-netnsh/Make.defs b/boards/arm/stm32f7/nucleo-144/configs/f767-netnsh/Make.defs
deleted file mode 100644
index 553006d595..0000000000
--- a/boards/arm/stm32f7/nucleo-144/configs/f767-netnsh/Make.defs
+++ /dev/null
@@ -1,39 +0,0 @@
-############################################################################
-# boards/arm/stm32f7/nucleo-144/configs/f767-netnsh/Make.defs
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership. The
-# ASF licenses this file to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance with the
-# License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-############################################################################
-
-include $(TOPDIR)/.config
-include $(TOPDIR)/tools/Config.mk
-include $(TOPDIR)/arch/arm/src/armv7-m/Toolchain.defs
-
-LDSCRIPT = f767-flash.ld
-ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)$(LDSCRIPT)
-
-ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10
-
-CFLAGS := $(ARCHCFLAGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
-CPICFLAGS = $(ARCHPICFLAGS) $(CFLAGS)
-CXXFLAGS := $(ARCHCXXFLAGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
-CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
-CPPFLAGS := $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
-AFLAGS := $(CFLAGS) -D__ASSEMBLY__
-
-NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
-LDNXFLATFLAGS = -e main -s 2048
diff --git a/boards/arm/stm32f7/nucleo-144/CMakeLists.txt b/boards/arm/stm32f7/nucleo-f722ze/CMakeLists.txt
similarity index 95%
copy from boards/arm/stm32f7/nucleo-144/CMakeLists.txt
copy to boards/arm/stm32f7/nucleo-f722ze/CMakeLists.txt
index aa930b44c8..8c31fde79e 100644
--- a/boards/arm/stm32f7/nucleo-144/CMakeLists.txt
+++ b/boards/arm/stm32f7/nucleo-f722ze/CMakeLists.txt
@@ -1,5 +1,5 @@
# ##############################################################################
-# boards/arm/stm32f7/nucleo-144/CMakeLists.txt
+# boards/arm/stm32f7/nucleo-f722ze/CMakeLists.txt
#
# Licensed to the Apache Software Foundation (ASF) under one or more contributor
# license agreements. See the NOTICE file distributed with this work for
diff --git a/boards/arm/stm32f7/nucleo-144/Kconfig b/boards/arm/stm32f7/nucleo-f722ze/Kconfig
similarity index 65%
copy from boards/arm/stm32f7/nucleo-144/Kconfig
copy to boards/arm/stm32f7/nucleo-f722ze/Kconfig
index 3f10dff100..d57fb238a3 100644
--- a/boards/arm/stm32f7/nucleo-144/Kconfig
+++ b/boards/arm/stm32f7/nucleo-f722ze/Kconfig
@@ -3,7 +3,7 @@
# see the file kconfig-language.txt in the NuttX tools repository.
#
-if ARCH_BOARD_NUCLEO_144
+if ARCH_BOARD_NUCLEO_F722ZE
config STM32_ROMFS
bool "Automount baked-in ROMFS image"
@@ -29,7 +29,7 @@ config STM32_ROMFS_IMAGEFILE
choice
prompt "Select Console wiring."
- default NUCLEO_CONSOLE_ARDUINO
+ default NUCLEO_F722ZE_CONSOLE_ARDUINO
---help---
Select where you will connect the console.
@@ -77,196 +77,196 @@ choice
-------- --------- -----
Note: SB13 must be removed to disable Ethernet.
-config NUCLEO_CONSOLE_ARDUINO
+config NUCLEO_F722ZE_CONSOLE_ARDUINO
bool "Arduino Connector"
select STM32F7_USART6
select USART6_SERIALDRIVER
-config NUCLEO_CONSOLE_VIRTUAL
+config NUCLEO_F722ZE_CONSOLE_VIRTUAL
bool "Virtual Comport"
select STM32F7_USART3
select USART3_SERIALDRIVER
-config NUCLEO_CONSOLE_MORPHO
+config NUCLEO_F722ZE_CONSOLE_MORPHO
bool "Morpho Connector"
select STM32F7_UART8
select UART8_SERIALDRIVER
-config NUCLEO_CONSOLE_MORPHO_UART4
+config NUCLEO_F722ZE_CONSOLE_MORPHO_UART4
bool "Morpho Connector UART4"
select STM32F7_UART4
select UART4_SERIALDRIVER
-config NUCLEO_CONSOLE_NONE
+config NUCLEO_F722ZE_CONSOLE_NONE
bool "No Console"
endchoice # "Select Console wiring"
-config NUCLEO_SPI_TEST
+config NUCLEO_F722ZE_SPI_TEST
bool "Enable SPI test"
default n
---help---
Enable Spi test - initialize and configure SPI to send
- NUCLEO_SPI_TEST_MESSAGE text. The text is sent on the
+ NUCLEO_F722ZE_SPI_TEST_MESSAGE text. The text is sent on the
selected SPI Buses with the configured parameters.
Note the CS lines will not be asserted.
-if NUCLEO_SPI_TEST
+if NUCLEO_F722ZE_SPI_TEST
-config NUCLEO_SPI_TEST_MESSAGE
+config NUCLEO_F722ZE_SPI_TEST_MESSAGE
string "Text to Send on SPI Bus(es)"
default "Hello World"
- depends on NUCLEO_SPI_TEST
+ depends on NUCLEO_F722ZE_SPI_TEST
---help---
Text to sent on SPI bus(es)
-config NUCLEO_SPI1_TEST
+config NUCLEO_F722ZE_SPI1_TEST
bool "Test SPI bus 1"
default n
- depends on NUCLEO_SPI_TEST
+ depends on NUCLEO_F722ZE_SPI_TEST
---help---
Enable Spi test - on SPI BUS 1
-if NUCLEO_SPI1_TEST
+if NUCLEO_F722ZE_SPI1_TEST
-config NUCLEO_SPI1_TEST_FREQ
+config NUCLEO_F722ZE_SPI1_TEST_FREQ
int "SPI 1 Clock Freq in Hz"
default 1000000
- depends on NUCLEO_SPI1_TEST
+ depends on NUCLEO_F722ZE_SPI1_TEST
---help---
Sets SPI 1 Clock Freq
-config NUCLEO_SPI1_TEST_BITS
+config NUCLEO_F722ZE_SPI1_TEST_BITS
int "SPI 1 number of bits"
default 8
- depends on NUCLEO_SPI1_TEST
+ depends on NUCLEO_F722ZE_SPI1_TEST
---help---
Sets SPI 1 bit length
choice
prompt "SPI BUS 1 Clock Mode"
- default NUCLEO_SPI1_TEST_MODE3
+ default NUCLEO_F722ZE_SPI1_TEST_MODE3
---help---
Sets SPI 1 clock mode
-config NUCLEO_SPI1_TEST_MODE0
+config NUCLEO_F722ZE_SPI1_TEST_MODE0
bool "CPOL=0 CPHA=0"
-config NUCLEO_SPI1_TEST_MODE1
+config NUCLEO_F722ZE_SPI1_TEST_MODE1
bool "CPOL=0 CPHA=1"
-config NUCLEO_SPI1_TEST_MODE2
+config NUCLEO_F722ZE_SPI1_TEST_MODE2
bool "CPOL=1 CPHA=0"
-config NUCLEO_SPI1_TEST_MODE3
+config NUCLEO_F722ZE_SPI1_TEST_MODE3
bool "CPOL=1 CPHA=1"
endchoice # "SPI BUS 1 Clock Mode"
-endif # NUCLEO_SPI1_TEST
+endif # NUCLEO_F722ZE_SPI1_TEST
-config NUCLEO_SPI2_TEST
+config NUCLEO_F722ZE_SPI2_TEST
bool "Test SPI bus 2"
default n
- depends on NUCLEO_SPI_TEST
+ depends on NUCLEO_F722ZE_SPI_TEST
---help---
Enable Spi test - on SPI BUS 2
-if NUCLEO_SPI2_TEST
+if NUCLEO_F722ZE_SPI2_TEST
-config NUCLEO_SPI2_TEST_FREQ
+config NUCLEO_F722ZE_SPI2_TEST_FREQ
int "SPI 2 Clock Freq in Hz"
default 12000000
- depends on NUCLEO_SPI2_TEST
+ depends on NUCLEO_F722ZE_SPI2_TEST
---help---
Sets SPI 2 Clock Freq
-config NUCLEO_SPI2_TEST_BITS
+config NUCLEO_F722ZE_SPI2_TEST_BITS
int "SPI 2 number of bits"
default 8
- depends on NUCLEO_SPI2_TEST
+ depends on NUCLEO_F722ZE_SPI2_TEST
---help---
Sets SPI 2 bit length
choice
prompt "SPI BUS 2 Clock Mode"
- default NUCLEO_SPI2_TEST_MODE3
+ default NUCLEO_F722ZE_SPI2_TEST_MODE3
---help---
Sets SPI 2 clock mode
-config NUCLEO_SPI2_TEST_MODE0
+config NUCLEO_F722ZE_SPI2_TEST_MODE0
bool "CPOL=0 CPHA=0"
-config NUCLEO_SPI2_TEST_MODE1
+config NUCLEO_F722ZE_SPI2_TEST_MODE1
bool "CPOL=0 CPHA=1"
-config NUCLEO_SPI2_TEST_MODE2
+config NUCLEO_F722ZE_SPI2_TEST_MODE2
bool "CPOL=1 CPHA=0"
-config NUCLEO_SPI2_TEST_MODE3
+config NUCLEO_F722ZE_SPI2_TEST_MODE3
bool "CPOL=1 CPHA=1"
endchoice # "SPI BUS 2 Clock Mode"
-endif # NUCLEO_SPI2_TEST
+endif # NUCLEO_F722ZE_SPI2_TEST
-config NUCLEO_SPI3_TEST
+config NUCLEO_F722ZE_SPI3_TEST
bool "Test SPI bus 3"
default n
- depends on NUCLEO_SPI_TEST
+ depends on NUCLEO_F722ZE_SPI_TEST
---help---
Enable Spi test - on SPI BUS 3
-if NUCLEO_SPI3_TEST
+if NUCLEO_F722ZE_SPI3_TEST
-config NUCLEO_SPI3_TEST_FREQ
+config NUCLEO_F722ZE_SPI3_TEST_FREQ
int "SPI 3 Clock Freq in Hz"
default 40000000
- depends on NUCLEO_SPI3_TEST
+ depends on NUCLEO_F722ZE_SPI3_TEST
---help---
Sets SPI 3 Clock Freq
-config NUCLEO_SPI3_TEST_BITS
+config NUCLEO_F722ZE_SPI3_TEST_BITS
int "SPI 3 number of bits"
default 8
- depends on NUCLEO_SPI3_TEST
+ depends on NUCLEO_F722ZE_SPI3_TEST
---help---
Sets SPI 3 bit length
choice
prompt "SPI BUS 3 Clock Mode"
- default NUCLEO_SPI3_TEST_MODE3
+ default NUCLEO_F722ZE_SPI3_TEST_MODE3
---help---
Sets SPI 3 clock mode
-config NUCLEO_SPI3_TEST_MODE0
+config NUCLEO_F722ZE_SPI3_TEST_MODE0
bool "CPOL=0 CPHA=0"
-config NUCLEO_SPI3_TEST_MODE1
+config NUCLEO_F722ZE_SPI3_TEST_MODE1
bool "CPOL=0 CPHA=1"
-config NUCLEO_SPI3_TEST_MODE2
+config NUCLEO_F722ZE_SPI3_TEST_MODE2
bool "CPOL=1 CPHA=0"
-config NUCLEO_SPI3_TEST_MODE3
+config NUCLEO_F722ZE_SPI3_TEST_MODE3
bool "CPOL=1 CPHA=1"
endchoice # "SPI BUS 3 Clock Mode"
-endif # NUCLEO_SPI3_TEST
-endif # NUCLEO_SPI_TEST
+endif # NUCLEO_F722ZE_SPI3_TEST
+endif # NUCLEO_F722ZE_SPI_TEST
choice
prompt "CAN1 pins selection"
- default NUCLEO_CAN1_MAP_PD0PD1
+ default NUCLEO_F722ZE_CAN1_MAP_PD0PD1
depends on STM32F7_CAN1
-config NUCLEO_144_CAN1_MAP_D14D15
+config NUCLEO_F722ZE_F722ZE_CAN1_MAP_D14D15
bool "CAN1_TX=D14 CAN1_RX=D15"
-config NUCLEO_CAN1_MAP_PD0PD1
+config NUCLEO_F722ZE_CAN1_MAP_PD0PD1
bool "CAN1_RX=PD0 CAN1_TX=PD1"
endchoice # CAN1 pins selection
-endif # ARCH_BOARD_NUCLEO_144
+endif # ARCH_BOARD_NUCLEO_F722ZE
diff --git a/boards/arm/stm32f7/nucleo-144/configs/f722-can/defconfig b/boards/arm/stm32f7/nucleo-f722ze/configs/can/defconfig
similarity index 90%
rename from boards/arm/stm32f7/nucleo-144/configs/f722-can/defconfig
rename to boards/arm/stm32f7/nucleo-f722ze/configs/can/defconfig
index f51b1bfb30..4f9ee4d9de 100644
--- a/boards/arm/stm32f7/nucleo-144/configs/f722-can/defconfig
+++ b/boards/arm/stm32f7/nucleo-f722ze/configs/can/defconfig
@@ -8,8 +8,8 @@
# CONFIG_ARCH_FPU is not set
# CONFIG_STM32F7_USE_LEGACY_PINMAP is not set
CONFIG_ARCH="arm"
-CONFIG_ARCH_BOARD="nucleo-144"
-CONFIG_ARCH_BOARD_NUCLEO_144=y
+CONFIG_ARCH_BOARD="nucleo-f722ze"
+CONFIG_ARCH_BOARD_NUCLEO_F722ZE=y
CONFIG_ARCH_BUTTONS=y
CONFIG_ARCH_CHIP="stm32f7"
CONFIG_ARCH_CHIP_STM32F722ZE=y
@@ -35,8 +35,8 @@ CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=512
CONFIG_NSH_LINELEN=64
CONFIG_NSH_READLINE=y
-CONFIG_NUCLEO_144_CAN1_MAP_D14D15=y
-CONFIG_NUCLEO_CONSOLE_VIRTUAL=y
+CONFIG_NUCLEO_F722ZE_CAN1_MAP_D14D15=y
+CONFIG_NUCLEO_F722ZE_CONSOLE_VIRTUAL=y
CONFIG_PREALLOC_TIMERS=4
CONFIG_RAM_SIZE=245760
CONFIG_RAM_START=0x20010000
diff --git a/boards/arm/stm32f7/nucleo-144/configs/f722-cansock/defconfig b/boards/arm/stm32f7/nucleo-f722ze/configs/cansock/defconfig
similarity index 91%
rename from boards/arm/stm32f7/nucleo-144/configs/f722-cansock/defconfig
rename to boards/arm/stm32f7/nucleo-f722ze/configs/cansock/defconfig
index add1bfa7d4..4ca8520da5 100644
--- a/boards/arm/stm32f7/nucleo-144/configs/f722-cansock/defconfig
+++ b/boards/arm/stm32f7/nucleo-f722ze/configs/cansock/defconfig
@@ -10,8 +10,8 @@
# CONFIG_NET_IPv4 is not set
# CONFIG_STM32F7_USE_LEGACY_PINMAP is not set
CONFIG_ARCH="arm"
-CONFIG_ARCH_BOARD="nucleo-144"
-CONFIG_ARCH_BOARD_NUCLEO_144=y
+CONFIG_ARCH_BOARD="nucleo-f722ze"
+CONFIG_ARCH_BOARD_NUCLEO_F722ZE=y
CONFIG_ARCH_BUTTONS=y
CONFIG_ARCH_CHIP="stm32f7"
CONFIG_ARCH_CHIP_STM32F722ZE=y
@@ -43,8 +43,8 @@ CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=512
CONFIG_NSH_LINELEN=64
CONFIG_NSH_READLINE=y
-CONFIG_NUCLEO_144_CAN1_MAP_D14D15=y
-CONFIG_NUCLEO_CONSOLE_VIRTUAL=y
+CONFIG_NUCLEO_F722ZE_CAN1_MAP_D14D15=y
+CONFIG_NUCLEO_F722ZE_CONSOLE_VIRTUAL=y
CONFIG_PREALLOC_TIMERS=4
CONFIG_RAM_SIZE=245760
CONFIG_RAM_START=0x20010000
diff --git a/boards/arm/stm32f7/nucleo-144/configs/f722-composite/defconfig b/boards/arm/stm32f7/nucleo-f722ze/configs/composite/defconfig
similarity index 95%
rename from boards/arm/stm32f7/nucleo-144/configs/f722-composite/defconfig
rename to boards/arm/stm32f7/nucleo-f722ze/configs/composite/defconfig
index 160df468d9..73486364ca 100644
--- a/boards/arm/stm32f7/nucleo-144/configs/f722-composite/defconfig
+++ b/boards/arm/stm32f7/nucleo-f722ze/configs/composite/defconfig
@@ -8,8 +8,8 @@
# CONFIG_ARCH_FPU is not set
# CONFIG_STM32F7_USE_LEGACY_PINMAP is not set
CONFIG_ARCH="arm"
-CONFIG_ARCH_BOARD="nucleo-144"
-CONFIG_ARCH_BOARD_NUCLEO_144=y
+CONFIG_ARCH_BOARD="nucleo-f722ze"
+CONFIG_ARCH_BOARD_NUCLEO_F722ZE=y
CONFIG_ARCH_BUTTONS=y
CONFIG_ARCH_CHIP="stm32f7"
CONFIG_ARCH_CHIP_STM32F722ZE=y
@@ -57,7 +57,7 @@ CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=512
CONFIG_NSH_LINELEN=64
CONFIG_NSH_READLINE=y
-CONFIG_NUCLEO_CONSOLE_VIRTUAL=y
+CONFIG_NUCLEO_F722ZE_CONSOLE_VIRTUAL=y
CONFIG_PREALLOC_TIMERS=4
CONFIG_RAM_SIZE=245760
CONFIG_RAM_START=0x20010000
diff --git a/boards/arm/stm32f7/nucleo-144/configs/f722-nsh/defconfig b/boards/arm/stm32f7/nucleo-f722ze/configs/nsh/defconfig
similarity index 95%
rename from boards/arm/stm32f7/nucleo-144/configs/f722-nsh/defconfig
rename to boards/arm/stm32f7/nucleo-f722ze/configs/nsh/defconfig
index e85573bff8..47dfa4f7cf 100644
--- a/boards/arm/stm32f7/nucleo-144/configs/f722-nsh/defconfig
+++ b/boards/arm/stm32f7/nucleo-f722ze/configs/nsh/defconfig
@@ -10,8 +10,8 @@
# CONFIG_NSH_DISABLE_PS is not set
# CONFIG_STM32F7_USE_LEGACY_PINMAP is not set
CONFIG_ARCH="arm"
-CONFIG_ARCH_BOARD="nucleo-144"
-CONFIG_ARCH_BOARD_NUCLEO_144=y
+CONFIG_ARCH_BOARD="nucleo-f722ze"
+CONFIG_ARCH_BOARD_NUCLEO_F722ZE=y
CONFIG_ARCH_BUTTONS=y
CONFIG_ARCH_CHIP="stm32f7"
CONFIG_ARCH_CHIP_STM32F722ZE=y
diff --git a/boards/arm/stm32f7/nucleo-144/include/board.h b/boards/arm/stm32f7/nucleo-f722ze/include/board.h
similarity index 96%
copy from boards/arm/stm32f7/nucleo-144/include/board.h
copy to boards/arm/stm32f7/nucleo-f722ze/include/board.h
index ec70ca8ce9..1098b6d7cc 100644
--- a/boards/arm/stm32f7/nucleo-144/include/board.h
+++ b/boards/arm/stm32f7/nucleo-f722ze/include/board.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/include/board.h
+ * boards/arm/stm32f7/nucleo-f722ze/include/board.h
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __BOARDS_ARM_STM32F7_NUCLEO_144_INCLUDE_BOARD_H
-#define __BOARDS_ARM_STM32F7_NUCLEO_144_INCLUDE_BOARD_H
+#ifndef __BOARDS_ARM_STM32F7_NUCLEO_F722ZE_INCLUDE_BOARD_H
+#define __BOARDS_ARM_STM32F7_NUCLEO_F722ZE_INCLUDE_BOARD_H
/****************************************************************************
* Included Files
@@ -39,7 +39,7 @@
/* Clocking *****************************************************************/
-/* The Nucleo-144 board provides the following clock sources:
+/* The Nucleo-f722ze board provides the following clock sources:
*
* MCO: 8 MHz from MCO output of ST-LINK is used as input clock
* X2: 32.768 KHz crystal for LSE
@@ -256,7 +256,7 @@
/* LED definitions **********************************************************/
-/* The Nucleo-144 board has numerous LEDs but only three, LD1 a Green LED,
+/* The Nucleo-f722ze board has numerous LEDs but only three, LD1 a Green LED,
* LD2 a Blue LED and LD3 a Red LED, that can be controlled by software.
* The following definitions assume the default Solder Bridges are installed.
*
@@ -384,7 +384,7 @@
#define GPIO_TIM3_CH3OUT (GPIO_TIM3_CH3OUT_2|GPIO_SPEED_50MHz)
#define GPIO_TIM3_CH4OUT (GPIO_TIM3_CH4OUT_1|GPIO_SPEED_50MHz)
-#if defined(CONFIG_NUCLEO_CONSOLE_ARDUINO)
+#if defined(CONFIG_NUCLEO_F722ZE_CONSOLE_ARDUINO)
/* USART6:
*
@@ -408,12 +408,12 @@
* Use USART3 and the USB virtual COM port
*/
-#if defined(CONFIG_NUCLEO_CONSOLE_VIRTUAL)
+#if defined(CONFIG_NUCLEO_F722ZE_CONSOLE_VIRTUAL)
# define GPIO_USART3_RX (GPIO_USART3_RX_3|GPIO_SPEED_100MHz)
# define GPIO_USART3_TX (GPIO_USART3_TX_3|GPIO_SPEED_100MHz)
#endif
-#if defined(CONFIG_NUCLEO_CONSOLE_MORPHO_UART4)
+#if defined(CONFIG_NUCLEO_F722ZE_CONSOLE_MORPHO_UART4)
/* UART4:
*
@@ -538,10 +538,10 @@
/* CAN Bus */
-#ifdef CONFIG_NUCLEO_CAN1_MAP_PD0PD1
+#ifdef CONFIG_NUCLEO_F722ZE_CAN1_MAP_PD0PD1
# define GPIO_CAN1_TX (GPIO_CAN1_TX_3|GPIO_SPEED_50MHz) /* PD1 */
# define GPIO_CAN1_RX (GPIO_CAN1_RX_3|GPIO_SPEED_50MHz) /* PD0 */
-#elif CONFIG_NUCLEO_144_CAN1_MAP_D14D15
+#elif CONFIG_NUCLEO_F722ZE_CAN1_MAP_D14D15
# define GPIO_CAN1_TX (GPIO_CAN1_TX_2|GPIO_SPEED_50MHz) /* PB9 */
# define GPIO_CAN1_RX (GPIO_CAN1_RX_2|GPIO_SPEED_50MHz) /* PB8 */
#endif
@@ -565,4 +565,4 @@
#define GPIO_OTGFS_DP (GPIO_OTGFS_DP_0|GPIO_SPEED_100MHz)
#define GPIO_OTGFS_ID (GPIO_OTGFS_ID_0|GPIO_SPEED_100MHz)
-#endif /* __BOARDS_ARM_STM32F7_NUCLEO_144_INCLUDE_BOARD_H */
+#endif /* __BOARDS_ARM_STM32F7_NUCLEO_F722ZE_INCLUDE_BOARD_H */
diff --git a/boards/arm/stm32f7/nucleo-144/configs/f722-nsh/Make.defs b/boards/arm/stm32f7/nucleo-f722ze/scripts/Make.defs
similarity index 95%
rename from boards/arm/stm32f7/nucleo-144/configs/f722-nsh/Make.defs
rename to boards/arm/stm32f7/nucleo-f722ze/scripts/Make.defs
index 286c62c13f..0c54b059e2 100644
--- a/boards/arm/stm32f7/nucleo-144/configs/f722-nsh/Make.defs
+++ b/boards/arm/stm32f7/nucleo-f722ze/scripts/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# boards/arm/stm32f7/nucleo-144/configs/f722-nsh/Make.defs
+# boards/arm/stm32f7/nucleo-f722ze/scriptsMake.defs
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -22,7 +22,7 @@ include $(TOPDIR)/.config
include $(TOPDIR)/tools/Config.mk
include $(TOPDIR)/arch/arm/src/armv7-m/Toolchain.defs
-LDSCRIPT = f722-flash.ld
+LDSCRIPT = flash.ld
ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)$(LDSCRIPT)
ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10
diff --git a/boards/arm/stm32f7/nucleo-144/scripts/f722-flash.ld b/boards/arm/stm32f7/nucleo-f722ze/scripts/flash.ld
similarity index 98%
rename from boards/arm/stm32f7/nucleo-144/scripts/f722-flash.ld
rename to boards/arm/stm32f7/nucleo-f722ze/scripts/flash.ld
index 4325c9bba0..c5d326afb3 100644
--- a/boards/arm/stm32f7/nucleo-144/scripts/f722-flash.ld
+++ b/boards/arm/stm32f7/nucleo-f722ze/scripts/flash.ld
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/scripts/f722-flash.ld
+ * boards/arm/stm32f7/nucleo-f722ze/scripts/flash.ld
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/boards/arm/stm32f7/nucleo-144/scripts/kernel-space.ld b/boards/arm/stm32f7/nucleo-f722ze/scripts/kernel-space.ld
similarity index 97%
copy from boards/arm/stm32f7/nucleo-144/scripts/kernel-space.ld
copy to boards/arm/stm32f7/nucleo-f722ze/scripts/kernel-space.ld
index cacf07bde7..d65ea35bae 100644
--- a/boards/arm/stm32f7/nucleo-144/scripts/kernel-space.ld
+++ b/boards/arm/stm32f7/nucleo-f722ze/scripts/kernel-space.ld
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/scripts/kernel-space.ld
+ * boards/arm/stm32f7/nucleo-f722ze/scripts/kernel-space.ld
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/boards/arm/stm32f7/nucleo-144/scripts/user-space.ld b/boards/arm/stm32f7/nucleo-f722ze/scripts/user-space.ld
similarity index 98%
copy from boards/arm/stm32f7/nucleo-144/scripts/user-space.ld
copy to boards/arm/stm32f7/nucleo-f722ze/scripts/user-space.ld
index b8ad6e9c38..a01cca16ad 100644
--- a/boards/arm/stm32f7/nucleo-144/scripts/user-space.ld
+++ b/boards/arm/stm32f7/nucleo-f722ze/scripts/user-space.ld
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/scripts/user-space.ld
+ * boards/arm/stm32f7/nucleo-f722ze/scripts/user-space.ld
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/boards/arm/stm32f7/nucleo-144/src/CMakeLists.txt b/boards/arm/stm32f7/nucleo-f722ze/src/CMakeLists.txt
similarity index 84%
copy from boards/arm/stm32f7/nucleo-144/src/CMakeLists.txt
copy to boards/arm/stm32f7/nucleo-f722ze/src/CMakeLists.txt
index 37563332bd..6f30cf4f8d 100644
--- a/boards/arm/stm32f7/nucleo-144/src/CMakeLists.txt
+++ b/boards/arm/stm32f7/nucleo-f722ze/src/CMakeLists.txt
@@ -1,5 +1,5 @@
# ##############################################################################
-# boards/arm/stm32f7/nucleo-144/src/CMakeLists.txt
+# boards/arm/stm32f7/nucleo-f722ze/src/CMakeLists.txt
#
# Licensed to the Apache Software Foundation (ASF) under one or more contributor
# license agreements. See the NOTICE file distributed with this work for
@@ -89,10 +89,5 @@ endif()
target_sources(board PRIVATE ${SRCS})
-if(CONFIG_ARCH_CHIP_STM32F722ZE)
- set_property(GLOBAL PROPERTY LD_SCRIPT "${NUTTX_BOARD_DIR}/scripts/f722-flash.ld")
-elseif(CONFIG_ARCH_CHIP_STM32F746ZG)
- set_property(GLOBAL PROPERTY LD_SCRIPT "${NUTTX_BOARD_DIR}/scripts/f746-flash.ld")
-elseif(CONFIG_ARCH_CHIP_STM32F767ZI)
- set_property(GLOBAL PROPERTY LD_SCRIPT "${NUTTX_BOARD_DIR}/scripts/f767-flash.ld")
+set_property(GLOBAL PROPERTY LD_SCRIPT "${NUTTX_BOARD_DIR}/scripts/flash.ld")
endif()
diff --git a/boards/arm/stm32f7/nucleo-144/src/Make.defs b/boards/arm/stm32f7/nucleo-f722ze/src/Make.defs
similarity index 97%
copy from boards/arm/stm32f7/nucleo-144/src/Make.defs
copy to boards/arm/stm32f7/nucleo-f722ze/src/Make.defs
index fd92677f4c..8399eb73e7 100644
--- a/boards/arm/stm32f7/nucleo-144/src/Make.defs
+++ b/boards/arm/stm32f7/nucleo-f722ze/src/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# boards/arm/stm32f7/nucleo-144/src/Make.defs
+# boards/arm/stm32f7/nucleo-f722ze/src/Make.defs
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/boards/arm/stm32f7/nucleo-144/src/nucleo-144.h b/boards/arm/stm32f7/nucleo-f722ze/src/nucleo-f722ze.h
similarity index 95%
copy from boards/arm/stm32f7/nucleo-144/src/nucleo-144.h
copy to boards/arm/stm32f7/nucleo-f722ze/src/nucleo-f722ze.h
index 98375f2557..327476248e 100644
--- a/boards/arm/stm32f7/nucleo-144/src/nucleo-144.h
+++ b/boards/arm/stm32f7/nucleo-f722ze/src/nucleo-f722ze.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/nucleo-144.h
+ * boards/arm/stm32f7/nucleo-f722ze/src/nucleo-f722ze.h
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __BOARDS_ARM_STM32F7_NUCLEO_144_SRC_NUCLEO_144_H
-#define __BOARDS_ARM_STM32F7_NUCLEO_144_SRC_NUCLEO_144_H
+#ifndef __BOARDS_ARM_STM32F7_NUCLEO_F722ZE_SRC_NUCLEO_F722ZE_H
+#define __BOARDS_ARM_STM32F7_NUCLEO_F722ZE_SRC_NUCLEO_F722ZE_H
/****************************************************************************
* Included Files
@@ -45,11 +45,11 @@
# endif
#endif
-/* Nucleo-144 GPIO Pin Definitions ******************************************/
+/* nucleo-f722ze GPIO Pin Definitions ***************************************/
/* LED
*
- * The Nucleo-144 board has numerous LEDs but only three, LD1 a Green LED,
+ * The nucleo-f722ze board has numerous LEDs but only three, LD1 a Green LED,
* LD2 a Blue LED and LD3 a Red LED, that can be controlled by software.
* The following definitions assume the default Solder Bridges are installed.
*/
@@ -220,7 +220,8 @@ int stm32_bringup(void);
* Name: stm32_spidev_initialize
*
* Description:
- * Called to configure SPI chip select GPIO pins for the Nucleo-144 board.
+ * Called to configure SPI chip select GPIO pins for the nucleo-f722ze
+ * board.
*
****************************************************************************/
@@ -237,7 +238,7 @@ void stm32_spidev_initialize(void);
*
****************************************************************************/
-#if defined(CONFIG_NUCLEO_SPI_TEST)
+#if defined(CONFIG_NUCLEO_F722ZE_SPI_TEST)
int stm32_spidev_bus_test(void);
#endif
@@ -276,7 +277,7 @@ int stm32_sdio_initialize(void);
*
* Description:
* Called from stm32_usbinitialize very early in inialization to setup
- * USB-related GPIO pins for the nucleo-144 board.
+ * USB-related GPIO pins for the nucleo-f722ze board.
*
****************************************************************************/
@@ -349,4 +350,4 @@ int stm32_gpio_initialize(void);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __BOARDS_ARM_STM32F7_NUCLEO_144_SRC_NUCLEO_144_H */
+#endif /* __BOARDS_ARM_STM32F7_NUCLEO_F722ZE_SRC_NUCLEO_F722ZE_H */
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_adc.c b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_adc.c
similarity index 98%
copy from boards/arm/stm32f7/nucleo-144/src/stm32_adc.c
copy to boards/arm/stm32f7/nucleo-f722ze/src/stm32_adc.c
index b85f251538..ab0ef94147 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_adc.c
+++ b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_adc.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_adc.c
+ * boards/arm/stm32f7/nucleo-f722ze/src/stm32_adc.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -34,7 +34,7 @@
#include "chip.h"
#include "stm32_gpio.h"
#include "stm32_adc.h"
-#include "nucleo-144.h"
+#include "nucleo-f722ze.h"
#ifdef CONFIG_ADC
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_appinitialize.c b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_appinitialize.c
similarity index 96%
copy from boards/arm/stm32f7/nucleo-144/src/stm32_appinitialize.c
copy to boards/arm/stm32f7/nucleo-f722ze/src/stm32_appinitialize.c
index 13f43ffc48..115ec16515 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_appinitialize.c
+++ b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_appinitialize.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_appinitialize.c
+ * boards/arm/stm32f7/nucleo-f722ze/src/stm32_appinitialize.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -25,7 +25,7 @@
#include <nuttx/config.h>
#include <sys/types.h>
-#include "nucleo-144.h"
+#include "nucleo-f722ze.h"
#ifdef CONFIG_BOARDCTL
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_autoleds.c b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_autoleds.c
similarity index 98%
copy from boards/arm/stm32f7/nucleo-144/src/stm32_autoleds.c
copy to boards/arm/stm32f7/nucleo-f722ze/src/stm32_autoleds.c
index f854ba1ba8..bbb88338ea 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_autoleds.c
+++ b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_autoleds.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_autoleds.c
+ * boards/arm/stm32f7/nucleo-f722ze/src/stm32_autoleds.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -33,7 +33,7 @@
#include <arch/board/board.h>
#include "stm32_gpio.h"
-#include "nucleo-144.h"
+#include "nucleo-f722ze.h"
#ifdef CONFIG_ARCH_LEDS
/****************************************************************************
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_bbsram.c b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_bbsram.c
similarity index 99%
copy from boards/arm/stm32f7/nucleo-144/src/stm32_bbsram.c
copy to boards/arm/stm32f7/nucleo-f722ze/src/stm32_bbsram.c
index be29fb27d8..1ff027c06c 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_bbsram.c
+++ b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_bbsram.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_bbsram.c
+ * boards/arm/stm32f7/nucleo-f722ze/src/stm32_bbsram.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -43,7 +43,7 @@
#include "arm_internal.h"
#include "stm32_bbsram.h"
-#include "nucleo-144.h"
+#include "nucleo-f722ze.h"
#ifdef CONFIG_STM32F7_BBSRAM
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_boot.c b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_boot.c
similarity index 97%
copy from boards/arm/stm32f7/nucleo-144/src/stm32_boot.c
copy to boards/arm/stm32f7/nucleo-f722ze/src/stm32_boot.c
index 5da2b44fa4..6b339fdc6c 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_boot.c
+++ b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_boot.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_boot.c
+ * boards/arm/stm32f7/nucleo-f722ze/src/stm32_boot.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -30,7 +30,7 @@
#include <arch/board/board.h>
#include "arm_internal.h"
-#include "nucleo-144.h"
+#include "nucleo-f722ze.h"
/****************************************************************************
* Public Functions
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_bringup.c b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_bringup.c
similarity index 98%
copy from boards/arm/stm32f7/nucleo-144/src/stm32_bringup.c
copy to boards/arm/stm32f7/nucleo-f722ze/src/stm32_bringup.c
index f0803f30e9..e961791581 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_bringup.c
+++ b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_bringup.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_bringup.c
+ * boards/arm/stm32f7/nucleo-f722ze/src/stm32_bringup.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -29,7 +29,7 @@
#include <syslog.h>
#include <stdio.h>
-#include "nucleo-144.h"
+#include "nucleo-f722ze.h"
#include <nuttx/fs/fs.h>
#include <nuttx/i2c/i2c_master.h>
#include <nuttx/kmalloc.h>
@@ -141,7 +141,7 @@ int stm32_bringup(void)
}
#endif
-#if defined(CONFIG_NUCLEO_SPI_TEST)
+#if defined(CONFIG_NUCLEO_F722ZE_SPI_TEST)
/* Create SPI interfaces */
ret = stm32_spidev_bus_test();
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_buttons.c b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_buttons.c
similarity index 97%
copy from boards/arm/stm32f7/nucleo-144/src/stm32_buttons.c
copy to boards/arm/stm32f7/nucleo-f722ze/src/stm32_buttons.c
index 73e23bd54a..edbe249c4a 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_buttons.c
+++ b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_buttons.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_buttons.c
+ * boards/arm/stm32f7/nucleo-f722ze/src/stm32_buttons.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -33,7 +33,7 @@
#include <arch/board/board.h>
#include "stm32_gpio.h"
-#include "nucleo-144.h"
+#include "nucleo-f722ze.h"
#ifdef CONFIG_ARCH_BUTTONS
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_can.c b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_can.c
similarity index 97%
copy from boards/arm/stm32f7/nucleo-144/src/stm32_can.c
copy to boards/arm/stm32f7/nucleo-f722ze/src/stm32_can.c
index 89bef7ccda..99119a88c7 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_can.c
+++ b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_can.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_can.c
+ * boards/arm/stm32f7/nucleo-f722ze/src/stm32_can.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -31,7 +31,7 @@
#include <nuttx/can/can.h>
#include "stm32_can.h"
-#include "nucleo-144.h"
+#include "nucleo-f722ze.h"
#ifdef CONFIG_CAN
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_cansock.c b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_cansock.c
similarity index 97%
copy from boards/arm/stm32f7/nucleo-144/src/stm32_cansock.c
copy to boards/arm/stm32f7/nucleo-f722ze/src/stm32_cansock.c
index 09fd437146..5f5ababb2a 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_cansock.c
+++ b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_cansock.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_cansock.c
+ * boards/arm/stm32f7/nucleo-f722ze/src/stm32_cansock.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_composite.c b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_composite.c
similarity index 99%
copy from boards/arm/stm32f7/nucleo-144/src/stm32_composite.c
copy to boards/arm/stm32f7/nucleo-f722ze/src/stm32_composite.c
index 3ffcb6e6f8..37e773c112 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_composite.c
+++ b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_composite.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_composite.c
+ * boards/arm/stm32f7/nucleo-f722ze/src/stm32_composite.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_dma_alloc.c b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_dma_alloc.c
similarity index 98%
copy from boards/arm/stm32f7/nucleo-144/src/stm32_dma_alloc.c
copy to boards/arm/stm32f7/nucleo-f722ze/src/stm32_dma_alloc.c
index 30121eb39c..1419b589b0 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_dma_alloc.c
+++ b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_dma_alloc.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_dma_alloc.c
+ * boards/arm/stm32f7/nucleo-f722ze/src/stm32_dma_alloc.c
*
* Copyright (C) 2016 PX4 Development Team. All rights reserved.
*
@@ -42,7 +42,7 @@
#include <errno.h>
#include <nuttx/mm/gran.h>
-#include "nucleo-144.h"
+#include "nucleo-f722ze.h"
#if defined(CONFIG_FAT_DMAMEMORY)
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_gpio.c b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_gpio.c
similarity index 98%
copy from boards/arm/stm32f7/nucleo-144/src/stm32_gpio.c
copy to boards/arm/stm32f7/nucleo-f722ze/src/stm32_gpio.c
index f193aa9a11..92de47e7df 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_gpio.c
+++ b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_gpio.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_gpio.c
+ * boards/arm/stm32f7/nucleo-f722ze/src/stm32_gpio.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -36,7 +36,7 @@
#include "chip.h"
#include "stm32_gpio.h"
-#include "nucleo-144.h"
+#include "nucleo-f722ze.h"
#if defined(CONFIG_DEV_GPIO) && !defined(CONFIG_GPIO_LOWER_HALF)
@@ -126,7 +126,7 @@ static const uint32_t g_gpiooutputs[BOARD_NGPIOOUT] =
#if !defined(CONFIG_STM32F7_TIM1_CH1NOUT)
GPIO_OUT6,
#endif
-#if !defined(CONFIG_STM32F7_TIM1_CH2NOUT)
+#if !defined(CONFIG_STM32F7_TIM1_CH2NOUT)
GPIO_OUT7,
#endif
};
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_pwm.c b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_pwm.c
similarity index 98%
copy from boards/arm/stm32f7/nucleo-144/src/stm32_pwm.c
copy to boards/arm/stm32f7/nucleo-f722ze/src/stm32_pwm.c
index aeb66ea64c..fceb580ff9 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_pwm.c
+++ b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_pwm.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_pwm.c
+ * boards/arm/stm32f7/nucleo-f722ze/src/stm32_pwm.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -35,7 +35,7 @@
#include "chip.h"
#include "arm_internal.h"
#include "stm32_pwm.h"
-#include "nucleo-144.h"
+#include "nucleo-f722ze.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_qencoder.c b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_qencoder.c
similarity index 96%
copy from boards/arm/stm32f7/nucleo-144/src/stm32_qencoder.c
copy to boards/arm/stm32f7/nucleo-f722ze/src/stm32_qencoder.c
index 287e1e54c6..d8457e1955 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_qencoder.c
+++ b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_qencoder.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_qencoder.c
+ * boards/arm/stm32f7/nucleo-f722ze/src/stm32_qencoder.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -33,7 +33,7 @@
#include "chip.h"
#include "arm_internal.h"
#include "stm32_qencoder.h"
-#include "nucleo-144.h"
+#include "nucleo-f722ze.h"
/****************************************************************************
* Public Functions
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_reset.c b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_reset.c
similarity index 97%
copy from boards/arm/stm32f7/nucleo-144/src/stm32_reset.c
copy to boards/arm/stm32f7/nucleo-f722ze/src/stm32_reset.c
index 33e12b236f..c08b820c05 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_reset.c
+++ b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_reset.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_reset.c
+ * boards/arm/stm32f7/nucleo-f722ze/src/stm32_reset.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_romfs.h b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_romfs.h
similarity index 98%
copy from boards/arm/stm32f7/nucleo-144/src/stm32_romfs.h
copy to boards/arm/stm32f7/nucleo-f722ze/src/stm32_romfs.h
index 9ee2bbedb8..1f309cd015 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_romfs.h
+++ b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_romfs.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_romfs.h
+ * boards/arm/stm32f7/nucleo-f722ze/src/stm32_romfs.h
*
* Copyright (C) 2017 Tomasz Wozniak. All rights reserved.
* Author: Tomasz Wozniak <t....@samsung.com>
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_romfs_initialize.c b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_romfs_initialize.c
similarity index 98%
copy from boards/arm/stm32f7/nucleo-144/src/stm32_romfs_initialize.c
copy to boards/arm/stm32f7/nucleo-f722ze/src/stm32_romfs_initialize.c
index fb56827400..c433ee9014 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_romfs_initialize.c
+++ b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_romfs_initialize.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_romfs_initialize.c
+ * boards/arm/stm32f7/nucleo-f722ze/src/stm32_romfs_initialize.c
* This file provides contents of an optional ROMFS volume, mounted at boot.
*
* Copyright (C) 2017 Tomasz Wozniak. All rights reserved.
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_sdio.c b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_sdio.c
similarity index 98%
copy from boards/arm/stm32f7/nucleo-144/src/stm32_sdio.c
copy to boards/arm/stm32f7/nucleo-f722ze/src/stm32_sdio.c
index f385dc6657..548ad49636 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_sdio.c
+++ b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_sdio.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_sdio.c
+ * boards/arm/stm32f7/nucleo-f722ze/src/stm32_sdio.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -33,7 +33,7 @@
#include <nuttx/mmcsd.h>
#include "chip.h"
-#include "nucleo-144.h"
+#include "nucleo-f722ze.h"
#include "stm32_gpio.h"
#include "stm32_sdmmc.h"
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_spi.c b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_spi.c
similarity index 77%
copy from boards/arm/stm32f7/nucleo-144/src/stm32_spi.c
copy to boards/arm/stm32f7/nucleo-f722ze/src/stm32_spi.c
index bcadb0d0d3..e05e28fa8c 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_spi.c
+++ b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_spi.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_spi.c
+ * boards/arm/stm32f7/nucleo-f722ze/src/stm32_spi.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -39,7 +39,7 @@
#include "stm32_gpio.h"
#include "stm32_spi.h"
-#include "nucleo-144.h"
+#include "nucleo-f722ze.h"
#if defined(CONFIG_SPI)
@@ -47,45 +47,45 @@
* Pre-processor Definitions
****************************************************************************/
-#if defined(CONFIG_NUCLEO_SPI1_TEST)
-# if defined(CONFIG_NUCLEO_SPI1_TEST_MODE0)
-# define CONFIG_NUCLEO_SPI1_TEST_MODE SPIDEV_MODE0
-# elif defined(CONFIG_NUCLEO_SPI1_TEST_MODE1)
-# define CONFIG_NUCLEO_SPI1_TEST_MODE SPIDEV_MODE1
-# elif defined(CONFIG_NUCLEO_SPI1_TEST_MODE2)
-# define CONFIG_NUCLEO_SPI1_TEST_MODE SPIDEV_MODE2
-# elif defined(CONFIG_NUCLEO_SPI1_TEST_MODE3)
-# define CONFIG_NUCLEO_SPI1_TEST_MODE SPIDEV_MODE3
+#if defined(CONFIG_NUCLEO_F722ZE_SPI1_TEST)
+# if defined(CONFIG_NUCLEO_F722ZE_SPI1_TEST_MODE0)
+# define CONFIG_NUCLEO_F722ZE_SPI1_TEST_MODE SPIDEV_MODE0
+# elif defined(CONFIG_NUCLEO_F722ZE_SPI1_TEST_MODE1)
+# define CONFIG_NUCLEO_F722ZE_SPI1_TEST_MODE SPIDEV_MODE1
+# elif defined(CONFIG_NUCLEO_F722ZE_SPI1_TEST_MODE2)
+# define CONFIG_NUCLEO_F722ZE_SPI1_TEST_MODE SPIDEV_MODE2
+# elif defined(CONFIG_NUCLEO_F722ZE_SPI1_TEST_MODE3)
+# define CONFIG_NUCLEO_F722ZE_SPI1_TEST_MODE SPIDEV_MODE3
# else
-# error "No CONFIG_NUCLEO_SPI1_TEST_MODEx defined"
+# error "No CONFIG_NUCLEO_F722ZE_SPI1_TEST_MODEx defined"
# endif
#endif
-#if defined(CONFIG_NUCLEO_SPI2_TEST)
-# if defined(CONFIG_NUCLEO_SPI2_TEST_MODE0)
-# define CONFIG_NUCLEO_SPI2_TEST_MODE SPIDEV_MODE0
-# elif defined(CONFIG_NUCLEO_SPI2_TEST_MODE1)
-# define CONFIG_NUCLEO_SPI2_TEST_MODE SPIDEV_MODE1
-# elif defined(CONFIG_NUCLEO_SPI2_TEST_MODE2)
-# define CONFIG_NUCLEO_SPI2_TEST_MODE SPIDEV_MODE2
-# elif defined(CONFIG_NUCLEO_SPI2_TEST_MODE3)
-# define CONFIG_NUCLEO_SPI2_TEST_MODE SPIDEV_MODE3
+#if defined(CONFIG_NUCLEO_F722ZE_SPI2_TEST)
+# if defined(CONFIG_NUCLEO_F722ZE_SPI2_TEST_MODE0)
+# define CONFIG_NUCLEO_F722ZE_SPI2_TEST_MODE SPIDEV_MODE0
+# elif defined(CONFIG_NUCLEO_F722ZE_SPI2_TEST_MODE1)
+# define CONFIG_NUCLEO_F722ZE_SPI2_TEST_MODE SPIDEV_MODE1
+# elif defined(CONFIG_NUCLEO_F722ZE_SPI2_TEST_MODE2)
+# define CONFIG_NUCLEO_F722ZE_SPI2_TEST_MODE SPIDEV_MODE2
+# elif defined(CONFIG_NUCLEO_F722ZE_SPI2_TEST_MODE3)
+# define CONFIG_NUCLEO_F722ZE_SPI2_TEST_MODE SPIDEV_MODE3
# else
-# error "No CONFIG_NUCLEO_SPI2_TEST_MODEx defined"
+# error "No CONFIG_NUCLEO_F722ZE_SPI2_TEST_MODEx defined"
# endif
#endif
-#if defined(CONFIG_NUCLEO_SPI3_TEST)
-# if defined(CONFIG_NUCLEO_SPI3_TEST_MODE0)
-# define CONFIG_NUCLEO_SPI3_TEST_MODE SPIDEV_MODE0
-# elif defined(CONFIG_NUCLEO_SPI3_TEST_MODE1)
-# define CONFIG_NUCLEO_SPI3_TEST_MODE SPIDEV_MODE1
-# elif defined(CONFIG_NUCLEO_SPI3_TEST_MODE2)
-# define CONFIG_NUCLEO_SPI3_TEST_MODE SPIDEV_MODE2
-# elif defined(CONFIG_NUCLEO_SPI3_TEST_MODE3)
-# define CONFIG_NUCLEO_SPI3_TEST_MODE SPIDEV_MODE3
+#if defined(CONFIG_NUCLEO_F722ZE_SPI3_TEST)
+# if defined(CONFIG_NUCLEO_F722ZE_SPI3_TEST_MODE0)
+# define CONFIG_NUCLEO_F722ZE_SPI3_TEST_MODE SPIDEV_MODE0
+# elif defined(CONFIG_NUCLEO_F722ZE_SPI3_TEST_MODE1)
+# define CONFIG_NUCLEO_F722ZE_SPI3_TEST_MODE SPIDEV_MODE1
+# elif defined(CONFIG_NUCLEO_F722ZE_SPI3_TEST_MODE2)
+# define CONFIG_NUCLEO_F722ZE_SPI3_TEST_MODE SPIDEV_MODE2
+# elif defined(CONFIG_NUCLEO_F722ZE_SPI3_TEST_MODE3)
+# define CONFIG_NUCLEO_F722ZE_SPI3_TEST_MODE SPIDEV_MODE3
# else
-# error "No CONFIG_NUCLEO_SPI3_TEST_MODEx defined"
+# error "No CONFIG_NUCLEO_F722ZE_SPI3_TEST_MODEx defined"
# endif
#endif
@@ -171,7 +171,7 @@ static const uint32_t g_spi3gpio[] =
};
#endif
-#if defined(CONFIG_NUCLEO_SPI_TEST)
+#if defined(CONFIG_NUCLEO_F722ZE_SPI_TEST)
# if defined(CONFIG_STM32F7_SPI1)
struct spi_dev_s *spi1;
# endif
@@ -191,7 +191,8 @@ struct spi_dev_s *spi3;
* Name: stm32_spidev_initialize
*
* Description:
- * Called to configure SPI chip select GPIO pins for the Nucleo-144 board.
+ * Called to configure SPI chip select GPIO pins for the nucleo-f722ze
+ * board.
*
****************************************************************************/
@@ -430,14 +431,14 @@ int stm32_spi6cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd)
#endif /* CONFIG_SPI_CMDDATA */
-#if defined(CONFIG_NUCLEO_SPI_TEST)
+#if defined(CONFIG_NUCLEO_F722ZE_SPI_TEST)
int stm32_spidev_bus_test(void)
{
/* Configure and test SPI- */
- uint8_t *tx = (uint8_t *)CONFIG_NUCLEO_SPI_TEST_MESSAGE;
+ uint8_t *tx = (uint8_t *)CONFIG_NUCLEO_F722ZE_SPI_TEST_MESSAGE;
-#if defined(CONFIG_NUCLEO_SPI1_TEST)
+#if defined(CONFIG_NUCLEO_F722ZE_SPI1_TEST)
spi1 = stm32_spibus_initialize(1);
if (!spi1)
@@ -448,13 +449,14 @@ int stm32_spidev_bus_test(void)
/* Default SPI1 to NUCLEO_SPI1_FREQ and mode */
- SPI_SETFREQUENCY(spi1, CONFIG_NUCLEO_SPI1_TEST_FREQ);
- SPI_SETBITS(spi1, CONFIG_NUCLEO_SPI1_TEST_BITS);
- SPI_SETMODE(spi1, CONFIG_NUCLEO_SPI1_TEST_MODE);
- SPI_EXCHANGE(spi1, tx, NULL, nitems(CONFIG_NUCLEO_SPI_TEST_MESSAGE));
+ SPI_SETFREQUENCY(spi1, CONFIG_NUCLEO_F722ZE_SPI1_TEST_FREQ);
+ SPI_SETBITS(spi1, CONFIG_NUCLEO_F722ZE_SPI1_TEST_BITS);
+ SPI_SETMODE(spi1, CONFIG_NUCLEO_F722ZE_SPI1_TEST_MODE);
+ SPI_EXCHANGE(spi1, tx, NULL,
+ nitems(CONFIG_NUCLEO_F722ZE_SPI_TEST_MESSAGE));
#endif
-#if defined(CONFIG_NUCLEO_SPI2_TEST)
+#if defined(CONFIG_NUCLEO_F722ZE_SPI2_TEST)
spi2 = stm32_spibus_initialize(2);
if (!spi2)
@@ -465,13 +467,14 @@ int stm32_spidev_bus_test(void)
/* Default SPI2 to NUCLEO_SPI2_FREQ and mode */
- SPI_SETFREQUENCY(spi2, CONFIG_NUCLEO_SPI2_TEST_FREQ);
- SPI_SETBITS(spi2, CONFIG_NUCLEO_SPI2_TEST_BITS);
- SPI_SETMODE(spi2, CONFIG_NUCLEO_SPI2_TEST_MODE);
- SPI_EXCHANGE(spi2, tx, NULL, nitems(CONFIG_NUCLEO_SPI_TEST_MESSAGE));
+ SPI_SETFREQUENCY(spi2, CONFIG_NUCLEO_F722ZE_SPI2_TEST_FREQ);
+ SPI_SETBITS(spi2, CONFIG_NUCLEO_F722ZE_SPI2_TEST_BITS);
+ SPI_SETMODE(spi2, CONFIG_NUCLEO_F722ZE_SPI2_TEST_MODE);
+ SPI_EXCHANGE(spi2, tx, NULL,
+ nitems(CONFIG_NUCLEO_F722ZE_SPI_TEST_MESSAGE));
#endif
-#if defined(CONFIG_NUCLEO_SPI3_TEST)
+#if defined(CONFIG_NUCLEO_F722ZE_SPI3_TEST)
spi3 = stm32_spibus_initialize(3);
if (!spi3)
@@ -482,10 +485,11 @@ int stm32_spidev_bus_test(void)
/* Default SPI3 to NUCLEO_SPI3_FREQ and mode */
- SPI_SETFREQUENCY(spi3, CONFIG_NUCLEO_SPI3_TEST_FREQ);
- SPI_SETBITS(spi3, CONFIG_NUCLEO_SPI3_TEST_BITS);
- SPI_SETMODE(spi3, CONFIG_NUCLEO_SPI3_TEST_MODE);
- SPI_EXCHANGE(spi3, tx, NULL, nitems(CONFIG_NUCLEO_SPI_TEST_MESSAGE));
+ SPI_SETFREQUENCY(spi3, CONFIG_NUCLEO_F722ZE_SPI3_TEST_FREQ);
+ SPI_SETBITS(spi3, CONFIG_NUCLEO_F722ZE_SPI3_TEST_BITS);
+ SPI_SETMODE(spi3, CONFIG_NUCLEO_F722ZE_SPI3_TEST_MODE);
+ SPI_EXCHANGE(spi3, tx, NULL,
+ nitems(CONFIG_NUCLEO_F722ZE_SPI_TEST_MESSAGE));
#endif
return OK;
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_usb.c b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_usb.c
similarity index 98%
copy from boards/arm/stm32f7/nucleo-144/src/stm32_usb.c
copy to boards/arm/stm32f7/nucleo-f722ze/src/stm32_usb.c
index 73e449b23a..3037633c2e 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_usb.c
+++ b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_usb.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_usb.c
+ * boards/arm/stm32f7/nucleo-f722ze/src/stm32_usb.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -41,7 +41,7 @@
#include "chip.h"
#include "stm32_gpio.h"
#include "stm32_otg.h"
-#include "nucleo-144.h"
+#include "nucleo-f722ze.h"
#ifdef CONFIG_STM32F7_OTGFS
@@ -122,7 +122,7 @@ static int usbhost_waiter(int argc, char *argv[])
*
* Description:
* Called from stm32_usbinitialize very early in inialization to setup
- * USB-related GPIO pins for the nucleo-144 board.
+ * USB-related GPIO pins for the nucleo-f722ze board.
*
****************************************************************************/
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_userleds.c b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_userleds.c
similarity index 97%
copy from boards/arm/stm32f7/nucleo-144/src/stm32_userleds.c
copy to boards/arm/stm32f7/nucleo-f722ze/src/stm32_userleds.c
index 249d835300..6a02232b7d 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_userleds.c
+++ b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_userleds.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_userleds.c
+ * boards/arm/stm32f7/nucleo-f722ze/src/stm32_userleds.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -33,7 +33,7 @@
#include <arch/board/board.h>
#include "stm32_gpio.h"
-#include "nucleo-144.h"
+#include "nucleo-f722ze.h"
#ifndef CONFIG_ARCH_LEDS
diff --git a/boards/arm/stm32f7/nucleo-144/CMakeLists.txt b/boards/arm/stm32f7/nucleo-f746zg/CMakeLists.txt
similarity index 95%
copy from boards/arm/stm32f7/nucleo-144/CMakeLists.txt
copy to boards/arm/stm32f7/nucleo-f746zg/CMakeLists.txt
index aa930b44c8..ac8e937fa0 100644
--- a/boards/arm/stm32f7/nucleo-144/CMakeLists.txt
+++ b/boards/arm/stm32f7/nucleo-f746zg/CMakeLists.txt
@@ -1,5 +1,5 @@
# ##############################################################################
-# boards/arm/stm32f7/nucleo-144/CMakeLists.txt
+# boards/arm/stm32f7/nucleo-f746zg/CMakeLists.txt
#
# Licensed to the Apache Software Foundation (ASF) under one or more contributor
# license agreements. See the NOTICE file distributed with this work for
diff --git a/boards/arm/stm32f7/nucleo-144/Kconfig b/boards/arm/stm32f7/nucleo-f746zg/Kconfig
similarity index 65%
copy from boards/arm/stm32f7/nucleo-144/Kconfig
copy to boards/arm/stm32f7/nucleo-f746zg/Kconfig
index 3f10dff100..d8ac578d2f 100644
--- a/boards/arm/stm32f7/nucleo-144/Kconfig
+++ b/boards/arm/stm32f7/nucleo-f746zg/Kconfig
@@ -3,7 +3,7 @@
# see the file kconfig-language.txt in the NuttX tools repository.
#
-if ARCH_BOARD_NUCLEO_144
+if ARCH_BOARD_NUCLEO_F746ZG
config STM32_ROMFS
bool "Automount baked-in ROMFS image"
@@ -29,7 +29,7 @@ config STM32_ROMFS_IMAGEFILE
choice
prompt "Select Console wiring."
- default NUCLEO_CONSOLE_ARDUINO
+ default NUCLEO_F746ZG_CONSOLE_ARDUINO
---help---
Select where you will connect the console.
@@ -77,196 +77,196 @@ choice
-------- --------- -----
Note: SB13 must be removed to disable Ethernet.
-config NUCLEO_CONSOLE_ARDUINO
+config NUCLEO_F746ZG_CONSOLE_ARDUINO
bool "Arduino Connector"
select STM32F7_USART6
select USART6_SERIALDRIVER
-config NUCLEO_CONSOLE_VIRTUAL
+config NUCLEO_F746ZG_CONSOLE_VIRTUAL
bool "Virtual Comport"
select STM32F7_USART3
select USART3_SERIALDRIVER
-config NUCLEO_CONSOLE_MORPHO
+config NUCLEO_F746ZG_CONSOLE_MORPHO
bool "Morpho Connector"
select STM32F7_UART8
select UART8_SERIALDRIVER
-config NUCLEO_CONSOLE_MORPHO_UART4
+config NUCLEO_F746ZG_CONSOLE_MORPHO_UART4
bool "Morpho Connector UART4"
select STM32F7_UART4
select UART4_SERIALDRIVER
-config NUCLEO_CONSOLE_NONE
+config NUCLEO_F746ZG_CONSOLE_NONE
bool "No Console"
endchoice # "Select Console wiring"
-config NUCLEO_SPI_TEST
+config NUCLEO_F746ZG_SPI_TEST
bool "Enable SPI test"
default n
---help---
Enable Spi test - initialize and configure SPI to send
- NUCLEO_SPI_TEST_MESSAGE text. The text is sent on the
+ NUCLEO_F746ZG_SPI_TEST_MESSAGE text. The text is sent on the
selected SPI Buses with the configured parameters.
Note the CS lines will not be asserted.
-if NUCLEO_SPI_TEST
+if NUCLEO_F746ZG_SPI_TEST
-config NUCLEO_SPI_TEST_MESSAGE
+config NUCLEO_F746ZG_SPI_TEST_MESSAGE
string "Text to Send on SPI Bus(es)"
default "Hello World"
- depends on NUCLEO_SPI_TEST
+ depends on NUCLEO_F746ZG_SPI_TEST
---help---
Text to sent on SPI bus(es)
-config NUCLEO_SPI1_TEST
+config NUCLEO_F746ZG_SPI1_TEST
bool "Test SPI bus 1"
default n
- depends on NUCLEO_SPI_TEST
+ depends on NUCLEO_F746ZG_SPI_TEST
---help---
Enable Spi test - on SPI BUS 1
-if NUCLEO_SPI1_TEST
+if NUCLEO_F746ZG_SPI1_TEST
-config NUCLEO_SPI1_TEST_FREQ
+config NUCLEO_F746ZG_SPI1_TEST_FREQ
int "SPI 1 Clock Freq in Hz"
default 1000000
- depends on NUCLEO_SPI1_TEST
+ depends on NUCLEO_F746ZG_SPI1_TEST
---help---
Sets SPI 1 Clock Freq
-config NUCLEO_SPI1_TEST_BITS
+config NUCLEO_F746ZG_SPI1_TEST_BITS
int "SPI 1 number of bits"
default 8
- depends on NUCLEO_SPI1_TEST
+ depends on NUCLEO_F746ZG_SPI1_TEST
---help---
Sets SPI 1 bit length
choice
prompt "SPI BUS 1 Clock Mode"
- default NUCLEO_SPI1_TEST_MODE3
+ default NUCLEO_F746ZG_SPI1_TEST_MODE3
---help---
Sets SPI 1 clock mode
-config NUCLEO_SPI1_TEST_MODE0
+config NUCLEO_F746ZG_SPI1_TEST_MODE0
bool "CPOL=0 CPHA=0"
-config NUCLEO_SPI1_TEST_MODE1
+config NUCLEO_F746ZG_SPI1_TEST_MODE1
bool "CPOL=0 CPHA=1"
-config NUCLEO_SPI1_TEST_MODE2
+config NUCLEO_F746ZG_SPI1_TEST_MODE2
bool "CPOL=1 CPHA=0"
-config NUCLEO_SPI1_TEST_MODE3
+config NUCLEO_F746ZG_SPI1_TEST_MODE3
bool "CPOL=1 CPHA=1"
endchoice # "SPI BUS 1 Clock Mode"
-endif # NUCLEO_SPI1_TEST
+endif # NUCLEO_F746ZG_SPI1_TEST
-config NUCLEO_SPI2_TEST
+config NUCLEO_F746ZG_SPI2_TEST
bool "Test SPI bus 2"
default n
- depends on NUCLEO_SPI_TEST
+ depends on NUCLEO_F746ZG_SPI_TEST
---help---
Enable Spi test - on SPI BUS 2
-if NUCLEO_SPI2_TEST
+if NUCLEO_F746ZG_SPI2_TEST
-config NUCLEO_SPI2_TEST_FREQ
+config NUCLEO_F746ZG_SPI2_TEST_FREQ
int "SPI 2 Clock Freq in Hz"
default 12000000
- depends on NUCLEO_SPI2_TEST
+ depends on NUCLEO_F746ZG_SPI2_TEST
---help---
Sets SPI 2 Clock Freq
-config NUCLEO_SPI2_TEST_BITS
+config NUCLEO_F746ZG_SPI2_TEST_BITS
int "SPI 2 number of bits"
default 8
- depends on NUCLEO_SPI2_TEST
+ depends on NUCLEO_F746ZG_SPI2_TEST
---help---
Sets SPI 2 bit length
choice
prompt "SPI BUS 2 Clock Mode"
- default NUCLEO_SPI2_TEST_MODE3
+ default NUCLEO_F746ZG_SPI2_TEST_MODE3
---help---
Sets SPI 2 clock mode
-config NUCLEO_SPI2_TEST_MODE0
+config NUCLEO_F746ZG_SPI2_TEST_MODE0
bool "CPOL=0 CPHA=0"
-config NUCLEO_SPI2_TEST_MODE1
+config NUCLEO_F746ZG_SPI2_TEST_MODE1
bool "CPOL=0 CPHA=1"
-config NUCLEO_SPI2_TEST_MODE2
+config NUCLEO_F746ZG_SPI2_TEST_MODE2
bool "CPOL=1 CPHA=0"
-config NUCLEO_SPI2_TEST_MODE3
+config NUCLEO_F746ZG_SPI2_TEST_MODE3
bool "CPOL=1 CPHA=1"
endchoice # "SPI BUS 2 Clock Mode"
-endif # NUCLEO_SPI2_TEST
+endif # NUCLEO_F746ZG_SPI2_TEST
-config NUCLEO_SPI3_TEST
+config NUCLEO_F746ZG_SPI3_TEST
bool "Test SPI bus 3"
default n
- depends on NUCLEO_SPI_TEST
+ depends on NUCLEO_F746ZG_SPI_TEST
---help---
Enable Spi test - on SPI BUS 3
-if NUCLEO_SPI3_TEST
+if NUCLEO_F746ZG_SPI3_TEST
-config NUCLEO_SPI3_TEST_FREQ
+config NUCLEO_F746ZG_SPI3_TEST_FREQ
int "SPI 3 Clock Freq in Hz"
default 40000000
- depends on NUCLEO_SPI3_TEST
+ depends on NUCLEO_F746ZG_SPI3_TEST
---help---
Sets SPI 3 Clock Freq
-config NUCLEO_SPI3_TEST_BITS
+config NUCLEO_F746ZG_SPI3_TEST_BITS
int "SPI 3 number of bits"
default 8
- depends on NUCLEO_SPI3_TEST
+ depends on NUCLEO_F746ZG_SPI3_TEST
---help---
Sets SPI 3 bit length
choice
prompt "SPI BUS 3 Clock Mode"
- default NUCLEO_SPI3_TEST_MODE3
+ default NUCLEO_F746ZG_SPI3_TEST_MODE3
---help---
Sets SPI 3 clock mode
-config NUCLEO_SPI3_TEST_MODE0
+config NUCLEO_F746ZG_SPI3_TEST_MODE0
bool "CPOL=0 CPHA=0"
-config NUCLEO_SPI3_TEST_MODE1
+config NUCLEO_F746ZG_SPI3_TEST_MODE1
bool "CPOL=0 CPHA=1"
-config NUCLEO_SPI3_TEST_MODE2
+config NUCLEO_F746ZG_SPI3_TEST_MODE2
bool "CPOL=1 CPHA=0"
-config NUCLEO_SPI3_TEST_MODE3
+config NUCLEO_F746ZG_SPI3_TEST_MODE3
bool "CPOL=1 CPHA=1"
endchoice # "SPI BUS 3 Clock Mode"
-endif # NUCLEO_SPI3_TEST
-endif # NUCLEO_SPI_TEST
+endif # NUCLEO_F746ZG_SPI3_TEST
+endif # NUCLEO_F746ZG_SPI_TEST
choice
prompt "CAN1 pins selection"
- default NUCLEO_CAN1_MAP_PD0PD1
+ default NUCLEO_F746ZG_CAN1_MAP_PD0PD1
depends on STM32F7_CAN1
-config NUCLEO_144_CAN1_MAP_D14D15
+config NUCLEO_F746ZG_F746ZG_CAN1_MAP_D14D15
bool "CAN1_TX=D14 CAN1_RX=D15"
-config NUCLEO_CAN1_MAP_PD0PD1
+config NUCLEO_F746ZG_CAN1_MAP_PD0PD1
bool "CAN1_RX=PD0 CAN1_TX=PD1"
endchoice # CAN1 pins selection
-endif # ARCH_BOARD_NUCLEO_144
+endif # ARCH_BOARD_NUCLEO_F746ZG
diff --git a/boards/arm/stm32f7/nucleo-144/configs/f746-evalos/defconfig b/boards/arm/stm32f7/nucleo-f746zg/configs/evalos/defconfig
similarity index 94%
rename from boards/arm/stm32f7/nucleo-144/configs/f746-evalos/defconfig
rename to boards/arm/stm32f7/nucleo-f746zg/configs/evalos/defconfig
index c6e3abe086..bbe513df59 100644
--- a/boards/arm/stm32f7/nucleo-144/configs/f746-evalos/defconfig
+++ b/boards/arm/stm32f7/nucleo-f746zg/configs/evalos/defconfig
@@ -12,8 +12,8 @@
# CONFIG_NSH_DISABLE_PS is not set
# CONFIG_STM32F7_USE_LEGACY_PINMAP is not set
CONFIG_ARCH="arm"
-CONFIG_ARCH_BOARD="nucleo-144"
-CONFIG_ARCH_BOARD_NUCLEO_144=y
+CONFIG_ARCH_BOARD="nucleo-f746zg"
+CONFIG_ARCH_BOARD_NUCLEO_F746ZG=y
CONFIG_ARCH_BUTTONS=y
CONFIG_ARCH_CHIP="stm32f7"
CONFIG_ARCH_CHIP_STM32F746ZG=y
@@ -37,7 +37,7 @@ CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=512
CONFIG_NSH_LINELEN=64
CONFIG_NSH_READLINE=y
-CONFIG_NUCLEO_CONSOLE_VIRTUAL=y
+CONFIG_NUCLEO_F746ZG_CONSOLE_VIRTUAL=y
CONFIG_PREALLOC_TIMERS=4
CONFIG_PRIORITY_INHERITANCE=y
CONFIG_PTHREAD_MUTEX_DEFAULT_PRIO_INHERIT=y
diff --git a/boards/arm/stm32f7/nucleo-144/configs/f746-nsh/defconfig b/boards/arm/stm32f7/nucleo-f746zg/configs/nsh/defconfig
similarity index 92%
rename from boards/arm/stm32f7/nucleo-144/configs/f746-nsh/defconfig
rename to boards/arm/stm32f7/nucleo-f746zg/configs/nsh/defconfig
index f4144cba97..34d8d3c1a5 100644
--- a/boards/arm/stm32f7/nucleo-144/configs/f746-nsh/defconfig
+++ b/boards/arm/stm32f7/nucleo-f746zg/configs/nsh/defconfig
@@ -10,8 +10,8 @@
# CONFIG_NSH_DISABLE_PS is not set
# CONFIG_STM32F7_USE_LEGACY_PINMAP is not set
CONFIG_ARCH="arm"
-CONFIG_ARCH_BOARD="nucleo-144"
-CONFIG_ARCH_BOARD_NUCLEO_144=y
+CONFIG_ARCH_BOARD="nucleo-f746zg"
+CONFIG_ARCH_BOARD_NUCLEO_F746ZG=y
CONFIG_ARCH_BUTTONS=y
CONFIG_ARCH_CHIP="stm32f7"
CONFIG_ARCH_CHIP_STM32F746ZG=y
@@ -32,7 +32,7 @@ CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=512
CONFIG_NSH_LINELEN=64
CONFIG_NSH_READLINE=y
-CONFIG_NUCLEO_CONSOLE_VIRTUAL=y
+CONFIG_NUCLEO_F746ZG_CONSOLE_VIRTUAL=y
CONFIG_PREALLOC_TIMERS=4
CONFIG_RAM_SIZE=245760
CONFIG_RAM_START=0x20010000
diff --git a/boards/arm/stm32f7/nucleo-144/configs/f746-pysim/defconfig b/boards/arm/stm32f7/nucleo-f746zg/configs/pysim/defconfig
similarity index 97%
rename from boards/arm/stm32f7/nucleo-144/configs/f746-pysim/defconfig
rename to boards/arm/stm32f7/nucleo-f746zg/configs/pysim/defconfig
index 2c53d80fc4..6536eda075 100644
--- a/boards/arm/stm32f7/nucleo-144/configs/f746-pysim/defconfig
+++ b/boards/arm/stm32f7/nucleo-f746zg/configs/pysim/defconfig
@@ -12,8 +12,8 @@ CONFIG_ADC=y
CONFIG_ADC_FIFOSIZE=16
CONFIG_ANALOG=y
CONFIG_ARCH="arm"
-CONFIG_ARCH_BOARD="nucleo-144"
-CONFIG_ARCH_BOARD_NUCLEO_144=y
+CONFIG_ARCH_BOARD="nucleo-f746zg"
+CONFIG_ARCH_BOARD_NUCLEO_F746ZG=y
CONFIG_ARCH_BUTTONS=y
CONFIG_ARCH_CHIP="stm32f7"
CONFIG_ARCH_CHIP_STM32F746ZG=y
@@ -67,7 +67,7 @@ CONFIG_NSH_DISABLE_IFUPDOWN=y
CONFIG_NSH_FILEIOSIZE=512
CONFIG_NSH_LINELEN=64
CONFIG_NSH_READLINE=y
-CONFIG_NUCLEO_CONSOLE_VIRTUAL=y
+CONFIG_NUCLEO_F746ZG_CONSOLE_VIRTUAL=y
CONFIG_POSIX_SPAWN_DEFAULT_STACKSIZE=4098
CONFIG_PREALLOC_TIMERS=4
CONFIG_PRIORITY_INHERITANCE=y
diff --git a/boards/arm/stm32f7/nucleo-144/include/board.h b/boards/arm/stm32f7/nucleo-f746zg/include/board.h
similarity index 96%
copy from boards/arm/stm32f7/nucleo-144/include/board.h
copy to boards/arm/stm32f7/nucleo-f746zg/include/board.h
index ec70ca8ce9..21b134cab3 100644
--- a/boards/arm/stm32f7/nucleo-144/include/board.h
+++ b/boards/arm/stm32f7/nucleo-f746zg/include/board.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/include/board.h
+ * boards/arm/stm32f7/nucleo-f746zg/include/board.h
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __BOARDS_ARM_STM32F7_NUCLEO_144_INCLUDE_BOARD_H
-#define __BOARDS_ARM_STM32F7_NUCLEO_144_INCLUDE_BOARD_H
+#ifndef __BOARDS_ARM_STM32F7_NUCLEO_F746ZG_INCLUDE_BOARD_H
+#define __BOARDS_ARM_STM32F7_NUCLEO_F746ZG_INCLUDE_BOARD_H
/****************************************************************************
* Included Files
@@ -39,7 +39,7 @@
/* Clocking *****************************************************************/
-/* The Nucleo-144 board provides the following clock sources:
+/* The Nucleo-f746zg board provides the following clock sources:
*
* MCO: 8 MHz from MCO output of ST-LINK is used as input clock
* X2: 32.768 KHz crystal for LSE
@@ -256,7 +256,7 @@
/* LED definitions **********************************************************/
-/* The Nucleo-144 board has numerous LEDs but only three, LD1 a Green LED,
+/* The Nucleo-f746zg board has numerous LEDs but only three, LD1 a Green LED,
* LD2 a Blue LED and LD3 a Red LED, that can be controlled by software.
* The following definitions assume the default Solder Bridges are installed.
*
@@ -384,7 +384,7 @@
#define GPIO_TIM3_CH3OUT (GPIO_TIM3_CH3OUT_2|GPIO_SPEED_50MHz)
#define GPIO_TIM3_CH4OUT (GPIO_TIM3_CH4OUT_1|GPIO_SPEED_50MHz)
-#if defined(CONFIG_NUCLEO_CONSOLE_ARDUINO)
+#if defined(CONFIG_NUCLEO_F746ZG_CONSOLE_ARDUINO)
/* USART6:
*
@@ -408,12 +408,12 @@
* Use USART3 and the USB virtual COM port
*/
-#if defined(CONFIG_NUCLEO_CONSOLE_VIRTUAL)
+#if defined(CONFIG_NUCLEO_F746ZG_CONSOLE_VIRTUAL)
# define GPIO_USART3_RX (GPIO_USART3_RX_3|GPIO_SPEED_100MHz)
# define GPIO_USART3_TX (GPIO_USART3_TX_3|GPIO_SPEED_100MHz)
#endif
-#if defined(CONFIG_NUCLEO_CONSOLE_MORPHO_UART4)
+#if defined(CONFIG_NUCLEO_F746ZG_CONSOLE_MORPHO_UART4)
/* UART4:
*
@@ -538,10 +538,10 @@
/* CAN Bus */
-#ifdef CONFIG_NUCLEO_CAN1_MAP_PD0PD1
+#ifdef CONFIG_NUCLEO_F746ZG_CAN1_MAP_PD0PD1
# define GPIO_CAN1_TX (GPIO_CAN1_TX_3|GPIO_SPEED_50MHz) /* PD1 */
# define GPIO_CAN1_RX (GPIO_CAN1_RX_3|GPIO_SPEED_50MHz) /* PD0 */
-#elif CONFIG_NUCLEO_144_CAN1_MAP_D14D15
+#elif CONFIG_NUCLEO_F746ZG_CAN1_MAP_D14D15
# define GPIO_CAN1_TX (GPIO_CAN1_TX_2|GPIO_SPEED_50MHz) /* PB9 */
# define GPIO_CAN1_RX (GPIO_CAN1_RX_2|GPIO_SPEED_50MHz) /* PB8 */
#endif
@@ -565,4 +565,4 @@
#define GPIO_OTGFS_DP (GPIO_OTGFS_DP_0|GPIO_SPEED_100MHz)
#define GPIO_OTGFS_ID (GPIO_OTGFS_ID_0|GPIO_SPEED_100MHz)
-#endif /* __BOARDS_ARM_STM32F7_NUCLEO_144_INCLUDE_BOARD_H */
+#endif /* __BOARDS_ARM_STM32F7_NUCLEO_F746ZG_INCLUDE_BOARD_H */
diff --git a/boards/arm/stm32f7/nucleo-144/configs/f722-can/Make.defs b/boards/arm/stm32f7/nucleo-f746zg/scripts/Make.defs
similarity index 95%
rename from boards/arm/stm32f7/nucleo-144/configs/f722-can/Make.defs
rename to boards/arm/stm32f7/nucleo-f746zg/scripts/Make.defs
index 881004d2eb..db184a2c09 100644
--- a/boards/arm/stm32f7/nucleo-144/configs/f722-can/Make.defs
+++ b/boards/arm/stm32f7/nucleo-f746zg/scripts/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# boards/arm/stm32f7/nucleo-144/configs/f722-can/Make.defs
+# boards/arm/stm32f7/nucleo-f746zg/scripts/Make.defs
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -22,7 +22,7 @@ include $(TOPDIR)/.config
include $(TOPDIR)/tools/Config.mk
include $(TOPDIR)/arch/arm/src/armv7-m/Toolchain.defs
-LDSCRIPT = f722-flash.ld
+LDSCRIPT = flash.ld
ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)$(LDSCRIPT)
ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10
diff --git a/boards/arm/stm32f7/nucleo-144/scripts/f746-flash.ld b/boards/arm/stm32f7/nucleo-f746zg/scripts/flash.ld
similarity index 98%
rename from boards/arm/stm32f7/nucleo-144/scripts/f746-flash.ld
rename to boards/arm/stm32f7/nucleo-f746zg/scripts/flash.ld
index 89cc79dbb9..f4c1e2fa93 100644
--- a/boards/arm/stm32f7/nucleo-144/scripts/f746-flash.ld
+++ b/boards/arm/stm32f7/nucleo-f746zg/scripts/flash.ld
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/scripts/f746-flash.ld
+ * boards/arm/stm32f7/nucleo-f746zg/scripts/flash.ld
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/boards/arm/stm32f7/nucleo-144/scripts/kernel-space.ld b/boards/arm/stm32f7/nucleo-f746zg/scripts/kernel-space.ld
similarity index 97%
copy from boards/arm/stm32f7/nucleo-144/scripts/kernel-space.ld
copy to boards/arm/stm32f7/nucleo-f746zg/scripts/kernel-space.ld
index cacf07bde7..e8503186d5 100644
--- a/boards/arm/stm32f7/nucleo-144/scripts/kernel-space.ld
+++ b/boards/arm/stm32f7/nucleo-f746zg/scripts/kernel-space.ld
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/scripts/kernel-space.ld
+ * boards/arm/stm32f7/nucleo-f746zg/scripts/kernel-space.ld
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/boards/arm/stm32f7/nucleo-144/scripts/memory.ld b/boards/arm/stm32f7/nucleo-f746zg/scripts/memory.ld
similarity index 98%
rename from boards/arm/stm32f7/nucleo-144/scripts/memory.ld
rename to boards/arm/stm32f7/nucleo-f746zg/scripts/memory.ld
index 307db62c1b..bafd66964f 100644
--- a/boards/arm/stm32f7/nucleo-144/scripts/memory.ld
+++ b/boards/arm/stm32f7/nucleo-f746zg/scripts/memory.ld
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/scripts/memory.ld
+ * boards/arm/stm32f7/nucleo-f746zg/scripts/memory.ld
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/boards/arm/stm32f7/nucleo-144/scripts/user-space.ld b/boards/arm/stm32f7/nucleo-f746zg/scripts/user-space.ld
similarity index 98%
copy from boards/arm/stm32f7/nucleo-144/scripts/user-space.ld
copy to boards/arm/stm32f7/nucleo-f746zg/scripts/user-space.ld
index b8ad6e9c38..4b55b60209 100644
--- a/boards/arm/stm32f7/nucleo-144/scripts/user-space.ld
+++ b/boards/arm/stm32f7/nucleo-f746zg/scripts/user-space.ld
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/scripts/user-space.ld
+ * boards/arm/stm32f7/nucleo-f746zg/scripts/user-space.ld
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/boards/arm/stm32f7/nucleo-144/src/CMakeLists.txt b/boards/arm/stm32f7/nucleo-f746zg/src/CMakeLists.txt
similarity index 84%
copy from boards/arm/stm32f7/nucleo-144/src/CMakeLists.txt
copy to boards/arm/stm32f7/nucleo-f746zg/src/CMakeLists.txt
index 37563332bd..87e7107985 100644
--- a/boards/arm/stm32f7/nucleo-144/src/CMakeLists.txt
+++ b/boards/arm/stm32f7/nucleo-f746zg/src/CMakeLists.txt
@@ -1,5 +1,5 @@
# ##############################################################################
-# boards/arm/stm32f7/nucleo-144/src/CMakeLists.txt
+# boards/arm/stm32f7/nucleo-f746zg/src/CMakeLists.txt
#
# Licensed to the Apache Software Foundation (ASF) under one or more contributor
# license agreements. See the NOTICE file distributed with this work for
@@ -89,10 +89,5 @@ endif()
target_sources(board PRIVATE ${SRCS})
-if(CONFIG_ARCH_CHIP_STM32F722ZE)
- set_property(GLOBAL PROPERTY LD_SCRIPT "${NUTTX_BOARD_DIR}/scripts/f722-flash.ld")
-elseif(CONFIG_ARCH_CHIP_STM32F746ZG)
- set_property(GLOBAL PROPERTY LD_SCRIPT "${NUTTX_BOARD_DIR}/scripts/f746-flash.ld")
-elseif(CONFIG_ARCH_CHIP_STM32F767ZI)
- set_property(GLOBAL PROPERTY LD_SCRIPT "${NUTTX_BOARD_DIR}/scripts/f767-flash.ld")
+set_property(GLOBAL PROPERTY LD_SCRIPT "${NUTTX_BOARD_DIR}/scripts/flash.ld")
endif()
diff --git a/boards/arm/stm32f7/nucleo-144/src/Make.defs b/boards/arm/stm32f7/nucleo-f746zg/src/Make.defs
similarity index 97%
copy from boards/arm/stm32f7/nucleo-144/src/Make.defs
copy to boards/arm/stm32f7/nucleo-f746zg/src/Make.defs
index fd92677f4c..cfa460bb76 100644
--- a/boards/arm/stm32f7/nucleo-144/src/Make.defs
+++ b/boards/arm/stm32f7/nucleo-f746zg/src/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# boards/arm/stm32f7/nucleo-144/src/Make.defs
+# boards/arm/stm32f7/nucleo-f746zg/src/Make.defs
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/boards/arm/stm32f7/nucleo-144/src/nucleo-144.h b/boards/arm/stm32f7/nucleo-f746zg/src/nucleo-f746zg.h
similarity index 95%
copy from boards/arm/stm32f7/nucleo-144/src/nucleo-144.h
copy to boards/arm/stm32f7/nucleo-f746zg/src/nucleo-f746zg.h
index 98375f2557..5ed7b8cc22 100644
--- a/boards/arm/stm32f7/nucleo-144/src/nucleo-144.h
+++ b/boards/arm/stm32f7/nucleo-f746zg/src/nucleo-f746zg.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/nucleo-144.h
+ * boards/arm/stm32f7/nucleo-f746zg/src/nucleo-f746zg.h
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __BOARDS_ARM_STM32F7_NUCLEO_144_SRC_NUCLEO_144_H
-#define __BOARDS_ARM_STM32F7_NUCLEO_144_SRC_NUCLEO_144_H
+#ifndef __BOARDS_ARM_STM32F7_NUCLEO_F746ZG_SRC_NUCLEO_F746ZG_H
+#define __BOARDS_ARM_STM32F7_NUCLEO_F746ZG_SRC_NUCLEO_F746ZG_H
/****************************************************************************
* Included Files
@@ -45,11 +45,11 @@
# endif
#endif
-/* Nucleo-144 GPIO Pin Definitions ******************************************/
+/* nucleo-f746zg GPIO Pin Definitions ***************************************/
/* LED
*
- * The Nucleo-144 board has numerous LEDs but only three, LD1 a Green LED,
+ * The nucleo-f746zg board has numerous LEDs but only three, LD1 a Green LED,
* LD2 a Blue LED and LD3 a Red LED, that can be controlled by software.
* The following definitions assume the default Solder Bridges are installed.
*/
@@ -220,7 +220,8 @@ int stm32_bringup(void);
* Name: stm32_spidev_initialize
*
* Description:
- * Called to configure SPI chip select GPIO pins for the Nucleo-144 board.
+ * Called to configure SPI chip select GPIO pins for the nucleo-f746zg
+ * board.
*
****************************************************************************/
@@ -237,7 +238,7 @@ void stm32_spidev_initialize(void);
*
****************************************************************************/
-#if defined(CONFIG_NUCLEO_SPI_TEST)
+#if defined(CONFIG_NUCLEO_F722ZE_SPI_TEST)
int stm32_spidev_bus_test(void);
#endif
@@ -276,7 +277,7 @@ int stm32_sdio_initialize(void);
*
* Description:
* Called from stm32_usbinitialize very early in inialization to setup
- * USB-related GPIO pins for the nucleo-144 board.
+ * USB-related GPIO pins for the nucleo-f746zg board.
*
****************************************************************************/
@@ -349,4 +350,4 @@ int stm32_gpio_initialize(void);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __BOARDS_ARM_STM32F7_NUCLEO_144_SRC_NUCLEO_144_H */
+#endif /* __BOARDS_ARM_STM32F7_NUCLEO_F746ZG_SRC_NUCLEO_F746ZG_H */
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_adc.c b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_adc.c
similarity index 98%
copy from boards/arm/stm32f7/nucleo-144/src/stm32_adc.c
copy to boards/arm/stm32f7/nucleo-f746zg/src/stm32_adc.c
index b85f251538..ac4a406b39 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_adc.c
+++ b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_adc.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_adc.c
+ * boards/arm/stm32f7/nucleo-f746zg/src/stm32_adc.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -34,7 +34,7 @@
#include "chip.h"
#include "stm32_gpio.h"
#include "stm32_adc.h"
-#include "nucleo-144.h"
+#include "nucleo-f746zg.h"
#ifdef CONFIG_ADC
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_appinitialize.c b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_appinitialize.c
similarity index 96%
copy from boards/arm/stm32f7/nucleo-144/src/stm32_appinitialize.c
copy to boards/arm/stm32f7/nucleo-f746zg/src/stm32_appinitialize.c
index 13f43ffc48..22ed5971a9 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_appinitialize.c
+++ b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_appinitialize.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_appinitialize.c
+ * boards/arm/stm32f7/nucleo-f746zg/src/stm32_appinitialize.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -25,7 +25,7 @@
#include <nuttx/config.h>
#include <sys/types.h>
-#include "nucleo-144.h"
+#include "nucleo-f746zg.h"
#ifdef CONFIG_BOARDCTL
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_autoleds.c b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_autoleds.c
similarity index 98%
copy from boards/arm/stm32f7/nucleo-144/src/stm32_autoleds.c
copy to boards/arm/stm32f7/nucleo-f746zg/src/stm32_autoleds.c
index f854ba1ba8..385b307754 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_autoleds.c
+++ b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_autoleds.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_autoleds.c
+ * boards/arm/stm32f7/nucleo-f746zg/src/stm32_autoleds.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -33,7 +33,7 @@
#include <arch/board/board.h>
#include "stm32_gpio.h"
-#include "nucleo-144.h"
+#include "nucleo-f746zg.h"
#ifdef CONFIG_ARCH_LEDS
/****************************************************************************
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_bbsram.c b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_bbsram.c
similarity index 99%
copy from boards/arm/stm32f7/nucleo-144/src/stm32_bbsram.c
copy to boards/arm/stm32f7/nucleo-f746zg/src/stm32_bbsram.c
index be29fb27d8..4bfcfeaa06 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_bbsram.c
+++ b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_bbsram.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_bbsram.c
+ * boards/arm/stm32f7/nucleo-f746zg/src/stm32_bbsram.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -43,7 +43,7 @@
#include "arm_internal.h"
#include "stm32_bbsram.h"
-#include "nucleo-144.h"
+#include "nucleo-f746zg.h"
#ifdef CONFIG_STM32F7_BBSRAM
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_boot.c b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_boot.c
similarity index 97%
copy from boards/arm/stm32f7/nucleo-144/src/stm32_boot.c
copy to boards/arm/stm32f7/nucleo-f746zg/src/stm32_boot.c
index 5da2b44fa4..e222654a97 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_boot.c
+++ b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_boot.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_boot.c
+ * boards/arm/stm32f7/nucleo-f746zg/src/stm32_boot.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -30,7 +30,7 @@
#include <arch/board/board.h>
#include "arm_internal.h"
-#include "nucleo-144.h"
+#include "nucleo-f746zg.h"
/****************************************************************************
* Public Functions
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_bringup.c b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_bringup.c
similarity index 98%
copy from boards/arm/stm32f7/nucleo-144/src/stm32_bringup.c
copy to boards/arm/stm32f7/nucleo-f746zg/src/stm32_bringup.c
index f0803f30e9..b58aba9db6 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_bringup.c
+++ b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_bringup.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_bringup.c
+ * boards/arm/stm32f7/nucleo-f746zg/src/stm32_bringup.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -29,7 +29,7 @@
#include <syslog.h>
#include <stdio.h>
-#include "nucleo-144.h"
+#include "nucleo-f746zg.h"
#include <nuttx/fs/fs.h>
#include <nuttx/i2c/i2c_master.h>
#include <nuttx/kmalloc.h>
@@ -141,7 +141,7 @@ int stm32_bringup(void)
}
#endif
-#if defined(CONFIG_NUCLEO_SPI_TEST)
+#if defined(CONFIG_NUCLEO_F746ZG_SPI_TEST)
/* Create SPI interfaces */
ret = stm32_spidev_bus_test();
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_buttons.c b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_buttons.c
similarity index 97%
copy from boards/arm/stm32f7/nucleo-144/src/stm32_buttons.c
copy to boards/arm/stm32f7/nucleo-f746zg/src/stm32_buttons.c
index 73e23bd54a..e5a21c1d11 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_buttons.c
+++ b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_buttons.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_buttons.c
+ * boards/arm/stm32f7/nucleo-f746zg/src/stm32_buttons.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -33,7 +33,7 @@
#include <arch/board/board.h>
#include "stm32_gpio.h"
-#include "nucleo-144.h"
+#include "nucleo-f746zg.h"
#ifdef CONFIG_ARCH_BUTTONS
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_can.c b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_can.c
similarity index 97%
copy from boards/arm/stm32f7/nucleo-144/src/stm32_can.c
copy to boards/arm/stm32f7/nucleo-f746zg/src/stm32_can.c
index 89bef7ccda..8b4561de29 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_can.c
+++ b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_can.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_can.c
+ * boards/arm/stm32f7/nucleo-f746zg/src/stm32_can.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -31,7 +31,7 @@
#include <nuttx/can/can.h>
#include "stm32_can.h"
-#include "nucleo-144.h"
+#include "nucleo-f746zg.h"
#ifdef CONFIG_CAN
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_cansock.c b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_cansock.c
similarity index 97%
copy from boards/arm/stm32f7/nucleo-144/src/stm32_cansock.c
copy to boards/arm/stm32f7/nucleo-f746zg/src/stm32_cansock.c
index 09fd437146..98452af5d8 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_cansock.c
+++ b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_cansock.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_cansock.c
+ * boards/arm/stm32f7/nucleo-f746zg/src/stm32_cansock.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_composite.c b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_composite.c
similarity index 99%
copy from boards/arm/stm32f7/nucleo-144/src/stm32_composite.c
copy to boards/arm/stm32f7/nucleo-f746zg/src/stm32_composite.c
index 3ffcb6e6f8..8327d3814a 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_composite.c
+++ b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_composite.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_composite.c
+ * boards/arm/stm32f7/nucleo-f746zg/src/stm32_composite.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_dma_alloc.c b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_dma_alloc.c
similarity index 98%
copy from boards/arm/stm32f7/nucleo-144/src/stm32_dma_alloc.c
copy to boards/arm/stm32f7/nucleo-f746zg/src/stm32_dma_alloc.c
index 30121eb39c..fef0e2ebd7 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_dma_alloc.c
+++ b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_dma_alloc.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_dma_alloc.c
+ * boards/arm/stm32f7/nucleo-f746zg/src/stm32_dma_alloc.c
*
* Copyright (C) 2016 PX4 Development Team. All rights reserved.
*
@@ -42,7 +42,7 @@
#include <errno.h>
#include <nuttx/mm/gran.h>
-#include "nucleo-144.h"
+#include "nucleo-f746zg.h"
#if defined(CONFIG_FAT_DMAMEMORY)
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_gpio.c b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_gpio.c
similarity index 98%
copy from boards/arm/stm32f7/nucleo-144/src/stm32_gpio.c
copy to boards/arm/stm32f7/nucleo-f746zg/src/stm32_gpio.c
index f193aa9a11..032304ab97 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_gpio.c
+++ b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_gpio.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_gpio.c
+ * boards/arm/stm32f7/nucleo-f746zg/src/stm32_gpio.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -36,7 +36,7 @@
#include "chip.h"
#include "stm32_gpio.h"
-#include "nucleo-144.h"
+#include "nucleo-f746zg.h"
#if defined(CONFIG_DEV_GPIO) && !defined(CONFIG_GPIO_LOWER_HALF)
@@ -126,7 +126,7 @@ static const uint32_t g_gpiooutputs[BOARD_NGPIOOUT] =
#if !defined(CONFIG_STM32F7_TIM1_CH1NOUT)
GPIO_OUT6,
#endif
-#if !defined(CONFIG_STM32F7_TIM1_CH2NOUT)
+#if !defined(CONFIG_STM32F7_TIM1_CH2NOUT)
GPIO_OUT7,
#endif
};
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_pwm.c b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_pwm.c
similarity index 98%
copy from boards/arm/stm32f7/nucleo-144/src/stm32_pwm.c
copy to boards/arm/stm32f7/nucleo-f746zg/src/stm32_pwm.c
index aeb66ea64c..0f520a8741 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_pwm.c
+++ b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_pwm.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_pwm.c
+ * boards/arm/stm32f7/nucleo-f746zg/src/stm32_pwm.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -35,7 +35,7 @@
#include "chip.h"
#include "arm_internal.h"
#include "stm32_pwm.h"
-#include "nucleo-144.h"
+#include "nucleo-f746zg.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_qencoder.c b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_qencoder.c
similarity index 96%
copy from boards/arm/stm32f7/nucleo-144/src/stm32_qencoder.c
copy to boards/arm/stm32f7/nucleo-f746zg/src/stm32_qencoder.c
index 287e1e54c6..8d859fa7e4 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_qencoder.c
+++ b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_qencoder.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_qencoder.c
+ * boards/arm/stm32f7/nucleo-f746zg/src/stm32_qencoder.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -33,7 +33,7 @@
#include "chip.h"
#include "arm_internal.h"
#include "stm32_qencoder.h"
-#include "nucleo-144.h"
+#include "nucleo-f746zg.h"
/****************************************************************************
* Public Functions
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_reset.c b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_reset.c
similarity index 97%
copy from boards/arm/stm32f7/nucleo-144/src/stm32_reset.c
copy to boards/arm/stm32f7/nucleo-f746zg/src/stm32_reset.c
index 33e12b236f..a95e8e5c8d 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_reset.c
+++ b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_reset.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_reset.c
+ * boards/arm/stm32f7/nucleo-f746zg/src/stm32_reset.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_romfs.h b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_romfs.h
similarity index 98%
copy from boards/arm/stm32f7/nucleo-144/src/stm32_romfs.h
copy to boards/arm/stm32f7/nucleo-f746zg/src/stm32_romfs.h
index 9ee2bbedb8..e84db19ae5 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_romfs.h
+++ b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_romfs.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_romfs.h
+ * boards/arm/stm32f7/nucleo-f746zg/src/stm32_romfs.h
*
* Copyright (C) 2017 Tomasz Wozniak. All rights reserved.
* Author: Tomasz Wozniak <t....@samsung.com>
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_romfs_initialize.c b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_romfs_initialize.c
similarity index 98%
copy from boards/arm/stm32f7/nucleo-144/src/stm32_romfs_initialize.c
copy to boards/arm/stm32f7/nucleo-f746zg/src/stm32_romfs_initialize.c
index fb56827400..0f63609b32 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_romfs_initialize.c
+++ b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_romfs_initialize.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_romfs_initialize.c
+ * boards/arm/stm32f7/nucleo-f746zg/src/stm32_romfs_initialize.c
* This file provides contents of an optional ROMFS volume, mounted at boot.
*
* Copyright (C) 2017 Tomasz Wozniak. All rights reserved.
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_sdio.c b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_sdio.c
similarity index 98%
copy from boards/arm/stm32f7/nucleo-144/src/stm32_sdio.c
copy to boards/arm/stm32f7/nucleo-f746zg/src/stm32_sdio.c
index f385dc6657..c0312e86a0 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_sdio.c
+++ b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_sdio.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_sdio.c
+ * boards/arm/stm32f7/nucleo-f746zg/src/stm32_sdio.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -33,7 +33,7 @@
#include <nuttx/mmcsd.h>
#include "chip.h"
-#include "nucleo-144.h"
+#include "nucleo-f746zg.h"
#include "stm32_gpio.h"
#include "stm32_sdmmc.h"
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_spi.c b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_spi.c
similarity index 76%
copy from boards/arm/stm32f7/nucleo-144/src/stm32_spi.c
copy to boards/arm/stm32f7/nucleo-f746zg/src/stm32_spi.c
index bcadb0d0d3..15cf08642c 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_spi.c
+++ b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_spi.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_spi.c
+ * boards/arm/stm32f7/nucleo-f746zg/src/stm32_spi.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -39,7 +39,7 @@
#include "stm32_gpio.h"
#include "stm32_spi.h"
-#include "nucleo-144.h"
+#include "nucleo-f746zg.h"
#if defined(CONFIG_SPI)
@@ -47,45 +47,45 @@
* Pre-processor Definitions
****************************************************************************/
-#if defined(CONFIG_NUCLEO_SPI1_TEST)
-# if defined(CONFIG_NUCLEO_SPI1_TEST_MODE0)
-# define CONFIG_NUCLEO_SPI1_TEST_MODE SPIDEV_MODE0
-# elif defined(CONFIG_NUCLEO_SPI1_TEST_MODE1)
-# define CONFIG_NUCLEO_SPI1_TEST_MODE SPIDEV_MODE1
-# elif defined(CONFIG_NUCLEO_SPI1_TEST_MODE2)
-# define CONFIG_NUCLEO_SPI1_TEST_MODE SPIDEV_MODE2
-# elif defined(CONFIG_NUCLEO_SPI1_TEST_MODE3)
-# define CONFIG_NUCLEO_SPI1_TEST_MODE SPIDEV_MODE3
+#if defined(CONFIG_NUCLEO_F746ZG_SPI1_TEST)
+# if defined(CONFIG_NUCLEO_F746ZG_SPI1_TEST_MODE0)
+# define CONFIG_NUCLEO_F746ZG_SPI1_TEST_MODE SPIDEV_MODE0
+# elif defined(CONFIG_NUCLEO_F746ZG_SPI1_TEST_MODE1)
+# define CONFIG_NUCLEO_F746ZG_SPI1_TEST_MODE SPIDEV_MODE1
+# elif defined(CONFIG_NUCLEO_F746ZG_SPI1_TEST_MODE2)
+# define CONFIG_NUCLEO_F746ZG_SPI1_TEST_MODE SPIDEV_MODE2
+# elif defined(CONFIG_NUCLEO_F746ZG_SPI1_TEST_MODE3)
+# define CONFIG_NUCLEO_F746ZG_SPI1_TEST_MODE SPIDEV_MODE3
# else
-# error "No CONFIG_NUCLEO_SPI1_TEST_MODEx defined"
+# error "No CONFIG_NUCLEO_F746ZG_SPI1_TEST_MODEx defined"
# endif
#endif
-#if defined(CONFIG_NUCLEO_SPI2_TEST)
-# if defined(CONFIG_NUCLEO_SPI2_TEST_MODE0)
-# define CONFIG_NUCLEO_SPI2_TEST_MODE SPIDEV_MODE0
-# elif defined(CONFIG_NUCLEO_SPI2_TEST_MODE1)
-# define CONFIG_NUCLEO_SPI2_TEST_MODE SPIDEV_MODE1
-# elif defined(CONFIG_NUCLEO_SPI2_TEST_MODE2)
-# define CONFIG_NUCLEO_SPI2_TEST_MODE SPIDEV_MODE2
-# elif defined(CONFIG_NUCLEO_SPI2_TEST_MODE3)
-# define CONFIG_NUCLEO_SPI2_TEST_MODE SPIDEV_MODE3
+#if defined(CONFIG_NUCLEO_F746ZG_SPI2_TEST)
+# if defined(CONFIG_NUCLEO_F746ZG_SPI2_TEST_MODE0)
+# define CONFIG_NUCLEO_F746ZG_SPI2_TEST_MODE SPIDEV_MODE0
+# elif defined(CONFIG_NUCLEO_F746ZG_SPI2_TEST_MODE1)
+# define CONFIG_NUCLEO_F746ZG_SPI2_TEST_MODE SPIDEV_MODE1
+# elif defined(CONFIG_NUCLEO_F746ZG_SPI2_TEST_MODE2)
+# define CONFIG_NUCLEO_F746ZG_SPI2_TEST_MODE SPIDEV_MODE2
+# elif defined(CONFIG_NUCLEO_F746ZG_SPI2_TEST_MODE3)
+# define CONFIG_NUCLEO_F746ZG_SPI2_TEST_MODE SPIDEV_MODE3
# else
-# error "No CONFIG_NUCLEO_SPI2_TEST_MODEx defined"
+# error "No CONFIG_NUCLEO_F746ZG_SPI2_TEST_MODEx defined"
# endif
#endif
-#if defined(CONFIG_NUCLEO_SPI3_TEST)
-# if defined(CONFIG_NUCLEO_SPI3_TEST_MODE0)
-# define CONFIG_NUCLEO_SPI3_TEST_MODE SPIDEV_MODE0
-# elif defined(CONFIG_NUCLEO_SPI3_TEST_MODE1)
-# define CONFIG_NUCLEO_SPI3_TEST_MODE SPIDEV_MODE1
-# elif defined(CONFIG_NUCLEO_SPI3_TEST_MODE2)
-# define CONFIG_NUCLEO_SPI3_TEST_MODE SPIDEV_MODE2
-# elif defined(CONFIG_NUCLEO_SPI3_TEST_MODE3)
-# define CONFIG_NUCLEO_SPI3_TEST_MODE SPIDEV_MODE3
+#if defined(CONFIG_NUCLEO_F746ZG_SPI3_TEST)
+# if defined(CONFIG_NUCLEO_F746ZG_SPI3_TEST_MODE0)
+# define CONFIG_NUCLEO_F746ZG_SPI3_TEST_MODE SPIDEV_MODE0
+# elif defined(CONFIG_NUCLEO_F746ZG_SPI3_TEST_MODE1)
+# define CONFIG_NUCLEO_F746ZG_SPI3_TEST_MODE SPIDEV_MODE1
+# elif defined(CONFIG_NUCLEO_F746ZG_SPI3_TEST_MODE2)
+# define CONFIG_NUCLEO_F746ZG_SPI3_TEST_MODE SPIDEV_MODE2
+# elif defined(CONFIG_NUCLEO_F746ZG_SPI3_TEST_MODE3)
+# define CONFIG_NUCLEO_F746ZG_SPI3_TEST_MODE SPIDEV_MODE3
# else
-# error "No CONFIG_NUCLEO_SPI3_TEST_MODEx defined"
+# error "No CONFIG_NUCLEO_F746ZG_SPI3_TEST_MODEx defined"
# endif
#endif
@@ -171,7 +171,7 @@ static const uint32_t g_spi3gpio[] =
};
#endif
-#if defined(CONFIG_NUCLEO_SPI_TEST)
+#if defined(CONFIG_NUCLEO_F746ZG_SPI_TEST)
# if defined(CONFIG_STM32F7_SPI1)
struct spi_dev_s *spi1;
# endif
@@ -191,7 +191,8 @@ struct spi_dev_s *spi3;
* Name: stm32_spidev_initialize
*
* Description:
- * Called to configure SPI chip select GPIO pins for the Nucleo-144 board.
+ * Called to configure SPI chip select GPIO pins for the nucleo-f746zg
+ * board.
*
****************************************************************************/
@@ -430,14 +431,14 @@ int stm32_spi6cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd)
#endif /* CONFIG_SPI_CMDDATA */
-#if defined(CONFIG_NUCLEO_SPI_TEST)
+#if defined(CONFIG_NUCLEO_F746ZG_SPI_TEST)
int stm32_spidev_bus_test(void)
{
/* Configure and test SPI- */
- uint8_t *tx = (uint8_t *)CONFIG_NUCLEO_SPI_TEST_MESSAGE;
+ uint8_t *tx = (uint8_t *)CONFIG_NUCLEO_F746ZG_SPI_TEST_MESSAGE;
-#if defined(CONFIG_NUCLEO_SPI1_TEST)
+#if defined(CONFIG_NUCLEO_F746ZG_SPI1_TEST)
spi1 = stm32_spibus_initialize(1);
if (!spi1)
@@ -446,15 +447,16 @@ int stm32_spidev_bus_test(void)
return -ENODEV;
}
- /* Default SPI1 to NUCLEO_SPI1_FREQ and mode */
+ /* Default SPI1 to NUCLEO_F746ZG_SPI1_FREQ and mode */
- SPI_SETFREQUENCY(spi1, CONFIG_NUCLEO_SPI1_TEST_FREQ);
- SPI_SETBITS(spi1, CONFIG_NUCLEO_SPI1_TEST_BITS);
- SPI_SETMODE(spi1, CONFIG_NUCLEO_SPI1_TEST_MODE);
- SPI_EXCHANGE(spi1, tx, NULL, nitems(CONFIG_NUCLEO_SPI_TEST_MESSAGE));
+ SPI_SETFREQUENCY(spi1, CONFIG_NUCLEO_F746ZG_SPI1_TEST_FREQ);
+ SPI_SETBITS(spi1, CONFIG_NUCLEO_F746ZG_SPI1_TEST_BITS);
+ SPI_SETMODE(spi1, CONFIG_NUCLEO_F746ZG_SPI1_TEST_MODE);
+ SPI_EXCHANGE(spi1, tx, NULL,
+ nitems(CONFIG_NUCLEO_F746ZG_SPI_TEST_MESSAGE));
#endif
-#if defined(CONFIG_NUCLEO_SPI2_TEST)
+#if defined(CONFIG_NUCLEO_F746ZG_SPI2_TEST)
spi2 = stm32_spibus_initialize(2);
if (!spi2)
@@ -463,15 +465,16 @@ int stm32_spidev_bus_test(void)
return -ENODEV;
}
- /* Default SPI2 to NUCLEO_SPI2_FREQ and mode */
+ /* Default SPI2 to NUCLEO_F746ZG_SPI2_FREQ and mode */
- SPI_SETFREQUENCY(spi2, CONFIG_NUCLEO_SPI2_TEST_FREQ);
- SPI_SETBITS(spi2, CONFIG_NUCLEO_SPI2_TEST_BITS);
- SPI_SETMODE(spi2, CONFIG_NUCLEO_SPI2_TEST_MODE);
- SPI_EXCHANGE(spi2, tx, NULL, nitems(CONFIG_NUCLEO_SPI_TEST_MESSAGE));
+ SPI_SETFREQUENCY(spi2, CONFIG_NUCLEO_F746ZG_SPI2_TEST_FREQ);
+ SPI_SETBITS(spi2, CONFIG_NUCLEO_F746ZG_SPI2_TEST_BITS);
+ SPI_SETMODE(spi2, CONFIG_NUCLEO_F746ZG_SPI2_TEST_MODE);
+ SPI_EXCHANGE(spi2, tx, NULL,
+ nitems(CONFIG_NUCLEO_F746ZG_SPI_TEST_MESSAGE));
#endif
-#if defined(CONFIG_NUCLEO_SPI3_TEST)
+#if defined(CONFIG_NUCLEO_F746ZG_SPI3_TEST)
spi3 = stm32_spibus_initialize(3);
if (!spi3)
@@ -480,15 +483,16 @@ int stm32_spidev_bus_test(void)
return -ENODEV;
}
- /* Default SPI3 to NUCLEO_SPI3_FREQ and mode */
+ /* Default SPI3 to NUCLEO_F746ZG_SPI3_FREQ and mode */
- SPI_SETFREQUENCY(spi3, CONFIG_NUCLEO_SPI3_TEST_FREQ);
- SPI_SETBITS(spi3, CONFIG_NUCLEO_SPI3_TEST_BITS);
- SPI_SETMODE(spi3, CONFIG_NUCLEO_SPI3_TEST_MODE);
- SPI_EXCHANGE(spi3, tx, NULL, nitems(CONFIG_NUCLEO_SPI_TEST_MESSAGE));
+ SPI_SETFREQUENCY(spi3, CONFIG_NUCLEO_F746ZG_SPI3_TEST_FREQ);
+ SPI_SETBITS(spi3, CONFIG_NUCLEO_F746ZG_SPI3_TEST_BITS);
+ SPI_SETMODE(spi3, CONFIG_NUCLEO_F746ZG_SPI3_TEST_MODE);
+ SPI_EXCHANGE(spi3, tx, NULL,
+ nitems(CONFIG_NUCLEO_F746ZG_SPI_TEST_MESSAGE));
#endif
return OK;
}
-#endif /* NUCLEO_SPI_TEST */
+#endif /* NUCLEO_F746ZG_SPI_TEST */
#endif /* defined(CONFIG_SPI) */
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_usb.c b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_usb.c
similarity index 98%
copy from boards/arm/stm32f7/nucleo-144/src/stm32_usb.c
copy to boards/arm/stm32f7/nucleo-f746zg/src/stm32_usb.c
index 73e449b23a..e6ad410175 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_usb.c
+++ b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_usb.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_usb.c
+ * boards/arm/stm32f7/nucleo-f746zg/src/stm32_usb.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -41,7 +41,7 @@
#include "chip.h"
#include "stm32_gpio.h"
#include "stm32_otg.h"
-#include "nucleo-144.h"
+#include "nucleo-f746zg.h"
#ifdef CONFIG_STM32F7_OTGFS
@@ -122,7 +122,7 @@ static int usbhost_waiter(int argc, char *argv[])
*
* Description:
* Called from stm32_usbinitialize very early in inialization to setup
- * USB-related GPIO pins for the nucleo-144 board.
+ * USB-related GPIO pins for the nucleo-f746zg board.
*
****************************************************************************/
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_userleds.c b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_userleds.c
similarity index 97%
copy from boards/arm/stm32f7/nucleo-144/src/stm32_userleds.c
copy to boards/arm/stm32f7/nucleo-f746zg/src/stm32_userleds.c
index 249d835300..1eece4ab90 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_userleds.c
+++ b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_userleds.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_userleds.c
+ * boards/arm/stm32f7/nucleo-f746zg/src/stm32_userleds.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -33,7 +33,7 @@
#include <arch/board/board.h>
#include "stm32_gpio.h"
-#include "nucleo-144.h"
+#include "nucleo-f746zg.h"
#ifndef CONFIG_ARCH_LEDS
diff --git a/boards/arm/stm32f7/nucleo-144/CMakeLists.txt b/boards/arm/stm32f7/nucleo-f767zi/CMakeLists.txt
similarity index 95%
rename from boards/arm/stm32f7/nucleo-144/CMakeLists.txt
rename to boards/arm/stm32f7/nucleo-f767zi/CMakeLists.txt
index aa930b44c8..9781e73840 100644
--- a/boards/arm/stm32f7/nucleo-144/CMakeLists.txt
+++ b/boards/arm/stm32f7/nucleo-f767zi/CMakeLists.txt
@@ -1,5 +1,5 @@
# ##############################################################################
-# boards/arm/stm32f7/nucleo-144/CMakeLists.txt
+# boards/arm/stm32f7/nucleo-f767zi/CMakeLists.txt
#
# Licensed to the Apache Software Foundation (ASF) under one or more contributor
# license agreements. See the NOTICE file distributed with this work for
diff --git a/boards/arm/stm32f7/nucleo-144/Kconfig b/boards/arm/stm32f7/nucleo-f767zi/Kconfig
similarity index 65%
rename from boards/arm/stm32f7/nucleo-144/Kconfig
rename to boards/arm/stm32f7/nucleo-f767zi/Kconfig
index 3f10dff100..83086d2372 100644
--- a/boards/arm/stm32f7/nucleo-144/Kconfig
+++ b/boards/arm/stm32f7/nucleo-f767zi/Kconfig
@@ -3,7 +3,7 @@
# see the file kconfig-language.txt in the NuttX tools repository.
#
-if ARCH_BOARD_NUCLEO_144
+if ARCH_BOARD_NUCLEO_F767ZI
config STM32_ROMFS
bool "Automount baked-in ROMFS image"
@@ -29,7 +29,7 @@ config STM32_ROMFS_IMAGEFILE
choice
prompt "Select Console wiring."
- default NUCLEO_CONSOLE_ARDUINO
+ default NUCLEO_F767ZI_CONSOLE_ARDUINO
---help---
Select where you will connect the console.
@@ -77,196 +77,196 @@ choice
-------- --------- -----
Note: SB13 must be removed to disable Ethernet.
-config NUCLEO_CONSOLE_ARDUINO
+config NUCLEO_F767ZI_CONSOLE_ARDUINO
bool "Arduino Connector"
select STM32F7_USART6
select USART6_SERIALDRIVER
-config NUCLEO_CONSOLE_VIRTUAL
+config NUCLEO_F767ZI_CONSOLE_VIRTUAL
bool "Virtual Comport"
select STM32F7_USART3
select USART3_SERIALDRIVER
-config NUCLEO_CONSOLE_MORPHO
+config NUCLEO_F767ZI_CONSOLE_MORPHO
bool "Morpho Connector"
select STM32F7_UART8
select UART8_SERIALDRIVER
-config NUCLEO_CONSOLE_MORPHO_UART4
+config NUCLEO_F767ZI_CONSOLE_MORPHO_UART4
bool "Morpho Connector UART4"
select STM32F7_UART4
select UART4_SERIALDRIVER
-config NUCLEO_CONSOLE_NONE
+config NUCLEO_F767ZI_CONSOLE_NONE
bool "No Console"
endchoice # "Select Console wiring"
-config NUCLEO_SPI_TEST
+config NUCLEO_F767ZI_SPI_TEST
bool "Enable SPI test"
default n
---help---
Enable Spi test - initialize and configure SPI to send
- NUCLEO_SPI_TEST_MESSAGE text. The text is sent on the
+ NUCLEO_F767ZI_SPI_TEST_MESSAGE text. The text is sent on the
selected SPI Buses with the configured parameters.
Note the CS lines will not be asserted.
-if NUCLEO_SPI_TEST
+if NUCLEO_F767ZI_SPI_TEST
-config NUCLEO_SPI_TEST_MESSAGE
+config NUCLEO_F767ZI_SPI_TEST_MESSAGE
string "Text to Send on SPI Bus(es)"
default "Hello World"
- depends on NUCLEO_SPI_TEST
+ depends on NUCLEO_F767ZI_SPI_TEST
---help---
Text to sent on SPI bus(es)
-config NUCLEO_SPI1_TEST
+config NUCLEO_F767ZI_SPI1_TEST
bool "Test SPI bus 1"
default n
- depends on NUCLEO_SPI_TEST
+ depends on NUCLEO_F767ZI_SPI_TEST
---help---
Enable Spi test - on SPI BUS 1
-if NUCLEO_SPI1_TEST
+if NUCLEO_F767ZI_SPI1_TEST
-config NUCLEO_SPI1_TEST_FREQ
+config NUCLEO_F767ZI_SPI1_TEST_FREQ
int "SPI 1 Clock Freq in Hz"
default 1000000
- depends on NUCLEO_SPI1_TEST
+ depends on NUCLEO_F767ZI_SPI1_TEST
---help---
Sets SPI 1 Clock Freq
-config NUCLEO_SPI1_TEST_BITS
+config NUCLEO_F767ZI_SPI1_TEST_BITS
int "SPI 1 number of bits"
default 8
- depends on NUCLEO_SPI1_TEST
+ depends on NUCLEO_F767ZI_SPI1_TEST
---help---
Sets SPI 1 bit length
choice
prompt "SPI BUS 1 Clock Mode"
- default NUCLEO_SPI1_TEST_MODE3
+ default NUCLEO_F767ZI_SPI1_TEST_MODE3
---help---
Sets SPI 1 clock mode
-config NUCLEO_SPI1_TEST_MODE0
+config NUCLEO_F767ZI_SPI1_TEST_MODE0
bool "CPOL=0 CPHA=0"
-config NUCLEO_SPI1_TEST_MODE1
+config NUCLEO_F767ZI_SPI1_TEST_MODE1
bool "CPOL=0 CPHA=1"
-config NUCLEO_SPI1_TEST_MODE2
+config NUCLEO_F767ZI_SPI1_TEST_MODE2
bool "CPOL=1 CPHA=0"
-config NUCLEO_SPI1_TEST_MODE3
+config NUCLEO_F767ZI_SPI1_TEST_MODE3
bool "CPOL=1 CPHA=1"
endchoice # "SPI BUS 1 Clock Mode"
-endif # NUCLEO_SPI1_TEST
+endif # NUCLEO_F767ZI_SPI1_TEST
-config NUCLEO_SPI2_TEST
+config NUCLEO_F767ZI_SPI2_TEST
bool "Test SPI bus 2"
default n
- depends on NUCLEO_SPI_TEST
+ depends on NUCLEO_F767ZI_SPI_TEST
---help---
Enable Spi test - on SPI BUS 2
-if NUCLEO_SPI2_TEST
+if NUCLEO_F767ZI_SPI2_TEST
-config NUCLEO_SPI2_TEST_FREQ
+config NUCLEO_F767ZI_SPI2_TEST_FREQ
int "SPI 2 Clock Freq in Hz"
default 12000000
- depends on NUCLEO_SPI2_TEST
+ depends on NUCLEO_F767ZI_SPI2_TEST
---help---
Sets SPI 2 Clock Freq
-config NUCLEO_SPI2_TEST_BITS
+config NUCLEO_F767ZI_SPI2_TEST_BITS
int "SPI 2 number of bits"
default 8
- depends on NUCLEO_SPI2_TEST
+ depends on NUCLEO_F767ZI_SPI2_TEST
---help---
Sets SPI 2 bit length
choice
prompt "SPI BUS 2 Clock Mode"
- default NUCLEO_SPI2_TEST_MODE3
+ default NUCLEO_F767ZI_SPI2_TEST_MODE3
---help---
Sets SPI 2 clock mode
-config NUCLEO_SPI2_TEST_MODE0
+config NUCLEO_F767ZI_SPI2_TEST_MODE0
bool "CPOL=0 CPHA=0"
-config NUCLEO_SPI2_TEST_MODE1
+config NUCLEO_F767ZI_SPI2_TEST_MODE1
bool "CPOL=0 CPHA=1"
-config NUCLEO_SPI2_TEST_MODE2
+config NUCLEO_F767ZI_SPI2_TEST_MODE2
bool "CPOL=1 CPHA=0"
-config NUCLEO_SPI2_TEST_MODE3
+config NUCLEO_F767ZI_SPI2_TEST_MODE3
bool "CPOL=1 CPHA=1"
endchoice # "SPI BUS 2 Clock Mode"
-endif # NUCLEO_SPI2_TEST
+endif # NUCLEO_F767ZI_SPI2_TEST
-config NUCLEO_SPI3_TEST
+config NUCLEO_F767ZI_SPI3_TEST
bool "Test SPI bus 3"
default n
- depends on NUCLEO_SPI_TEST
+ depends on NUCLEO_F767ZI_SPI_TEST
---help---
Enable Spi test - on SPI BUS 3
-if NUCLEO_SPI3_TEST
+if NUCLEO_F767ZI_SPI3_TEST
-config NUCLEO_SPI3_TEST_FREQ
+config NUCLEO_F767ZI_SPI3_TEST_FREQ
int "SPI 3 Clock Freq in Hz"
default 40000000
- depends on NUCLEO_SPI3_TEST
+ depends on NUCLEO_F767ZI_SPI3_TEST
---help---
Sets SPI 3 Clock Freq
-config NUCLEO_SPI3_TEST_BITS
+config NUCLEO_F767ZI_SPI3_TEST_BITS
int "SPI 3 number of bits"
default 8
- depends on NUCLEO_SPI3_TEST
+ depends on NUCLEO_F767ZI_SPI3_TEST
---help---
Sets SPI 3 bit length
choice
prompt "SPI BUS 3 Clock Mode"
- default NUCLEO_SPI3_TEST_MODE3
+ default NUCLEO_F767ZI_SPI3_TEST_MODE3
---help---
Sets SPI 3 clock mode
-config NUCLEO_SPI3_TEST_MODE0
+config NUCLEO_F767ZI_SPI3_TEST_MODE0
bool "CPOL=0 CPHA=0"
-config NUCLEO_SPI3_TEST_MODE1
+config NUCLEO_F767ZI_SPI3_TEST_MODE1
bool "CPOL=0 CPHA=1"
-config NUCLEO_SPI3_TEST_MODE2
+config NUCLEO_F767ZI_SPI3_TEST_MODE2
bool "CPOL=1 CPHA=0"
-config NUCLEO_SPI3_TEST_MODE3
+config NUCLEO_F767ZI_SPI3_TEST_MODE3
bool "CPOL=1 CPHA=1"
endchoice # "SPI BUS 3 Clock Mode"
-endif # NUCLEO_SPI3_TEST
-endif # NUCLEO_SPI_TEST
+endif # NUCLEO_F767ZI_SPI3_TEST
+endif # NUCLEO_F767ZI_SPI_TEST
choice
prompt "CAN1 pins selection"
- default NUCLEO_CAN1_MAP_PD0PD1
+ default NUCLEO_F767ZI_CAN1_MAP_PD0PD1
depends on STM32F7_CAN1
-config NUCLEO_144_CAN1_MAP_D14D15
+config NUCLEO_F767ZI_F767ZI_CAN1_MAP_D14D15
bool "CAN1_TX=D14 CAN1_RX=D15"
-config NUCLEO_CAN1_MAP_PD0PD1
+config NUCLEO_F767ZI_CAN1_MAP_PD0PD1
bool "CAN1_RX=PD0 CAN1_TX=PD1"
endchoice # CAN1 pins selection
-endif # ARCH_BOARD_NUCLEO_144
+endif # ARCH_BOARD_NUCLEO_F767ZI
diff --git a/boards/arm/stm32f7/nucleo-144/configs/f767-evalos/defconfig b/boards/arm/stm32f7/nucleo-f767zi/configs/evalos/defconfig
similarity index 94%
rename from boards/arm/stm32f7/nucleo-144/configs/f767-evalos/defconfig
rename to boards/arm/stm32f7/nucleo-f767zi/configs/evalos/defconfig
index 13bcd7ed1c..a2279e1898 100644
--- a/boards/arm/stm32f7/nucleo-144/configs/f767-evalos/defconfig
+++ b/boards/arm/stm32f7/nucleo-f767zi/configs/evalos/defconfig
@@ -12,8 +12,8 @@
# CONFIG_NSH_DISABLE_PS is not set
# CONFIG_STM32F7_USE_LEGACY_PINMAP is not set
CONFIG_ARCH="arm"
-CONFIG_ARCH_BOARD="nucleo-144"
-CONFIG_ARCH_BOARD_NUCLEO_144=y
+CONFIG_ARCH_BOARD="nucleo-f767zi"
+CONFIG_ARCH_BOARD_NUCLEO_F767ZI=y
CONFIG_ARCH_BUTTONS=y
CONFIG_ARCH_CHIP="stm32f7"
CONFIG_ARCH_CHIP_STM32F767ZI=y
@@ -38,7 +38,7 @@ CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=512
CONFIG_NSH_LINELEN=64
CONFIG_NSH_READLINE=y
-CONFIG_NUCLEO_CONSOLE_VIRTUAL=y
+CONFIG_NUCLEO_F767ZI_CONSOLE_VIRTUAL=y
CONFIG_PREALLOC_TIMERS=4
CONFIG_PRIORITY_INHERITANCE=y
CONFIG_PTHREAD_MUTEX_DEFAULT_PRIO_INHERIT=y
diff --git a/boards/arm/stm32f7/nucleo-144/configs/f767-netnsh/defconfig b/boards/arm/stm32f7/nucleo-f767zi/configs/netnsh/defconfig
similarity index 94%
rename from boards/arm/stm32f7/nucleo-144/configs/f767-netnsh/defconfig
rename to boards/arm/stm32f7/nucleo-f767zi/configs/netnsh/defconfig
index 412db5f97a..8ae2774367 100644
--- a/boards/arm/stm32f7/nucleo-144/configs/f767-netnsh/defconfig
+++ b/boards/arm/stm32f7/nucleo-f767zi/configs/netnsh/defconfig
@@ -7,8 +7,8 @@
#
# CONFIG_STM32F7_USE_LEGACY_PINMAP is not set
CONFIG_ARCH="arm"
-CONFIG_ARCH_BOARD="nucleo-144"
-CONFIG_ARCH_BOARD_NUCLEO_144=y
+CONFIG_ARCH_BOARD="nucleo-f767zi"
+CONFIG_ARCH_BOARD_NUCLEO_F767ZI=y
CONFIG_ARCH_BUTTONS=y
CONFIG_ARCH_CHIP="stm32f7"
CONFIG_ARCH_CHIP_STM32F767ZI=y
@@ -50,7 +50,7 @@ CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=512
CONFIG_NSH_LINELEN=64
CONFIG_NSH_READLINE=y
-CONFIG_NUCLEO_CONSOLE_VIRTUAL=y
+CONFIG_NUCLEO_F767ZI_CONSOLE_VIRTUAL=y
CONFIG_PREALLOC_TIMERS=4
CONFIG_RAM_SIZE=245760
CONFIG_RAM_START=0x20010000
diff --git a/boards/arm/stm32f7/nucleo-144/configs/f767-nsh/defconfig b/boards/arm/stm32f7/nucleo-f767zi/configs/nsh/defconfig
similarity index 92%
rename from boards/arm/stm32f7/nucleo-144/configs/f767-nsh/defconfig
rename to boards/arm/stm32f7/nucleo-f767zi/configs/nsh/defconfig
index a79a777388..b02cf4f9f2 100644
--- a/boards/arm/stm32f7/nucleo-144/configs/f767-nsh/defconfig
+++ b/boards/arm/stm32f7/nucleo-f767zi/configs/nsh/defconfig
@@ -10,8 +10,8 @@
# CONFIG_NSH_DISABLE_PS is not set
# CONFIG_STM32F7_USE_LEGACY_PINMAP is not set
CONFIG_ARCH="arm"
-CONFIG_ARCH_BOARD="nucleo-144"
-CONFIG_ARCH_BOARD_NUCLEO_144=y
+CONFIG_ARCH_BOARD="nucleo-f767zi"
+CONFIG_ARCH_BOARD_NUCLEO_F767ZI=y
CONFIG_ARCH_BUTTONS=y
CONFIG_ARCH_CHIP="stm32f7"
CONFIG_ARCH_CHIP_STM32F767ZI=y
@@ -32,7 +32,7 @@ CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=512
CONFIG_NSH_LINELEN=64
CONFIG_NSH_READLINE=y
-CONFIG_NUCLEO_CONSOLE_VIRTUAL=y
+CONFIG_NUCLEO_F767ZI_CONSOLE_VIRTUAL=y
CONFIG_PREALLOC_TIMERS=4
CONFIG_RAM_SIZE=245760
CONFIG_RAM_START=0x20010000
diff --git a/boards/arm/stm32f7/nucleo-144/include/board.h b/boards/arm/stm32f7/nucleo-f767zi/include/board.h
similarity index 96%
rename from boards/arm/stm32f7/nucleo-144/include/board.h
rename to boards/arm/stm32f7/nucleo-f767zi/include/board.h
index ec70ca8ce9..974a0d36cc 100644
--- a/boards/arm/stm32f7/nucleo-144/include/board.h
+++ b/boards/arm/stm32f7/nucleo-f767zi/include/board.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/include/board.h
+ * boards/arm/stm32f7/nucleo-f767zi/include/board.h
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __BOARDS_ARM_STM32F7_NUCLEO_144_INCLUDE_BOARD_H
-#define __BOARDS_ARM_STM32F7_NUCLEO_144_INCLUDE_BOARD_H
+#ifndef __BOARDS_ARM_STM32F7_NUCLEO_F767ZI_INCLUDE_BOARD_H
+#define __BOARDS_ARM_STM32F7_NUCLEO_F767ZI_INCLUDE_BOARD_H
/****************************************************************************
* Included Files
@@ -39,7 +39,7 @@
/* Clocking *****************************************************************/
-/* The Nucleo-144 board provides the following clock sources:
+/* The Nucleo-f767zi board provides the following clock sources:
*
* MCO: 8 MHz from MCO output of ST-LINK is used as input clock
* X2: 32.768 KHz crystal for LSE
@@ -256,7 +256,7 @@
/* LED definitions **********************************************************/
-/* The Nucleo-144 board has numerous LEDs but only three, LD1 a Green LED,
+/* The Nucleo-f767zi board has numerous LEDs but only three, LD1 a Green LED,
* LD2 a Blue LED and LD3 a Red LED, that can be controlled by software.
* The following definitions assume the default Solder Bridges are installed.
*
@@ -384,7 +384,7 @@
#define GPIO_TIM3_CH3OUT (GPIO_TIM3_CH3OUT_2|GPIO_SPEED_50MHz)
#define GPIO_TIM3_CH4OUT (GPIO_TIM3_CH4OUT_1|GPIO_SPEED_50MHz)
-#if defined(CONFIG_NUCLEO_CONSOLE_ARDUINO)
+#if defined(CONFIG_NUCLEO_F767ZI_CONSOLE_ARDUINO)
/* USART6:
*
@@ -408,12 +408,12 @@
* Use USART3 and the USB virtual COM port
*/
-#if defined(CONFIG_NUCLEO_CONSOLE_VIRTUAL)
+#if defined(CONFIG_NUCLEO_F767ZI_CONSOLE_VIRTUAL)
# define GPIO_USART3_RX (GPIO_USART3_RX_3|GPIO_SPEED_100MHz)
# define GPIO_USART3_TX (GPIO_USART3_TX_3|GPIO_SPEED_100MHz)
#endif
-#if defined(CONFIG_NUCLEO_CONSOLE_MORPHO_UART4)
+#if defined(CONFIG_NUCLEO_F767ZI_CONSOLE_MORPHO_UART4)
/* UART4:
*
@@ -538,10 +538,10 @@
/* CAN Bus */
-#ifdef CONFIG_NUCLEO_CAN1_MAP_PD0PD1
+#ifdef CONFIG_NUCLEO_F767ZI_CAN1_MAP_PD0PD1
# define GPIO_CAN1_TX (GPIO_CAN1_TX_3|GPIO_SPEED_50MHz) /* PD1 */
# define GPIO_CAN1_RX (GPIO_CAN1_RX_3|GPIO_SPEED_50MHz) /* PD0 */
-#elif CONFIG_NUCLEO_144_CAN1_MAP_D14D15
+#elif CONFIG_NUCLEO_F767ZI_CAN1_MAP_D14D15
# define GPIO_CAN1_TX (GPIO_CAN1_TX_2|GPIO_SPEED_50MHz) /* PB9 */
# define GPIO_CAN1_RX (GPIO_CAN1_RX_2|GPIO_SPEED_50MHz) /* PB8 */
#endif
@@ -565,4 +565,4 @@
#define GPIO_OTGFS_DP (GPIO_OTGFS_DP_0|GPIO_SPEED_100MHz)
#define GPIO_OTGFS_ID (GPIO_OTGFS_ID_0|GPIO_SPEED_100MHz)
-#endif /* __BOARDS_ARM_STM32F7_NUCLEO_144_INCLUDE_BOARD_H */
+#endif /* __BOARDS_ARM_STM32F7_NUCLEO_F767ZI_INCLUDE_BOARD_H */
diff --git a/boards/arm/stm32f7/nucleo-144/configs/f767-nsh/Make.defs b/boards/arm/stm32f7/nucleo-f767zi/scripts/Make.defs
similarity index 95%
rename from boards/arm/stm32f7/nucleo-144/configs/f767-nsh/Make.defs
rename to boards/arm/stm32f7/nucleo-f767zi/scripts/Make.defs
index 625599b763..0732bfd7f6 100644
--- a/boards/arm/stm32f7/nucleo-144/configs/f767-nsh/Make.defs
+++ b/boards/arm/stm32f7/nucleo-f767zi/scripts/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# boards/arm/stm32f7/nucleo-144/configs/f767-nsh/Make.defs
+# boards/arm/stm32f7/nucleo-f767/scriptsMake.defs
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -22,7 +22,7 @@ include $(TOPDIR)/.config
include $(TOPDIR)/tools/Config.mk
include $(TOPDIR)/arch/arm/src/armv7-m/Toolchain.defs
-LDSCRIPT = f767-flash.ld
+LDSCRIPT = flash.ld
ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)$(LDSCRIPT)
ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10
diff --git a/boards/arm/stm32f7/nucleo-144/scripts/f767-flash.ld b/boards/arm/stm32f7/nucleo-f767zi/scripts/flash.ld
similarity index 98%
rename from boards/arm/stm32f7/nucleo-144/scripts/f767-flash.ld
rename to boards/arm/stm32f7/nucleo-f767zi/scripts/flash.ld
index 67ee855aec..1b0340dd7a 100644
--- a/boards/arm/stm32f7/nucleo-144/scripts/f767-flash.ld
+++ b/boards/arm/stm32f7/nucleo-f767zi/scripts/flash.ld
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/scripts/f767-flash.ld
+* boards/arm/stm32f7/nucleo-f767zi/scripts/flash.ld
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/boards/arm/stm32f7/nucleo-144/scripts/kernel-space.ld b/boards/arm/stm32f7/nucleo-f767zi/scripts/kernel-space.ld
similarity index 97%
rename from boards/arm/stm32f7/nucleo-144/scripts/kernel-space.ld
rename to boards/arm/stm32f7/nucleo-f767zi/scripts/kernel-space.ld
index cacf07bde7..e08b791593 100644
--- a/boards/arm/stm32f7/nucleo-144/scripts/kernel-space.ld
+++ b/boards/arm/stm32f7/nucleo-f767zi/scripts/kernel-space.ld
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/scripts/kernel-space.ld
+ * boards/arm/stm32f7/nucleo-f767zi/scripts/kernel-space.ld
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/boards/arm/stm32f7/nucleo-144/scripts/user-space.ld b/boards/arm/stm32f7/nucleo-f767zi/scripts/user-space.ld
similarity index 98%
rename from boards/arm/stm32f7/nucleo-144/scripts/user-space.ld
rename to boards/arm/stm32f7/nucleo-f767zi/scripts/user-space.ld
index b8ad6e9c38..846335052d 100644
--- a/boards/arm/stm32f7/nucleo-144/scripts/user-space.ld
+++ b/boards/arm/stm32f7/nucleo-f767zi/scripts/user-space.ld
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/scripts/user-space.ld
+ * boards/arm/stm32f7/nucleo-f767zi/scripts/user-space.ld
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/boards/arm/stm32f7/nucleo-144/src/CMakeLists.txt b/boards/arm/stm32f7/nucleo-f767zi/src/CMakeLists.txt
similarity index 84%
rename from boards/arm/stm32f7/nucleo-144/src/CMakeLists.txt
rename to boards/arm/stm32f7/nucleo-f767zi/src/CMakeLists.txt
index 37563332bd..1591679715 100644
--- a/boards/arm/stm32f7/nucleo-144/src/CMakeLists.txt
+++ b/boards/arm/stm32f7/nucleo-f767zi/src/CMakeLists.txt
@@ -1,5 +1,5 @@
# ##############################################################################
-# boards/arm/stm32f7/nucleo-144/src/CMakeLists.txt
+# boards/arm/stm32f7/nucleo-f767zi/src/CMakeLists.txt
#
# Licensed to the Apache Software Foundation (ASF) under one or more contributor
# license agreements. See the NOTICE file distributed with this work for
@@ -89,10 +89,5 @@ endif()
target_sources(board PRIVATE ${SRCS})
-if(CONFIG_ARCH_CHIP_STM32F722ZE)
- set_property(GLOBAL PROPERTY LD_SCRIPT "${NUTTX_BOARD_DIR}/scripts/f722-flash.ld")
-elseif(CONFIG_ARCH_CHIP_STM32F746ZG)
- set_property(GLOBAL PROPERTY LD_SCRIPT "${NUTTX_BOARD_DIR}/scripts/f746-flash.ld")
-elseif(CONFIG_ARCH_CHIP_STM32F767ZI)
- set_property(GLOBAL PROPERTY LD_SCRIPT "${NUTTX_BOARD_DIR}/scripts/f767-flash.ld")
+set_property(GLOBAL PROPERTY LD_SCRIPT "${NUTTX_BOARD_DIR}/scripts/flash.ld")
endif()
diff --git a/boards/arm/stm32f7/nucleo-144/src/Make.defs b/boards/arm/stm32f7/nucleo-f767zi/src/Make.defs
similarity index 97%
rename from boards/arm/stm32f7/nucleo-144/src/Make.defs
rename to boards/arm/stm32f7/nucleo-f767zi/src/Make.defs
index fd92677f4c..b345afc6a4 100644
--- a/boards/arm/stm32f7/nucleo-144/src/Make.defs
+++ b/boards/arm/stm32f7/nucleo-f767zi/src/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# boards/arm/stm32f7/nucleo-144/src/Make.defs
+# boards/arm/stm32f7/nucleo-f767zi/src/Make.defs
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/boards/arm/stm32f7/nucleo-144/src/nucleo-144.h b/boards/arm/stm32f7/nucleo-f767zi/src/nucleo-f767zi.h
similarity index 95%
rename from boards/arm/stm32f7/nucleo-144/src/nucleo-144.h
rename to boards/arm/stm32f7/nucleo-f767zi/src/nucleo-f767zi.h
index 98375f2557..d7887943bf 100644
--- a/boards/arm/stm32f7/nucleo-144/src/nucleo-144.h
+++ b/boards/arm/stm32f7/nucleo-f767zi/src/nucleo-f767zi.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/nucleo-144.h
+ * boards/arm/stm32f7/nucleo-f767zi/src/nucleo-f767zi.h
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __BOARDS_ARM_STM32F7_NUCLEO_144_SRC_NUCLEO_144_H
-#define __BOARDS_ARM_STM32F7_NUCLEO_144_SRC_NUCLEO_144_H
+#ifndef __BOARDS_ARM_STM32F7_NUCLEO_767ZI_SRC_NUCLEO_767ZI_H
+#define __BOARDS_ARM_STM32F7_NUCLEO_767ZI_SRC_NUCLEO_767ZI_H
/****************************************************************************
* Included Files
@@ -45,11 +45,11 @@
# endif
#endif
-/* Nucleo-144 GPIO Pin Definitions ******************************************/
+/* nucleo-f767zi GPIO Pin Definitions ***************************************/
/* LED
*
- * The Nucleo-144 board has numerous LEDs but only three, LD1 a Green LED,
+ * The nucleo-f767zi board has numerous LEDs but only three, LD1 a Green LED,
* LD2 a Blue LED and LD3 a Red LED, that can be controlled by software.
* The following definitions assume the default Solder Bridges are installed.
*/
@@ -220,7 +220,8 @@ int stm32_bringup(void);
* Name: stm32_spidev_initialize
*
* Description:
- * Called to configure SPI chip select GPIO pins for the Nucleo-144 board.
+ * Called to configure SPI chip select GPIO pins for the nucleo-f767zi
+ * board.
*
****************************************************************************/
@@ -237,7 +238,7 @@ void stm32_spidev_initialize(void);
*
****************************************************************************/
-#if defined(CONFIG_NUCLEO_SPI_TEST)
+#if defined(CONFIG_NUCLEO_F722ZE_SPI_TEST)
int stm32_spidev_bus_test(void);
#endif
@@ -276,7 +277,7 @@ int stm32_sdio_initialize(void);
*
* Description:
* Called from stm32_usbinitialize very early in inialization to setup
- * USB-related GPIO pins for the nucleo-144 board.
+ * USB-related GPIO pins for the nucleo-f767zi board.
*
****************************************************************************/
@@ -349,4 +350,4 @@ int stm32_gpio_initialize(void);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __BOARDS_ARM_STM32F7_NUCLEO_144_SRC_NUCLEO_144_H */
+#endif /* __BOARDS_ARM_STM32F7_NUCLEO_767ZI_SRC_NUCLEO_767ZI_H */
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_adc.c b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_adc.c
similarity index 98%
rename from boards/arm/stm32f7/nucleo-144/src/stm32_adc.c
rename to boards/arm/stm32f7/nucleo-f767zi/src/stm32_adc.c
index b85f251538..0023b661e1 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_adc.c
+++ b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_adc.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_adc.c
+ * boards/arm/stm32f7/nucleo-f767zi/src/stm32_adc.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -34,7 +34,7 @@
#include "chip.h"
#include "stm32_gpio.h"
#include "stm32_adc.h"
-#include "nucleo-144.h"
+#include "nucleo-f767zi.h"
#ifdef CONFIG_ADC
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_appinitialize.c b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_appinitialize.c
similarity index 96%
rename from boards/arm/stm32f7/nucleo-144/src/stm32_appinitialize.c
rename to boards/arm/stm32f7/nucleo-f767zi/src/stm32_appinitialize.c
index 13f43ffc48..e2878480a7 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_appinitialize.c
+++ b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_appinitialize.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_appinitialize.c
+ * boards/arm/stm32f7/nucleo-f767zi/src/stm32_appinitialize.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -25,7 +25,7 @@
#include <nuttx/config.h>
#include <sys/types.h>
-#include "nucleo-144.h"
+#include "nucleo-f767zi.h"
#ifdef CONFIG_BOARDCTL
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_autoleds.c b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_autoleds.c
similarity index 98%
rename from boards/arm/stm32f7/nucleo-144/src/stm32_autoleds.c
rename to boards/arm/stm32f7/nucleo-f767zi/src/stm32_autoleds.c
index f854ba1ba8..9b269598bd 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_autoleds.c
+++ b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_autoleds.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_autoleds.c
+ * boards/arm/stm32f7/nucleo-f767zi/src/stm32_autoleds.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -33,7 +33,7 @@
#include <arch/board/board.h>
#include "stm32_gpio.h"
-#include "nucleo-144.h"
+#include "nucleo-f767zi.h"
#ifdef CONFIG_ARCH_LEDS
/****************************************************************************
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_bbsram.c b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_bbsram.c
similarity index 99%
rename from boards/arm/stm32f7/nucleo-144/src/stm32_bbsram.c
rename to boards/arm/stm32f7/nucleo-f767zi/src/stm32_bbsram.c
index be29fb27d8..3beb416027 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_bbsram.c
+++ b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_bbsram.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_bbsram.c
+ * boards/arm/stm32f7/nucleo-f767zi/src/stm32_bbsram.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -43,7 +43,7 @@
#include "arm_internal.h"
#include "stm32_bbsram.h"
-#include "nucleo-144.h"
+#include "nucleo-f767zi.h"
#ifdef CONFIG_STM32F7_BBSRAM
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_boot.c b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_boot.c
similarity index 97%
rename from boards/arm/stm32f7/nucleo-144/src/stm32_boot.c
rename to boards/arm/stm32f7/nucleo-f767zi/src/stm32_boot.c
index 5da2b44fa4..ccb69d91cf 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_boot.c
+++ b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_boot.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_boot.c
+ * boards/arm/stm32f7/nucleo-f767zi/src/stm32_boot.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -30,7 +30,7 @@
#include <arch/board/board.h>
#include "arm_internal.h"
-#include "nucleo-144.h"
+#include "nucleo-f767zi.h"
/****************************************************************************
* Public Functions
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_bringup.c b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_bringup.c
similarity index 98%
rename from boards/arm/stm32f7/nucleo-144/src/stm32_bringup.c
rename to boards/arm/stm32f7/nucleo-f767zi/src/stm32_bringup.c
index f0803f30e9..9e36235fd9 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_bringup.c
+++ b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_bringup.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_bringup.c
+ * boards/arm/stm32f7/nucleo-f767zi/src/stm32_bringup.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -29,7 +29,7 @@
#include <syslog.h>
#include <stdio.h>
-#include "nucleo-144.h"
+#include "nucleo-f767zi.h"
#include <nuttx/fs/fs.h>
#include <nuttx/i2c/i2c_master.h>
#include <nuttx/kmalloc.h>
@@ -141,7 +141,7 @@ int stm32_bringup(void)
}
#endif
-#if defined(CONFIG_NUCLEO_SPI_TEST)
+#if defined(CONFIG_NUCLEO_F722ZE_SPI_TEST)
/* Create SPI interfaces */
ret = stm32_spidev_bus_test();
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_buttons.c b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_buttons.c
similarity index 97%
rename from boards/arm/stm32f7/nucleo-144/src/stm32_buttons.c
rename to boards/arm/stm32f7/nucleo-f767zi/src/stm32_buttons.c
index 73e23bd54a..6e40186fe5 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_buttons.c
+++ b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_buttons.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_buttons.c
+ * boards/arm/stm32f7/nucleo-f767zi/src/stm32_buttons.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -33,7 +33,7 @@
#include <arch/board/board.h>
#include "stm32_gpio.h"
-#include "nucleo-144.h"
+#include "nucleo-f767zi.h"
#ifdef CONFIG_ARCH_BUTTONS
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_can.c b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_can.c
similarity index 97%
rename from boards/arm/stm32f7/nucleo-144/src/stm32_can.c
rename to boards/arm/stm32f7/nucleo-f767zi/src/stm32_can.c
index 89bef7ccda..fa067d6311 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_can.c
+++ b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_can.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_can.c
+ * boards/arm/stm32f7/nucleo-f767zi/src/stm32_can.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -31,7 +31,7 @@
#include <nuttx/can/can.h>
#include "stm32_can.h"
-#include "nucleo-144.h"
+#include "nucleo-f767zi.h"
#ifdef CONFIG_CAN
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_cansock.c b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_cansock.c
similarity index 97%
rename from boards/arm/stm32f7/nucleo-144/src/stm32_cansock.c
rename to boards/arm/stm32f7/nucleo-f767zi/src/stm32_cansock.c
index 09fd437146..72bde95d4b 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_cansock.c
+++ b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_cansock.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_cansock.c
+ * boards/arm/stm32f7/nucleo-f767zi/src/stm32_cansock.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_composite.c b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_composite.c
similarity index 99%
rename from boards/arm/stm32f7/nucleo-144/src/stm32_composite.c
rename to boards/arm/stm32f7/nucleo-f767zi/src/stm32_composite.c
index 3ffcb6e6f8..4d49c46386 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_composite.c
+++ b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_composite.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_composite.c
+ * boards/arm/stm32f7/nucleo-f767zi/src/stm32_composite.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_dma_alloc.c b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_dma_alloc.c
similarity index 98%
rename from boards/arm/stm32f7/nucleo-144/src/stm32_dma_alloc.c
rename to boards/arm/stm32f7/nucleo-f767zi/src/stm32_dma_alloc.c
index 30121eb39c..f59388c06f 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_dma_alloc.c
+++ b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_dma_alloc.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_dma_alloc.c
+ * boards/arm/stm32f7/nucleo-f767zi/src/stm32_dma_alloc.c
*
* Copyright (C) 2016 PX4 Development Team. All rights reserved.
*
@@ -42,7 +42,7 @@
#include <errno.h>
#include <nuttx/mm/gran.h>
-#include "nucleo-144.h"
+#include "nucleo-f767zi.h"
#if defined(CONFIG_FAT_DMAMEMORY)
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_gpio.c b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_gpio.c
similarity index 98%
rename from boards/arm/stm32f7/nucleo-144/src/stm32_gpio.c
rename to boards/arm/stm32f7/nucleo-f767zi/src/stm32_gpio.c
index f193aa9a11..8d0351bf75 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_gpio.c
+++ b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_gpio.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_gpio.c
+ * boards/arm/stm32f7/nucleo-f767zi/src/stm32_gpio.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -36,7 +36,7 @@
#include "chip.h"
#include "stm32_gpio.h"
-#include "nucleo-144.h"
+#include "nucleo-f767zi.h"
#if defined(CONFIG_DEV_GPIO) && !defined(CONFIG_GPIO_LOWER_HALF)
@@ -126,7 +126,7 @@ static const uint32_t g_gpiooutputs[BOARD_NGPIOOUT] =
#if !defined(CONFIG_STM32F7_TIM1_CH1NOUT)
GPIO_OUT6,
#endif
-#if !defined(CONFIG_STM32F7_TIM1_CH2NOUT)
+#if !defined(CONFIG_STM32F7_TIM1_CH2NOUT)
GPIO_OUT7,
#endif
};
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_pwm.c b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_pwm.c
similarity index 98%
rename from boards/arm/stm32f7/nucleo-144/src/stm32_pwm.c
rename to boards/arm/stm32f7/nucleo-f767zi/src/stm32_pwm.c
index aeb66ea64c..5437d39045 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_pwm.c
+++ b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_pwm.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_pwm.c
+ * boards/arm/stm32f7/nucleo-f767zi/src/stm32_pwm.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -35,7 +35,7 @@
#include "chip.h"
#include "arm_internal.h"
#include "stm32_pwm.h"
-#include "nucleo-144.h"
+#include "nucleo-f767zi.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_qencoder.c b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_qencoder.c
similarity index 96%
rename from boards/arm/stm32f7/nucleo-144/src/stm32_qencoder.c
rename to boards/arm/stm32f7/nucleo-f767zi/src/stm32_qencoder.c
index 287e1e54c6..b0511acf42 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_qencoder.c
+++ b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_qencoder.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_qencoder.c
+ * boards/arm/stm32f7/nucleo-f767zi/src/stm32_qencoder.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -33,7 +33,7 @@
#include "chip.h"
#include "arm_internal.h"
#include "stm32_qencoder.h"
-#include "nucleo-144.h"
+#include "nucleo-f767zi.h"
/****************************************************************************
* Public Functions
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_reset.c b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_reset.c
similarity index 97%
rename from boards/arm/stm32f7/nucleo-144/src/stm32_reset.c
rename to boards/arm/stm32f7/nucleo-f767zi/src/stm32_reset.c
index 33e12b236f..8631659702 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_reset.c
+++ b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_reset.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_reset.c
+ * boards/arm/stm32f7/nucleo-f767zi/src/stm32_reset.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_romfs.h b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_romfs.h
similarity index 98%
rename from boards/arm/stm32f7/nucleo-144/src/stm32_romfs.h
rename to boards/arm/stm32f7/nucleo-f767zi/src/stm32_romfs.h
index 9ee2bbedb8..9a1a0afab4 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_romfs.h
+++ b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_romfs.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_romfs.h
+ * boards/arm/stm32f7/nucleo-f767zi/src/stm32_romfs.h
*
* Copyright (C) 2017 Tomasz Wozniak. All rights reserved.
* Author: Tomasz Wozniak <t....@samsung.com>
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_romfs_initialize.c b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_romfs_initialize.c
similarity index 98%
rename from boards/arm/stm32f7/nucleo-144/src/stm32_romfs_initialize.c
rename to boards/arm/stm32f7/nucleo-f767zi/src/stm32_romfs_initialize.c
index fb56827400..6d5bd3bb0a 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_romfs_initialize.c
+++ b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_romfs_initialize.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_romfs_initialize.c
+ * boards/arm/stm32f7/nucleo-f767zi/src/stm32_romfs_initialize.c
* This file provides contents of an optional ROMFS volume, mounted at boot.
*
* Copyright (C) 2017 Tomasz Wozniak. All rights reserved.
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_sdio.c b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_sdio.c
similarity index 98%
rename from boards/arm/stm32f7/nucleo-144/src/stm32_sdio.c
rename to boards/arm/stm32f7/nucleo-f767zi/src/stm32_sdio.c
index f385dc6657..fef628b7eb 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_sdio.c
+++ b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_sdio.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_sdio.c
+ * boards/arm/stm32f7/nucleo-f767zi/src/stm32_sdio.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -33,7 +33,7 @@
#include <nuttx/mmcsd.h>
#include "chip.h"
-#include "nucleo-144.h"
+#include "nucleo-f767zi.h"
#include "stm32_gpio.h"
#include "stm32_sdmmc.h"
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_spi.c b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_spi.c
similarity index 76%
rename from boards/arm/stm32f7/nucleo-144/src/stm32_spi.c
rename to boards/arm/stm32f7/nucleo-f767zi/src/stm32_spi.c
index bcadb0d0d3..4e346e1d82 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_spi.c
+++ b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_spi.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_spi.c
+ * boards/arm/stm32f7/nucleo-f767zi/src/stm32_spi.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -39,7 +39,7 @@
#include "stm32_gpio.h"
#include "stm32_spi.h"
-#include "nucleo-144.h"
+#include "nucleo-f767zi.h"
#if defined(CONFIG_SPI)
@@ -47,45 +47,45 @@
* Pre-processor Definitions
****************************************************************************/
-#if defined(CONFIG_NUCLEO_SPI1_TEST)
-# if defined(CONFIG_NUCLEO_SPI1_TEST_MODE0)
-# define CONFIG_NUCLEO_SPI1_TEST_MODE SPIDEV_MODE0
-# elif defined(CONFIG_NUCLEO_SPI1_TEST_MODE1)
-# define CONFIG_NUCLEO_SPI1_TEST_MODE SPIDEV_MODE1
-# elif defined(CONFIG_NUCLEO_SPI1_TEST_MODE2)
-# define CONFIG_NUCLEO_SPI1_TEST_MODE SPIDEV_MODE2
-# elif defined(CONFIG_NUCLEO_SPI1_TEST_MODE3)
-# define CONFIG_NUCLEO_SPI1_TEST_MODE SPIDEV_MODE3
+#if defined(CONFIG_NUCLEO_F767ZI_SPI1_TEST)
+# if defined(CONFIG_NUCLEO_F767ZI_SPI1_TEST_MODE0)
+# define CONFIG_NUCLEO_F767ZI_SPI1_TEST_MODE SPIDEV_MODE0
+# elif defined(CONFIG_NUCLEO_F767ZI_SPI1_TEST_MODE1)
+# define CONFIG_NUCLEO_F767ZI_SPI1_TEST_MODE SPIDEV_MODE1
+# elif defined(CONFIG_NUCLEO_F767ZI_SPI1_TEST_MODE2)
+# define CONFIG_NUCLEO_F767ZI_SPI1_TEST_MODE SPIDEV_MODE2
+# elif defined(CONFIG_NUCLEO_F767ZI_SPI1_TEST_MODE3)
+# define CONFIG_NUCLEO_F767ZI_SPI1_TEST_MODE SPIDEV_MODE3
# else
-# error "No CONFIG_NUCLEO_SPI1_TEST_MODEx defined"
+# error "No CONFIG_NUCLEO_F767ZI_SPI1_TEST_MODEx defined"
# endif
#endif
-#if defined(CONFIG_NUCLEO_SPI2_TEST)
-# if defined(CONFIG_NUCLEO_SPI2_TEST_MODE0)
-# define CONFIG_NUCLEO_SPI2_TEST_MODE SPIDEV_MODE0
-# elif defined(CONFIG_NUCLEO_SPI2_TEST_MODE1)
-# define CONFIG_NUCLEO_SPI2_TEST_MODE SPIDEV_MODE1
-# elif defined(CONFIG_NUCLEO_SPI2_TEST_MODE2)
-# define CONFIG_NUCLEO_SPI2_TEST_MODE SPIDEV_MODE2
-# elif defined(CONFIG_NUCLEO_SPI2_TEST_MODE3)
-# define CONFIG_NUCLEO_SPI2_TEST_MODE SPIDEV_MODE3
+#if defined(CONFIG_NUCLEO_F767ZI_SPI2_TEST)
+# if defined(CONFIG_NUCLEO_F767ZI_SPI2_TEST_MODE0)
+# define CONFIG_NUCLEO_F767ZI_SPI2_TEST_MODE SPIDEV_MODE0
+# elif defined(CONFIG_NUCLEO_F767ZI_SPI2_TEST_MODE1)
+# define CONFIG_NUCLEO_F767ZI_SPI2_TEST_MODE SPIDEV_MODE1
+# elif defined(CONFIG_NUCLEO_F767ZI_SPI2_TEST_MODE2)
+# define CONFIG_NUCLEO_F767ZI_SPI2_TEST_MODE SPIDEV_MODE2
+# elif defined(CONFIG_NUCLEO_F767ZI_SPI2_TEST_MODE3)
+# define CONFIG_NUCLEO_F767ZI_SPI2_TEST_MODE SPIDEV_MODE3
# else
-# error "No CONFIG_NUCLEO_SPI2_TEST_MODEx defined"
+# error "No CONFIG_NUCLEO_F767ZI_SPI2_TEST_MODEx defined"
# endif
#endif
-#if defined(CONFIG_NUCLEO_SPI3_TEST)
-# if defined(CONFIG_NUCLEO_SPI3_TEST_MODE0)
-# define CONFIG_NUCLEO_SPI3_TEST_MODE SPIDEV_MODE0
-# elif defined(CONFIG_NUCLEO_SPI3_TEST_MODE1)
-# define CONFIG_NUCLEO_SPI3_TEST_MODE SPIDEV_MODE1
-# elif defined(CONFIG_NUCLEO_SPI3_TEST_MODE2)
-# define CONFIG_NUCLEO_SPI3_TEST_MODE SPIDEV_MODE2
-# elif defined(CONFIG_NUCLEO_SPI3_TEST_MODE3)
-# define CONFIG_NUCLEO_SPI3_TEST_MODE SPIDEV_MODE3
+#if defined(CONFIG_NUCLEO_F767ZI_SPI3_TEST)
+# if defined(CONFIG_NUCLEO_F767ZI_SPI3_TEST_MODE0)
+# define CONFIG_NUCLEO_F767ZI_SPI3_TEST_MODE SPIDEV_MODE0
+# elif defined(CONFIG_NUCLEO_F767ZI_SPI3_TEST_MODE1)
+# define CONFIG_NUCLEO_F767ZI_SPI3_TEST_MODE SPIDEV_MODE1
+# elif defined(CONFIG_NUCLEO_F767ZI_SPI3_TEST_MODE2)
+# define CONFIG_NUCLEO_F767ZI_SPI3_TEST_MODE SPIDEV_MODE2
+# elif defined(CONFIG_NUCLEO_F767ZI_SPI3_TEST_MODE3)
+# define CONFIG_NUCLEO_F767ZI_SPI3_TEST_MODE SPIDEV_MODE3
# else
-# error "No CONFIG_NUCLEO_SPI3_TEST_MODEx defined"
+# error "No CONFIG_NUCLEO_F767ZI_SPI3_TEST_MODEx defined"
# endif
#endif
@@ -171,7 +171,7 @@ static const uint32_t g_spi3gpio[] =
};
#endif
-#if defined(CONFIG_NUCLEO_SPI_TEST)
+#if defined(CONFIG_NUCLEO_F767ZI_SPI_TEST)
# if defined(CONFIG_STM32F7_SPI1)
struct spi_dev_s *spi1;
# endif
@@ -191,7 +191,8 @@ struct spi_dev_s *spi3;
* Name: stm32_spidev_initialize
*
* Description:
- * Called to configure SPI chip select GPIO pins for the Nucleo-144 board.
+ * Called to configure SPI chip select GPIO pins for the nucleo-f767zi
+ * board.
*
****************************************************************************/
@@ -430,14 +431,14 @@ int stm32_spi6cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd)
#endif /* CONFIG_SPI_CMDDATA */
-#if defined(CONFIG_NUCLEO_SPI_TEST)
+#if defined(CONFIG_NUCLEO_F767ZI_SPI_TEST)
int stm32_spidev_bus_test(void)
{
/* Configure and test SPI- */
- uint8_t *tx = (uint8_t *)CONFIG_NUCLEO_SPI_TEST_MESSAGE;
+ uint8_t *tx = (uint8_t *)CONFIG_NUCLEO_F767ZI_SPI_TEST_MESSAGE;
-#if defined(CONFIG_NUCLEO_SPI1_TEST)
+#if defined(CONFIG_NUCLEO_F767ZI_SPI1_TEST)
spi1 = stm32_spibus_initialize(1);
if (!spi1)
@@ -446,15 +447,16 @@ int stm32_spidev_bus_test(void)
return -ENODEV;
}
- /* Default SPI1 to NUCLEO_SPI1_FREQ and mode */
+ /* Default SPI1 to NUCLEO_F767ZI_SPI1_FREQ and mode */
- SPI_SETFREQUENCY(spi1, CONFIG_NUCLEO_SPI1_TEST_FREQ);
- SPI_SETBITS(spi1, CONFIG_NUCLEO_SPI1_TEST_BITS);
- SPI_SETMODE(spi1, CONFIG_NUCLEO_SPI1_TEST_MODE);
- SPI_EXCHANGE(spi1, tx, NULL, nitems(CONFIG_NUCLEO_SPI_TEST_MESSAGE));
+ SPI_SETFREQUENCY(spi1, CONFIG_NUCLEO_F767ZI_SPI1_TEST_FREQ);
+ SPI_SETBITS(spi1, CONFIG_NUCLEO_F767ZI_SPI1_TEST_BITS);
+ SPI_SETMODE(spi1, CONFIG_NUCLEO_F767ZI_SPI1_TEST_MODE);
+ SPI_EXCHANGE(spi1, tx, NULL,
+ nitems(CONFIG_NUCLEO_F767ZI_SPI_TEST_MESSAGE));
#endif
-#if defined(CONFIG_NUCLEO_SPI2_TEST)
+#if defined(CONFIG_NUCLEO_F767ZI_SPI2_TEST)
spi2 = stm32_spibus_initialize(2);
if (!spi2)
@@ -463,15 +465,16 @@ int stm32_spidev_bus_test(void)
return -ENODEV;
}
- /* Default SPI2 to NUCLEO_SPI2_FREQ and mode */
+ /* Default SPI2 to NUCLEO_F767ZI_SPI2_FREQ and mode */
- SPI_SETFREQUENCY(spi2, CONFIG_NUCLEO_SPI2_TEST_FREQ);
- SPI_SETBITS(spi2, CONFIG_NUCLEO_SPI2_TEST_BITS);
- SPI_SETMODE(spi2, CONFIG_NUCLEO_SPI2_TEST_MODE);
- SPI_EXCHANGE(spi2, tx, NULL, nitems(CONFIG_NUCLEO_SPI_TEST_MESSAGE));
+ SPI_SETFREQUENCY(spi2, CONFIG_NUCLEO_F767ZI_SPI2_TEST_FREQ);
+ SPI_SETBITS(spi2, CONFIG_NUCLEO_F767ZI_SPI2_TEST_BITS);
+ SPI_SETMODE(spi2, CONFIG_NUCLEO_F767ZI_SPI2_TEST_MODE);
+ SPI_EXCHANGE(spi2, tx, NULL,
+ nitems(CONFIG_NUCLEO_F767ZI_SPI_TEST_MESSAGE));
#endif
-#if defined(CONFIG_NUCLEO_SPI3_TEST)
+#if defined(CONFIG_NUCLEO_F767ZI_SPI3_TEST)
spi3 = stm32_spibus_initialize(3);
if (!spi3)
@@ -480,15 +483,16 @@ int stm32_spidev_bus_test(void)
return -ENODEV;
}
- /* Default SPI3 to NUCLEO_SPI3_FREQ and mode */
+ /* Default SPI3 to NUCLEO_F767ZI_SPI3_FREQ and mode */
- SPI_SETFREQUENCY(spi3, CONFIG_NUCLEO_SPI3_TEST_FREQ);
- SPI_SETBITS(spi3, CONFIG_NUCLEO_SPI3_TEST_BITS);
- SPI_SETMODE(spi3, CONFIG_NUCLEO_SPI3_TEST_MODE);
- SPI_EXCHANGE(spi3, tx, NULL, nitems(CONFIG_NUCLEO_SPI_TEST_MESSAGE));
+ SPI_SETFREQUENCY(spi3, CONFIG_NUCLEO_F767ZI_SPI3_TEST_FREQ);
+ SPI_SETBITS(spi3, CONFIG_NUCLEO_F767ZI_SPI3_TEST_BITS);
+ SPI_SETMODE(spi3, CONFIG_NUCLEO_F767ZI_SPI3_TEST_MODE);
+ SPI_EXCHANGE(spi3, tx, NULL,
+ nitems(CONFIG_NUCLEO_F767ZI_SPI_TEST_MESSAGE));
#endif
return OK;
}
-#endif /* NUCLEO_SPI_TEST */
+#endif /* NUCLEO_F767ZI_SPI_TEST */
#endif /* defined(CONFIG_SPI) */
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_usb.c b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_usb.c
similarity index 98%
rename from boards/arm/stm32f7/nucleo-144/src/stm32_usb.c
rename to boards/arm/stm32f7/nucleo-f767zi/src/stm32_usb.c
index 73e449b23a..3f1e74e322 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_usb.c
+++ b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_usb.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_usb.c
+ * boards/arm/stm32f7/nucleo-f767zi/src/stm32_usb.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -41,7 +41,7 @@
#include "chip.h"
#include "stm32_gpio.h"
#include "stm32_otg.h"
-#include "nucleo-144.h"
+#include "nucleo-f767zi.h"
#ifdef CONFIG_STM32F7_OTGFS
@@ -122,7 +122,7 @@ static int usbhost_waiter(int argc, char *argv[])
*
* Description:
* Called from stm32_usbinitialize very early in inialization to setup
- * USB-related GPIO pins for the nucleo-144 board.
+ * USB-related GPIO pins for the nucleo-f767zi board.
*
****************************************************************************/
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_userleds.c b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_userleds.c
similarity index 97%
rename from boards/arm/stm32f7/nucleo-144/src/stm32_userleds.c
rename to boards/arm/stm32f7/nucleo-f767zi/src/stm32_userleds.c
index 249d835300..94006d75a7 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_userleds.c
+++ b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_userleds.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_userleds.c
+ * boards/arm/stm32f7/nucleo-f767zi/src/stm32_userleds.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -33,7 +33,7 @@
#include <arch/board/board.h>
#include "stm32_gpio.h"
-#include "nucleo-144.h"
+#include "nucleo-f767zi.h"
#ifndef CONFIG_ARCH_LEDS
diff --git a/tools/ci/testlist/arm-13.dat b/tools/ci/testlist/arm-13.dat
index d98bc7c50e..ed3b7bb940 100644
--- a/tools/ci/testlist/arm-13.dat
+++ b/tools/ci/testlist/arm-13.dat
@@ -30,15 +30,17 @@ CMake,stm32g071b-disco:nsh
CMake,stm32l0538-disco:nsh
-CMake,nucleo-144:f722-can
-CMake,nucleo-144:f722-cansock
-CMake,nucleo-144:f722-composite
-CMake,nucleo-144:f746-evalos
-CMake,nucleo-144:f746-nsh
-CMake,nucleo-144:f746-pysim
-CMake,nucleo-144:f767-evalos
-CMake,nucleo-144:f767-netnsh
-CMake,nucleo-144:f767-nsh
+CMake,nucleo-f722ze:can
+CMake,nucleo-f722ze:cansock
+CMake,nucleo-f722ze:composite
+
+CMake,nucleo-f746zg:evalos
+CMake,nucleo-f746zg:nsh
+CMake,nucleo-f746zg:pysim
+
+CMake,nucleo-f767zi:evalos
+CMake,nucleo-f767zi:netnsh
+CMake,nucleo-f767zi:nsh
CMake,steval-eth001v1:foc_b16
CMake,steval-eth001v1:foc_f32
(nuttx) 06/06: boards/arm/stm32f7: move SPI test logic to common
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 6f8953ed0b0ae1f9bfae2caee1489d5d7eba724a
Author: raiden00pl <ra...@railab.me>
AuthorDate: Sun Oct 20 17:20:05 2024 +0200
boards/arm/stm32f7: move SPI test logic to common
move STM32F7 SPI test logic to common
---
boards/arm/stm32f7/common/Kconfig | 153 ++++++++++++++++++
boards/arm/stm32f7/common/include/stm32_spitest.h | 74 +++++++++
boards/arm/stm32f7/common/src/CMakeLists.txt | 4 +
boards/arm/stm32f7/common/src/Make.defs | 4 +
boards/arm/stm32f7/common/src/stm32_spitest.c | 174 +++++++++++++++++++++
boards/arm/stm32f7/nucleo-f722ze/Kconfig | 154 ------------------
.../arm/stm32f7/nucleo-f722ze/src/nucleo-f722ze.h | 13 --
.../arm/stm32f7/nucleo-f722ze/src/stm32_bringup.c | 8 +-
boards/arm/stm32f7/nucleo-f722ze/src/stm32_spi.c | 119 --------------
boards/arm/stm32f7/nucleo-f746zg/Kconfig | 154 ------------------
.../arm/stm32f7/nucleo-f746zg/src/stm32_bringup.c | 8 +-
boards/arm/stm32f7/nucleo-f746zg/src/stm32_spi.c | 119 --------------
boards/arm/stm32f7/nucleo-f767zi/Kconfig | 154 ------------------
.../arm/stm32f7/nucleo-f767zi/src/stm32_bringup.c | 8 +-
boards/arm/stm32f7/nucleo-f767zi/src/stm32_spi.c | 119 --------------
15 files changed, 427 insertions(+), 838 deletions(-)
diff --git a/boards/arm/stm32f7/common/Kconfig b/boards/arm/stm32f7/common/Kconfig
index 5d02131b7f..2d926e6634 100644
--- a/boards/arm/stm32f7/common/Kconfig
+++ b/boards/arm/stm32f7/common/Kconfig
@@ -25,3 +25,156 @@ config STM32F7_ROMFS_IMAGEFILE
depends on STM32F7_ROMFS
default "../../../rom.img"
+config STM32F7_SPI_TEST
+ bool "Enable SPI test"
+ default n
+ ---help---
+ Enable Spi test - initialize and configure SPI to send
+ STM32F7_SPI_TEST_MESSAGE text. The text is sent on the
+ selected SPI Buses with the configured parameters.
+ Note the CS lines will not be asserted.
+
+if STM32F7_SPI_TEST
+
+config STM32F7_SPI_TEST_MESSAGE
+ string "Text to Send on SPI Bus(es)"
+ default "Hello World"
+ depends on STM32F7_SPI_TEST
+ ---help---
+ Text to sent on SPI bus(es)
+
+config STM32F7_SPI1_TEST
+ bool "Test SPI bus 1"
+ default n
+ depends on STM32F7_SPI_TEST
+ ---help---
+ Enable Spi test - on SPI BUS 1
+
+if STM32F7_SPI1_TEST
+
+config STM32F7_SPI1_TEST_FREQ
+ int "SPI 1 Clock Freq in Hz"
+ default 1000000
+ depends on STM32F7_SPI1_TEST
+ ---help---
+ Sets SPI 1 Clock Freq
+
+config STM32F7_SPI1_TEST_BITS
+ int "SPI 1 number of bits"
+ default 8
+ depends on STM32F7_SPI1_TEST
+ ---help---
+ Sets SPI 1 bit length
+
+choice
+ prompt "SPI BUS 1 Clock Mode"
+ default STM32F7_SPI1_TEST_MODE3
+ ---help---
+ Sets SPI 1 clock mode
+
+config STM32F7_SPI1_TEST_MODE0
+ bool "CPOL=0 CPHA=0"
+
+config STM32F7_SPI1_TEST_MODE1
+ bool "CPOL=0 CPHA=1"
+
+config STM32F7_SPI1_TEST_MODE2
+ bool "CPOL=1 CPHA=0"
+
+config STM32F7_SPI1_TEST_MODE3
+ bool "CPOL=1 CPHA=1"
+
+endchoice # "SPI BUS 1 Clock Mode"
+
+endif # STM32F7_SPI1_TEST
+
+config STM32F7_SPI2_TEST
+ bool "Test SPI bus 2"
+ default n
+ depends on STM32F7_SPI_TEST
+ ---help---
+ Enable Spi test - on SPI BUS 2
+
+if STM32F7_SPI2_TEST
+
+config STM32F7_SPI2_TEST_FREQ
+ int "SPI 2 Clock Freq in Hz"
+ default 12000000
+ depends on STM32F7_SPI2_TEST
+ ---help---
+ Sets SPI 2 Clock Freq
+
+config STM32F7_SPI2_TEST_BITS
+ int "SPI 2 number of bits"
+ default 8
+ depends on STM32F7_SPI2_TEST
+ ---help---
+ Sets SPI 2 bit length
+
+choice
+ prompt "SPI BUS 2 Clock Mode"
+ default STM32F7_SPI2_TEST_MODE3
+ ---help---
+ Sets SPI 2 clock mode
+
+config STM32F7_SPI2_TEST_MODE0
+ bool "CPOL=0 CPHA=0"
+
+config STM32F7_SPI2_TEST_MODE1
+ bool "CPOL=0 CPHA=1"
+
+config STM32F7_SPI2_TEST_MODE2
+ bool "CPOL=1 CPHA=0"
+
+config STM32F7_SPI2_TEST_MODE3
+ bool "CPOL=1 CPHA=1"
+
+endchoice # "SPI BUS 2 Clock Mode"
+
+endif # STM32F7_SPI2_TEST
+
+config STM32F7_SPI3_TEST
+ bool "Test SPI bus 3"
+ default n
+ depends on STM32F7_SPI_TEST
+ ---help---
+ Enable Spi test - on SPI BUS 3
+
+if STM32F7_SPI3_TEST
+
+config STM32F7_SPI3_TEST_FREQ
+ int "SPI 3 Clock Freq in Hz"
+ default 40000000
+ depends on STM32F7_SPI3_TEST
+ ---help---
+ Sets SPI 3 Clock Freq
+
+config STM32F7_SPI3_TEST_BITS
+ int "SPI 3 number of bits"
+ default 8
+ depends on STM32F7_SPI3_TEST
+ ---help---
+ Sets SPI 3 bit length
+
+choice
+ prompt "SPI BUS 3 Clock Mode"
+ default STM32F7_SPI3_TEST_MODE3
+ ---help---
+ Sets SPI 3 clock mode
+
+config STM32F7_SPI3_TEST_MODE0
+ bool "CPOL=0 CPHA=0"
+
+config STM32F7_SPI3_TEST_MODE1
+ bool "CPOL=0 CPHA=1"
+
+config STM32F7_SPI3_TEST_MODE2
+ bool "CPOL=1 CPHA=0"
+
+config STM32F7_SPI3_TEST_MODE3
+ bool "CPOL=1 CPHA=1"
+
+endchoice # "SPI BUS 3 Clock Mode"
+
+endif # STM32F7_SPI3_TEST
+endif # STM32F7_SPI_TEST
diff --git a/boards/arm/stm32f7/common/include/stm32_spitest.h b/boards/arm/stm32f7/common/include/stm32_spitest.h
new file mode 100644
index 0000000000..f7db5e4431
--- /dev/null
+++ b/boards/arm/stm32f7/common/include/stm32_spitest.h
@@ -0,0 +1,74 @@
+/****************************************************************************
+ * boards/arm/stm32f7/common/include/stm32_spitest.h
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership. The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+#ifndef __BOARDS_ARM_STM32F7_COMMON_INCLUDE_STM32_SPITEST_H
+#define __BOARDS_ARM_STM32F7_COMMON_INCLUDE_STM32_SPITEST_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+#ifdef __cplusplus
+#define EXTERN extern "C"
+extern "C"
+{
+#else
+#define EXTERN extern
+#endif
+
+/****************************************************************************
+ * Inline Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: stm32_spidev_bus_test
+ *
+ * Description:
+ * Called to create the defined SPI buses and test them by initializing
+ * them and sending the CONFIG_STM32F7_SPI_TEST_MESSAGE (no chip select).
+ *
+ ****************************************************************************/
+
+int stm32_spidev_bus_test(void);
+
+#undef EXTERN
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __BOARDS_ARM_STM32F7_COMMON_INCLUDE_STM32_SPITEST_H */
diff --git a/boards/arm/stm32f7/common/src/CMakeLists.txt b/boards/arm/stm32f7/common/src/CMakeLists.txt
index 4c99128057..be18e09d37 100644
--- a/boards/arm/stm32f7/common/src/CMakeLists.txt
+++ b/boards/arm/stm32f7/common/src/CMakeLists.txt
@@ -49,4 +49,8 @@ if(CONFIG_BOARDCTL_RESET)
list(APPEND SRCS stm32_reset.c)
endif()
+if(CONFIG_STM32F7_SPI_TEST)
+ list(APPEND SRCS stm32_spitest.c)
+endif()
+
target_sources(board PRIVATE ${SRCS})
diff --git a/boards/arm/stm32f7/common/src/Make.defs b/boards/arm/stm32f7/common/src/Make.defs
index 2f1a7b4544..b3df0015a5 100644
--- a/boards/arm/stm32f7/common/src/Make.defs
+++ b/boards/arm/stm32f7/common/src/Make.defs
@@ -49,6 +49,10 @@ ifeq ($(CONFIG_BOARDCTL_RESET),y)
CSRCS += stm32_reset.c
endif
+ifeq ($(CONFIG_STM32F7_SPI_TEST),y)
+CSRCS += stm32_spitest.c
+endif
+
DEPPATH += --dep-path src
VPATH += :src
CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)src
diff --git a/boards/arm/stm32f7/common/src/stm32_spitest.c b/boards/arm/stm32f7/common/src/stm32_spitest.c
new file mode 100644
index 0000000000..8cf5536b77
--- /dev/null
+++ b/boards/arm/stm32f7/common/src/stm32_spitest.c
@@ -0,0 +1,174 @@
+/****************************************************************************
+ * boards/arm/stm32f7/common/src/stm32_spitest.c
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership. The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <stdint.h>
+#include <errno.h>
+#include <debug.h>
+
+#include <sys/param.h>
+
+#include <nuttx/spi/spi.h>
+#include <arch/board/board.h>
+
+#include "arm_internal.h"
+#include "chip.h"
+#include "stm32_spi.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#if defined(CONFIG_STM32F7_SPI1_TEST)
+# if defined(CONFIG_STM32F7_SPI1_TEST_MODE0)
+# define CONFIG_STM32F7_SPI1_TEST_MODE SPIDEV_MODE0
+# elif defined(CONFIG_STM32F7_SPI1_TEST_MODE1)
+# define CONFIG_STM32F7_SPI1_TEST_MODE SPIDEV_MODE1
+# elif defined(CONFIG_STM32F7_SPI1_TEST_MODE2)
+# define CONFIG_STM32F7_SPI1_TEST_MODE SPIDEV_MODE2
+# elif defined(CONFIG_STM32F7_SPI1_TEST_MODE3)
+# define CONFIG_STM32F7_SPI1_TEST_MODE SPIDEV_MODE3
+# else
+# error "No CONFIG_STM32F7_SPI1_TEST_MODEx defined"
+# endif
+#endif
+
+#if defined(CONFIG_STM32F7_SPI2_TEST)
+# if defined(CONFIG_STM32F7_SPI2_TEST_MODE0)
+# define CONFIG_STM32F7_SPI2_TEST_MODE SPIDEV_MODE0
+# elif defined(CONFIG_STM32F7_SPI2_TEST_MODE1)
+# define CONFIG_STM32F7_SPI2_TEST_MODE SPIDEV_MODE1
+# elif defined(CONFIG_STM32F7_SPI2_TEST_MODE2)
+# define CONFIG_STM32F7_SPI2_TEST_MODE SPIDEV_MODE2
+# elif defined(CONFIG_STM32F7_SPI2_TEST_MODE3)
+# define CONFIG_STM32F7_SPI2_TEST_MODE SPIDEV_MODE3
+# else
+# error "No CONFIG_STM32F7_SPI2_TEST_MODEx defined"
+# endif
+#endif
+
+#if defined(CONFIG_STM32F7_SPI3_TEST)
+# if defined(CONFIG_STM32F7_SPI3_TEST_MODE0)
+# define CONFIG_STM32F7_SPI3_TEST_MODE SPIDEV_MODE0
+# elif defined(CONFIG_STM32F7_SPI3_TEST_MODE1)
+# define CONFIG_STM32F7_SPI3_TEST_MODE SPIDEV_MODE1
+# elif defined(CONFIG_STM32F7_SPI3_TEST_MODE2)
+# define CONFIG_STM32F7_SPI3_TEST_MODE SPIDEV_MODE2
+# elif defined(CONFIG_STM32F7_SPI3_TEST_MODE3)
+# define CONFIG_STM32F7_SPI3_TEST_MODE SPIDEV_MODE3
+# else
+# error "No CONFIG_STM32F7_SPI3_TEST_MODEx defined"
+# endif
+#endif
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+#if defined(CONFIG_STM32F7_SPI1)
+struct spi_dev_s *g_spi1;
+#endif
+#if defined(CONFIG_STM32F7_SPI2)
+struct spi_dev_s *g_spi2;
+#endif
+#if defined(CONFIG_STM32F7_SPI3)
+struct spi_dev_s *g_spi3;
+#endif
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: stm32_spidev_bus_test
+ *
+ * Description:
+ * Called to create the defined SPI buses and test them by initializing
+ * them and sending the CONFIG_STM32F7_SPI_TEST_MESSAGE (no chip select).
+ *
+ ****************************************************************************/
+
+int stm32_spidev_bus_test(void)
+{
+ /* Configure and test SPI- */
+
+ uint8_t *tx = (uint8_t *)CONFIG_STM32F7_SPI_TEST_MESSAGE;
+
+#if defined(CONFIG_STM32F7_SPI1_TEST)
+ g_spi1 = stm32_spibus_initialize(1);
+
+ if (!g_spi1)
+ {
+ syslog(LOG_ERR, "ERROR Failed to initialize SPI port 1\n");
+ return -ENODEV;
+ }
+
+ /* Default SPI1 to STM32F7_SPI1_FREQ and mode */
+
+ SPI_SETFREQUENCY(g_spi1, CONFIG_STM32F7_SPI1_TEST_FREQ);
+ SPI_SETBITS(g_spi1, CONFIG_STM32F7_SPI1_TEST_BITS);
+ SPI_SETMODE(g_spi1, CONFIG_STM32F7_SPI1_TEST_MODE);
+ SPI_EXCHANGE(g_spi1, tx, NULL,
+ nitems(CONFIG_STM32F7_SPI_TEST_MESSAGE));
+#endif
+
+#if defined(CONFIG_STM32F7_SPI2_TEST)
+ g_spi2 = stm32_spibus_initialize(2);
+
+ if (!g_spi2)
+ {
+ syslog(LOG_ERR, "ERROR Failed to initialize SPI port 2\n");
+ return -ENODEV;
+ }
+
+ /* Default SPI2 to STM32F7_SPI2_FREQ and mode */
+
+ SPI_SETFREQUENCY(g_spi2, CONFIG_STM32F7_SPI2_TEST_FREQ);
+ SPI_SETBITS(g_spi2, CONFIG_STM32F7_SPI2_TEST_BITS);
+ SPI_SETMODE(g_spi2, CONFIG_STM32F7_SPI2_TEST_MODE);
+ SPI_EXCHANGE(g_spi2, tx, NULL,
+ nitems(CONFIG_STM32F7_SPI_TEST_MESSAGE));
+#endif
+
+#if defined(CONFIG_STM32F7_SPI3_TEST)
+ g_spi3 = stm32_spibus_initialize(3);
+
+ if (!g_spi3)
+ {
+ syslog(LOG_ERR, "ERROR Failed to initialize SPI port 2\n");
+ return -ENODEV;
+ }
+
+ /* Default SPI3 to STM32F7_SPI3_FREQ and mode */
+
+ SPI_SETFREQUENCY(g_spi3, CONFIG_STM32F7_SPI3_TEST_FREQ);
+ SPI_SETBITS(g_spi3, CONFIG_STM32F7_SPI3_TEST_BITS);
+ SPI_SETMODE(g_spi3, CONFIG_STM32F7_SPI3_TEST_MODE);
+ SPI_EXCHANGE(g_spi3, tx, NULL,
+ nitems(CONFIG_STM32F7_SPI_TEST_MESSAGE));
+#endif
+
+ return OK;
+}
diff --git a/boards/arm/stm32f7/nucleo-f722ze/Kconfig b/boards/arm/stm32f7/nucleo-f722ze/Kconfig
index c34fa5de59..cc1912c99a 100644
--- a/boards/arm/stm32f7/nucleo-f722ze/Kconfig
+++ b/boards/arm/stm32f7/nucleo-f722ze/Kconfig
@@ -80,160 +80,6 @@ config NUCLEO_F722ZE_CONSOLE_NONE
endchoice # "Select Console wiring"
-config NUCLEO_F722ZE_SPI_TEST
- bool "Enable SPI test"
- default n
- ---help---
- Enable Spi test - initialize and configure SPI to send
- NUCLEO_F722ZE_SPI_TEST_MESSAGE text. The text is sent on the
- selected SPI Buses with the configured parameters.
- Note the CS lines will not be asserted.
-
-if NUCLEO_F722ZE_SPI_TEST
-
-config NUCLEO_F722ZE_SPI_TEST_MESSAGE
- string "Text to Send on SPI Bus(es)"
- default "Hello World"
- depends on NUCLEO_F722ZE_SPI_TEST
- ---help---
- Text to sent on SPI bus(es)
-
-config NUCLEO_F722ZE_SPI1_TEST
- bool "Test SPI bus 1"
- default n
- depends on NUCLEO_F722ZE_SPI_TEST
- ---help---
- Enable Spi test - on SPI BUS 1
-
-if NUCLEO_F722ZE_SPI1_TEST
-
-config NUCLEO_F722ZE_SPI1_TEST_FREQ
- int "SPI 1 Clock Freq in Hz"
- default 1000000
- depends on NUCLEO_F722ZE_SPI1_TEST
- ---help---
- Sets SPI 1 Clock Freq
-
-config NUCLEO_F722ZE_SPI1_TEST_BITS
- int "SPI 1 number of bits"
- default 8
- depends on NUCLEO_F722ZE_SPI1_TEST
- ---help---
- Sets SPI 1 bit length
-
-choice
- prompt "SPI BUS 1 Clock Mode"
- default NUCLEO_F722ZE_SPI1_TEST_MODE3
- ---help---
- Sets SPI 1 clock mode
-
-config NUCLEO_F722ZE_SPI1_TEST_MODE0
- bool "CPOL=0 CPHA=0"
-
-config NUCLEO_F722ZE_SPI1_TEST_MODE1
- bool "CPOL=0 CPHA=1"
-
-config NUCLEO_F722ZE_SPI1_TEST_MODE2
- bool "CPOL=1 CPHA=0"
-
-config NUCLEO_F722ZE_SPI1_TEST_MODE3
- bool "CPOL=1 CPHA=1"
-
-endchoice # "SPI BUS 1 Clock Mode"
-
-endif # NUCLEO_F722ZE_SPI1_TEST
-
-config NUCLEO_F722ZE_SPI2_TEST
- bool "Test SPI bus 2"
- default n
- depends on NUCLEO_F722ZE_SPI_TEST
- ---help---
- Enable Spi test - on SPI BUS 2
-
-if NUCLEO_F722ZE_SPI2_TEST
-
-config NUCLEO_F722ZE_SPI2_TEST_FREQ
- int "SPI 2 Clock Freq in Hz"
- default 12000000
- depends on NUCLEO_F722ZE_SPI2_TEST
- ---help---
- Sets SPI 2 Clock Freq
-
-config NUCLEO_F722ZE_SPI2_TEST_BITS
- int "SPI 2 number of bits"
- default 8
- depends on NUCLEO_F722ZE_SPI2_TEST
- ---help---
- Sets SPI 2 bit length
-
-choice
- prompt "SPI BUS 2 Clock Mode"
- default NUCLEO_F722ZE_SPI2_TEST_MODE3
- ---help---
- Sets SPI 2 clock mode
-
-config NUCLEO_F722ZE_SPI2_TEST_MODE0
- bool "CPOL=0 CPHA=0"
-
-config NUCLEO_F722ZE_SPI2_TEST_MODE1
- bool "CPOL=0 CPHA=1"
-
-config NUCLEO_F722ZE_SPI2_TEST_MODE2
- bool "CPOL=1 CPHA=0"
-
-config NUCLEO_F722ZE_SPI2_TEST_MODE3
- bool "CPOL=1 CPHA=1"
-
-endchoice # "SPI BUS 2 Clock Mode"
-
-endif # NUCLEO_F722ZE_SPI2_TEST
-
-config NUCLEO_F722ZE_SPI3_TEST
- bool "Test SPI bus 3"
- default n
- depends on NUCLEO_F722ZE_SPI_TEST
- ---help---
- Enable Spi test - on SPI BUS 3
-
-if NUCLEO_F722ZE_SPI3_TEST
-
-config NUCLEO_F722ZE_SPI3_TEST_FREQ
- int "SPI 3 Clock Freq in Hz"
- default 40000000
- depends on NUCLEO_F722ZE_SPI3_TEST
- ---help---
- Sets SPI 3 Clock Freq
-
-config NUCLEO_F722ZE_SPI3_TEST_BITS
- int "SPI 3 number of bits"
- default 8
- depends on NUCLEO_F722ZE_SPI3_TEST
- ---help---
- Sets SPI 3 bit length
-
-choice
- prompt "SPI BUS 3 Clock Mode"
- default NUCLEO_F722ZE_SPI3_TEST_MODE3
- ---help---
- Sets SPI 3 clock mode
-
-config NUCLEO_F722ZE_SPI3_TEST_MODE0
- bool "CPOL=0 CPHA=0"
-
-config NUCLEO_F722ZE_SPI3_TEST_MODE1
- bool "CPOL=0 CPHA=1"
-
-config NUCLEO_F722ZE_SPI3_TEST_MODE2
- bool "CPOL=1 CPHA=0"
-
-config NUCLEO_F722ZE_SPI3_TEST_MODE3
- bool "CPOL=1 CPHA=1"
-
-endchoice # "SPI BUS 3 Clock Mode"
-
-endif # NUCLEO_F722ZE_SPI3_TEST
-endif # NUCLEO_F722ZE_SPI_TEST
-
choice
prompt "CAN1 pins selection"
default NUCLEO_F722ZE_CAN1_MAP_PD0PD1
diff --git a/boards/arm/stm32f7/nucleo-f722ze/src/nucleo-f722ze.h b/boards/arm/stm32f7/nucleo-f722ze/src/nucleo-f722ze.h
index 5b45185c3d..6be7dda102 100644
--- a/boards/arm/stm32f7/nucleo-f722ze/src/nucleo-f722ze.h
+++ b/boards/arm/stm32f7/nucleo-f722ze/src/nucleo-f722ze.h
@@ -229,19 +229,6 @@ int stm32_bringup(void);
void stm32_spidev_initialize(void);
#endif
-/****************************************************************************
- * Name: stm32_spidev_bus_test
- *
- * Description:
- * Called to create the defined SPI buses and test them by initializing
- * them and sending the NUCLEO_SPI_TEST (no chip select).
- *
- ****************************************************************************/
-
-#if defined(CONFIG_NUCLEO_F722ZE_SPI_TEST)
-int stm32_spidev_bus_test(void);
-#endif
-
/****************************************************************************
* Name: stm32_dma_alloc_init
*
diff --git a/boards/arm/stm32f7/nucleo-f722ze/src/stm32_bringup.c b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_bringup.c
index 473460b5ed..25286cd599 100644
--- a/boards/arm/stm32f7/nucleo-f722ze/src/stm32_bringup.c
+++ b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_bringup.c
@@ -50,8 +50,12 @@
# include "stm32_romfs.h"
#endif
+#ifdef CONFIG_STM32F7_SPI_TEST
+# include "stm32_spitest.h"
+#endif
+
#ifdef CONFIG_SYSTEMTICK_HOOK
-#include <semaphore.h>
+# include <semaphore.h>
#endif
/****************************************************************************
@@ -149,7 +153,7 @@ int stm32_bringup(void)
}
#endif
-#if defined(CONFIG_NUCLEO_F722ZE_SPI_TEST)
+#ifdef CONFIG_STM32F7_SPI_TEST
/* Create SPI interfaces */
ret = stm32_spidev_bus_test();
diff --git a/boards/arm/stm32f7/nucleo-f722ze/src/stm32_spi.c b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_spi.c
index e05e28fa8c..81af1eb8d3 100644
--- a/boards/arm/stm32f7/nucleo-f722ze/src/stm32_spi.c
+++ b/boards/arm/stm32f7/nucleo-f722ze/src/stm32_spi.c
@@ -47,48 +47,6 @@
* Pre-processor Definitions
****************************************************************************/
-#if defined(CONFIG_NUCLEO_F722ZE_SPI1_TEST)
-# if defined(CONFIG_NUCLEO_F722ZE_SPI1_TEST_MODE0)
-# define CONFIG_NUCLEO_F722ZE_SPI1_TEST_MODE SPIDEV_MODE0
-# elif defined(CONFIG_NUCLEO_F722ZE_SPI1_TEST_MODE1)
-# define CONFIG_NUCLEO_F722ZE_SPI1_TEST_MODE SPIDEV_MODE1
-# elif defined(CONFIG_NUCLEO_F722ZE_SPI1_TEST_MODE2)
-# define CONFIG_NUCLEO_F722ZE_SPI1_TEST_MODE SPIDEV_MODE2
-# elif defined(CONFIG_NUCLEO_F722ZE_SPI1_TEST_MODE3)
-# define CONFIG_NUCLEO_F722ZE_SPI1_TEST_MODE SPIDEV_MODE3
-# else
-# error "No CONFIG_NUCLEO_F722ZE_SPI1_TEST_MODEx defined"
-# endif
-#endif
-
-#if defined(CONFIG_NUCLEO_F722ZE_SPI2_TEST)
-# if defined(CONFIG_NUCLEO_F722ZE_SPI2_TEST_MODE0)
-# define CONFIG_NUCLEO_F722ZE_SPI2_TEST_MODE SPIDEV_MODE0
-# elif defined(CONFIG_NUCLEO_F722ZE_SPI2_TEST_MODE1)
-# define CONFIG_NUCLEO_F722ZE_SPI2_TEST_MODE SPIDEV_MODE1
-# elif defined(CONFIG_NUCLEO_F722ZE_SPI2_TEST_MODE2)
-# define CONFIG_NUCLEO_F722ZE_SPI2_TEST_MODE SPIDEV_MODE2
-# elif defined(CONFIG_NUCLEO_F722ZE_SPI2_TEST_MODE3)
-# define CONFIG_NUCLEO_F722ZE_SPI2_TEST_MODE SPIDEV_MODE3
-# else
-# error "No CONFIG_NUCLEO_F722ZE_SPI2_TEST_MODEx defined"
-# endif
-#endif
-
-#if defined(CONFIG_NUCLEO_F722ZE_SPI3_TEST)
-# if defined(CONFIG_NUCLEO_F722ZE_SPI3_TEST_MODE0)
-# define CONFIG_NUCLEO_F722ZE_SPI3_TEST_MODE SPIDEV_MODE0
-# elif defined(CONFIG_NUCLEO_F722ZE_SPI3_TEST_MODE1)
-# define CONFIG_NUCLEO_F722ZE_SPI3_TEST_MODE SPIDEV_MODE1
-# elif defined(CONFIG_NUCLEO_F722ZE_SPI3_TEST_MODE2)
-# define CONFIG_NUCLEO_F722ZE_SPI3_TEST_MODE SPIDEV_MODE2
-# elif defined(CONFIG_NUCLEO_F722ZE_SPI3_TEST_MODE3)
-# define CONFIG_NUCLEO_F722ZE_SPI3_TEST_MODE SPIDEV_MODE3
-# else
-# error "No CONFIG_NUCLEO_F722ZE_SPI3_TEST_MODEx defined"
-# endif
-#endif
-
/****************************************************************************
* Private Data
****************************************************************************/
@@ -171,18 +129,6 @@ static const uint32_t g_spi3gpio[] =
};
#endif
-#if defined(CONFIG_NUCLEO_F722ZE_SPI_TEST)
-# if defined(CONFIG_STM32F7_SPI1)
-struct spi_dev_s *spi1;
-# endif
-# if defined(CONFIG_STM32F7_SPI2)
-struct spi_dev_s *spi2;
-# endif
-# if defined(CONFIG_STM32F7_SPI3)
-struct spi_dev_s *spi3;
-# endif
-#endif
-
/****************************************************************************
* Public Functions
****************************************************************************/
@@ -430,69 +376,4 @@ int stm32_spi6cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd)
#endif
#endif /* CONFIG_SPI_CMDDATA */
-
-#if defined(CONFIG_NUCLEO_F722ZE_SPI_TEST)
-int stm32_spidev_bus_test(void)
-{
- /* Configure and test SPI- */
-
- uint8_t *tx = (uint8_t *)CONFIG_NUCLEO_F722ZE_SPI_TEST_MESSAGE;
-
-#if defined(CONFIG_NUCLEO_F722ZE_SPI1_TEST)
- spi1 = stm32_spibus_initialize(1);
-
- if (!spi1)
- {
- syslog(LOG_ERR, "ERROR Failed to initialize SPI port 1\n");
- return -ENODEV;
- }
-
- /* Default SPI1 to NUCLEO_SPI1_FREQ and mode */
-
- SPI_SETFREQUENCY(spi1, CONFIG_NUCLEO_F722ZE_SPI1_TEST_FREQ);
- SPI_SETBITS(spi1, CONFIG_NUCLEO_F722ZE_SPI1_TEST_BITS);
- SPI_SETMODE(spi1, CONFIG_NUCLEO_F722ZE_SPI1_TEST_MODE);
- SPI_EXCHANGE(spi1, tx, NULL,
- nitems(CONFIG_NUCLEO_F722ZE_SPI_TEST_MESSAGE));
-#endif
-
-#if defined(CONFIG_NUCLEO_F722ZE_SPI2_TEST)
- spi2 = stm32_spibus_initialize(2);
-
- if (!spi2)
- {
- syslog(LOG_ERR, "ERROR Failed to initialize SPI port 2\n");
- return -ENODEV;
- }
-
- /* Default SPI2 to NUCLEO_SPI2_FREQ and mode */
-
- SPI_SETFREQUENCY(spi2, CONFIG_NUCLEO_F722ZE_SPI2_TEST_FREQ);
- SPI_SETBITS(spi2, CONFIG_NUCLEO_F722ZE_SPI2_TEST_BITS);
- SPI_SETMODE(spi2, CONFIG_NUCLEO_F722ZE_SPI2_TEST_MODE);
- SPI_EXCHANGE(spi2, tx, NULL,
- nitems(CONFIG_NUCLEO_F722ZE_SPI_TEST_MESSAGE));
-#endif
-
-#if defined(CONFIG_NUCLEO_F722ZE_SPI3_TEST)
- spi3 = stm32_spibus_initialize(3);
-
- if (!spi3)
- {
- syslog(LOG_ERR, "ERROR Failed to initialize SPI port 2\n");
- return -ENODEV;
- }
-
- /* Default SPI3 to NUCLEO_SPI3_FREQ and mode */
-
- SPI_SETFREQUENCY(spi3, CONFIG_NUCLEO_F722ZE_SPI3_TEST_FREQ);
- SPI_SETBITS(spi3, CONFIG_NUCLEO_F722ZE_SPI3_TEST_BITS);
- SPI_SETMODE(spi3, CONFIG_NUCLEO_F722ZE_SPI3_TEST_MODE);
- SPI_EXCHANGE(spi3, tx, NULL,
- nitems(CONFIG_NUCLEO_F722ZE_SPI_TEST_MESSAGE));
-#endif
-
- return OK;
-}
-#endif /* NUCLEO_SPI_TEST */
#endif /* defined(CONFIG_SPI) */
diff --git a/boards/arm/stm32f7/nucleo-f746zg/Kconfig b/boards/arm/stm32f7/nucleo-f746zg/Kconfig
index 6697898410..4f7bdfdbe7 100644
--- a/boards/arm/stm32f7/nucleo-f746zg/Kconfig
+++ b/boards/arm/stm32f7/nucleo-f746zg/Kconfig
@@ -80,160 +80,6 @@ config NUCLEO_F746ZG_CONSOLE_NONE
endchoice # "Select Console wiring"
-config NUCLEO_F746ZG_SPI_TEST
- bool "Enable SPI test"
- default n
- ---help---
- Enable Spi test - initialize and configure SPI to send
- NUCLEO_F746ZG_SPI_TEST_MESSAGE text. The text is sent on the
- selected SPI Buses with the configured parameters.
- Note the CS lines will not be asserted.
-
-if NUCLEO_F746ZG_SPI_TEST
-
-config NUCLEO_F746ZG_SPI_TEST_MESSAGE
- string "Text to Send on SPI Bus(es)"
- default "Hello World"
- depends on NUCLEO_F746ZG_SPI_TEST
- ---help---
- Text to sent on SPI bus(es)
-
-config NUCLEO_F746ZG_SPI1_TEST
- bool "Test SPI bus 1"
- default n
- depends on NUCLEO_F746ZG_SPI_TEST
- ---help---
- Enable Spi test - on SPI BUS 1
-
-if NUCLEO_F746ZG_SPI1_TEST
-
-config NUCLEO_F746ZG_SPI1_TEST_FREQ
- int "SPI 1 Clock Freq in Hz"
- default 1000000
- depends on NUCLEO_F746ZG_SPI1_TEST
- ---help---
- Sets SPI 1 Clock Freq
-
-config NUCLEO_F746ZG_SPI1_TEST_BITS
- int "SPI 1 number of bits"
- default 8
- depends on NUCLEO_F746ZG_SPI1_TEST
- ---help---
- Sets SPI 1 bit length
-
-choice
- prompt "SPI BUS 1 Clock Mode"
- default NUCLEO_F746ZG_SPI1_TEST_MODE3
- ---help---
- Sets SPI 1 clock mode
-
-config NUCLEO_F746ZG_SPI1_TEST_MODE0
- bool "CPOL=0 CPHA=0"
-
-config NUCLEO_F746ZG_SPI1_TEST_MODE1
- bool "CPOL=0 CPHA=1"
-
-config NUCLEO_F746ZG_SPI1_TEST_MODE2
- bool "CPOL=1 CPHA=0"
-
-config NUCLEO_F746ZG_SPI1_TEST_MODE3
- bool "CPOL=1 CPHA=1"
-
-endchoice # "SPI BUS 1 Clock Mode"
-
-endif # NUCLEO_F746ZG_SPI1_TEST
-
-config NUCLEO_F746ZG_SPI2_TEST
- bool "Test SPI bus 2"
- default n
- depends on NUCLEO_F746ZG_SPI_TEST
- ---help---
- Enable Spi test - on SPI BUS 2
-
-if NUCLEO_F746ZG_SPI2_TEST
-
-config NUCLEO_F746ZG_SPI2_TEST_FREQ
- int "SPI 2 Clock Freq in Hz"
- default 12000000
- depends on NUCLEO_F746ZG_SPI2_TEST
- ---help---
- Sets SPI 2 Clock Freq
-
-config NUCLEO_F746ZG_SPI2_TEST_BITS
- int "SPI 2 number of bits"
- default 8
- depends on NUCLEO_F746ZG_SPI2_TEST
- ---help---
- Sets SPI 2 bit length
-
-choice
- prompt "SPI BUS 2 Clock Mode"
- default NUCLEO_F746ZG_SPI2_TEST_MODE3
- ---help---
- Sets SPI 2 clock mode
-
-config NUCLEO_F746ZG_SPI2_TEST_MODE0
- bool "CPOL=0 CPHA=0"
-
-config NUCLEO_F746ZG_SPI2_TEST_MODE1
- bool "CPOL=0 CPHA=1"
-
-config NUCLEO_F746ZG_SPI2_TEST_MODE2
- bool "CPOL=1 CPHA=0"
-
-config NUCLEO_F746ZG_SPI2_TEST_MODE3
- bool "CPOL=1 CPHA=1"
-
-endchoice # "SPI BUS 2 Clock Mode"
-
-endif # NUCLEO_F746ZG_SPI2_TEST
-
-config NUCLEO_F746ZG_SPI3_TEST
- bool "Test SPI bus 3"
- default n
- depends on NUCLEO_F746ZG_SPI_TEST
- ---help---
- Enable Spi test - on SPI BUS 3
-
-if NUCLEO_F746ZG_SPI3_TEST
-
-config NUCLEO_F746ZG_SPI3_TEST_FREQ
- int "SPI 3 Clock Freq in Hz"
- default 40000000
- depends on NUCLEO_F746ZG_SPI3_TEST
- ---help---
- Sets SPI 3 Clock Freq
-
-config NUCLEO_F746ZG_SPI3_TEST_BITS
- int "SPI 3 number of bits"
- default 8
- depends on NUCLEO_F746ZG_SPI3_TEST
- ---help---
- Sets SPI 3 bit length
-
-choice
- prompt "SPI BUS 3 Clock Mode"
- default NUCLEO_F746ZG_SPI3_TEST_MODE3
- ---help---
- Sets SPI 3 clock mode
-
-config NUCLEO_F746ZG_SPI3_TEST_MODE0
- bool "CPOL=0 CPHA=0"
-
-config NUCLEO_F746ZG_SPI3_TEST_MODE1
- bool "CPOL=0 CPHA=1"
-
-config NUCLEO_F746ZG_SPI3_TEST_MODE2
- bool "CPOL=1 CPHA=0"
-
-config NUCLEO_F746ZG_SPI3_TEST_MODE3
- bool "CPOL=1 CPHA=1"
-
-endchoice # "SPI BUS 3 Clock Mode"
-
-endif # NUCLEO_F746ZG_SPI3_TEST
-endif # NUCLEO_F746ZG_SPI_TEST
-
choice
prompt "CAN1 pins selection"
default NUCLEO_F746ZG_CAN1_MAP_PD0PD1
diff --git a/boards/arm/stm32f7/nucleo-f746zg/src/stm32_bringup.c b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_bringup.c
index 5ef4a9699c..de0875f50f 100644
--- a/boards/arm/stm32f7/nucleo-f746zg/src/stm32_bringup.c
+++ b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_bringup.c
@@ -50,8 +50,12 @@
# include "stm32_romfs.h"
#endif
+#ifdef CONFIG_STM32F7_SPI_TEST
+# include "stm32_spitest.h"
+#endif
+
#ifdef CONFIG_SYSTEMTICK_HOOK
-#include <semaphore.h>
+# include <semaphore.h>
#endif
/****************************************************************************
@@ -149,7 +153,7 @@ int stm32_bringup(void)
}
#endif
-#if defined(CONFIG_NUCLEO_F746ZG_SPI_TEST)
+#ifdef CONFIG_STM32F7_SPI_TEST
/* Create SPI interfaces */
ret = stm32_spidev_bus_test();
diff --git a/boards/arm/stm32f7/nucleo-f746zg/src/stm32_spi.c b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_spi.c
index 15cf08642c..743aeba7a5 100644
--- a/boards/arm/stm32f7/nucleo-f746zg/src/stm32_spi.c
+++ b/boards/arm/stm32f7/nucleo-f746zg/src/stm32_spi.c
@@ -47,48 +47,6 @@
* Pre-processor Definitions
****************************************************************************/
-#if defined(CONFIG_NUCLEO_F746ZG_SPI1_TEST)
-# if defined(CONFIG_NUCLEO_F746ZG_SPI1_TEST_MODE0)
-# define CONFIG_NUCLEO_F746ZG_SPI1_TEST_MODE SPIDEV_MODE0
-# elif defined(CONFIG_NUCLEO_F746ZG_SPI1_TEST_MODE1)
-# define CONFIG_NUCLEO_F746ZG_SPI1_TEST_MODE SPIDEV_MODE1
-# elif defined(CONFIG_NUCLEO_F746ZG_SPI1_TEST_MODE2)
-# define CONFIG_NUCLEO_F746ZG_SPI1_TEST_MODE SPIDEV_MODE2
-# elif defined(CONFIG_NUCLEO_F746ZG_SPI1_TEST_MODE3)
-# define CONFIG_NUCLEO_F746ZG_SPI1_TEST_MODE SPIDEV_MODE3
-# else
-# error "No CONFIG_NUCLEO_F746ZG_SPI1_TEST_MODEx defined"
-# endif
-#endif
-
-#if defined(CONFIG_NUCLEO_F746ZG_SPI2_TEST)
-# if defined(CONFIG_NUCLEO_F746ZG_SPI2_TEST_MODE0)
-# define CONFIG_NUCLEO_F746ZG_SPI2_TEST_MODE SPIDEV_MODE0
-# elif defined(CONFIG_NUCLEO_F746ZG_SPI2_TEST_MODE1)
-# define CONFIG_NUCLEO_F746ZG_SPI2_TEST_MODE SPIDEV_MODE1
-# elif defined(CONFIG_NUCLEO_F746ZG_SPI2_TEST_MODE2)
-# define CONFIG_NUCLEO_F746ZG_SPI2_TEST_MODE SPIDEV_MODE2
-# elif defined(CONFIG_NUCLEO_F746ZG_SPI2_TEST_MODE3)
-# define CONFIG_NUCLEO_F746ZG_SPI2_TEST_MODE SPIDEV_MODE3
-# else
-# error "No CONFIG_NUCLEO_F746ZG_SPI2_TEST_MODEx defined"
-# endif
-#endif
-
-#if defined(CONFIG_NUCLEO_F746ZG_SPI3_TEST)
-# if defined(CONFIG_NUCLEO_F746ZG_SPI3_TEST_MODE0)
-# define CONFIG_NUCLEO_F746ZG_SPI3_TEST_MODE SPIDEV_MODE0
-# elif defined(CONFIG_NUCLEO_F746ZG_SPI3_TEST_MODE1)
-# define CONFIG_NUCLEO_F746ZG_SPI3_TEST_MODE SPIDEV_MODE1
-# elif defined(CONFIG_NUCLEO_F746ZG_SPI3_TEST_MODE2)
-# define CONFIG_NUCLEO_F746ZG_SPI3_TEST_MODE SPIDEV_MODE2
-# elif defined(CONFIG_NUCLEO_F746ZG_SPI3_TEST_MODE3)
-# define CONFIG_NUCLEO_F746ZG_SPI3_TEST_MODE SPIDEV_MODE3
-# else
-# error "No CONFIG_NUCLEO_F746ZG_SPI3_TEST_MODEx defined"
-# endif
-#endif
-
/****************************************************************************
* Private Data
****************************************************************************/
@@ -171,18 +129,6 @@ static const uint32_t g_spi3gpio[] =
};
#endif
-#if defined(CONFIG_NUCLEO_F746ZG_SPI_TEST)
-# if defined(CONFIG_STM32F7_SPI1)
-struct spi_dev_s *spi1;
-# endif
-# if defined(CONFIG_STM32F7_SPI2)
-struct spi_dev_s *spi2;
-# endif
-# if defined(CONFIG_STM32F7_SPI3)
-struct spi_dev_s *spi3;
-# endif
-#endif
-
/****************************************************************************
* Public Functions
****************************************************************************/
@@ -430,69 +376,4 @@ int stm32_spi6cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd)
#endif
#endif /* CONFIG_SPI_CMDDATA */
-
-#if defined(CONFIG_NUCLEO_F746ZG_SPI_TEST)
-int stm32_spidev_bus_test(void)
-{
- /* Configure and test SPI- */
-
- uint8_t *tx = (uint8_t *)CONFIG_NUCLEO_F746ZG_SPI_TEST_MESSAGE;
-
-#if defined(CONFIG_NUCLEO_F746ZG_SPI1_TEST)
- spi1 = stm32_spibus_initialize(1);
-
- if (!spi1)
- {
- syslog(LOG_ERR, "ERROR Failed to initialize SPI port 1\n");
- return -ENODEV;
- }
-
- /* Default SPI1 to NUCLEO_F746ZG_SPI1_FREQ and mode */
-
- SPI_SETFREQUENCY(spi1, CONFIG_NUCLEO_F746ZG_SPI1_TEST_FREQ);
- SPI_SETBITS(spi1, CONFIG_NUCLEO_F746ZG_SPI1_TEST_BITS);
- SPI_SETMODE(spi1, CONFIG_NUCLEO_F746ZG_SPI1_TEST_MODE);
- SPI_EXCHANGE(spi1, tx, NULL,
- nitems(CONFIG_NUCLEO_F746ZG_SPI_TEST_MESSAGE));
-#endif
-
-#if defined(CONFIG_NUCLEO_F746ZG_SPI2_TEST)
- spi2 = stm32_spibus_initialize(2);
-
- if (!spi2)
- {
- syslog(LOG_ERR, "ERROR Failed to initialize SPI port 2\n");
- return -ENODEV;
- }
-
- /* Default SPI2 to NUCLEO_F746ZG_SPI2_FREQ and mode */
-
- SPI_SETFREQUENCY(spi2, CONFIG_NUCLEO_F746ZG_SPI2_TEST_FREQ);
- SPI_SETBITS(spi2, CONFIG_NUCLEO_F746ZG_SPI2_TEST_BITS);
- SPI_SETMODE(spi2, CONFIG_NUCLEO_F746ZG_SPI2_TEST_MODE);
- SPI_EXCHANGE(spi2, tx, NULL,
- nitems(CONFIG_NUCLEO_F746ZG_SPI_TEST_MESSAGE));
-#endif
-
-#if defined(CONFIG_NUCLEO_F746ZG_SPI3_TEST)
- spi3 = stm32_spibus_initialize(3);
-
- if (!spi3)
- {
- syslog(LOG_ERR, "ERROR Failed to initialize SPI port 2\n");
- return -ENODEV;
- }
-
- /* Default SPI3 to NUCLEO_F746ZG_SPI3_FREQ and mode */
-
- SPI_SETFREQUENCY(spi3, CONFIG_NUCLEO_F746ZG_SPI3_TEST_FREQ);
- SPI_SETBITS(spi3, CONFIG_NUCLEO_F746ZG_SPI3_TEST_BITS);
- SPI_SETMODE(spi3, CONFIG_NUCLEO_F746ZG_SPI3_TEST_MODE);
- SPI_EXCHANGE(spi3, tx, NULL,
- nitems(CONFIG_NUCLEO_F746ZG_SPI_TEST_MESSAGE));
-#endif
-
- return OK;
-}
-#endif /* NUCLEO_F746ZG_SPI_TEST */
#endif /* defined(CONFIG_SPI) */
diff --git a/boards/arm/stm32f7/nucleo-f767zi/Kconfig b/boards/arm/stm32f7/nucleo-f767zi/Kconfig
index d9cfd182bd..95614b8189 100644
--- a/boards/arm/stm32f7/nucleo-f767zi/Kconfig
+++ b/boards/arm/stm32f7/nucleo-f767zi/Kconfig
@@ -80,160 +80,6 @@ config NUCLEO_F767ZI_CONSOLE_NONE
endchoice # "Select Console wiring"
-config NUCLEO_F767ZI_SPI_TEST
- bool "Enable SPI test"
- default n
- ---help---
- Enable Spi test - initialize and configure SPI to send
- NUCLEO_F767ZI_SPI_TEST_MESSAGE text. The text is sent on the
- selected SPI Buses with the configured parameters.
- Note the CS lines will not be asserted.
-
-if NUCLEO_F767ZI_SPI_TEST
-
-config NUCLEO_F767ZI_SPI_TEST_MESSAGE
- string "Text to Send on SPI Bus(es)"
- default "Hello World"
- depends on NUCLEO_F767ZI_SPI_TEST
- ---help---
- Text to sent on SPI bus(es)
-
-config NUCLEO_F767ZI_SPI1_TEST
- bool "Test SPI bus 1"
- default n
- depends on NUCLEO_F767ZI_SPI_TEST
- ---help---
- Enable Spi test - on SPI BUS 1
-
-if NUCLEO_F767ZI_SPI1_TEST
-
-config NUCLEO_F767ZI_SPI1_TEST_FREQ
- int "SPI 1 Clock Freq in Hz"
- default 1000000
- depends on NUCLEO_F767ZI_SPI1_TEST
- ---help---
- Sets SPI 1 Clock Freq
-
-config NUCLEO_F767ZI_SPI1_TEST_BITS
- int "SPI 1 number of bits"
- default 8
- depends on NUCLEO_F767ZI_SPI1_TEST
- ---help---
- Sets SPI 1 bit length
-
-choice
- prompt "SPI BUS 1 Clock Mode"
- default NUCLEO_F767ZI_SPI1_TEST_MODE3
- ---help---
- Sets SPI 1 clock mode
-
-config NUCLEO_F767ZI_SPI1_TEST_MODE0
- bool "CPOL=0 CPHA=0"
-
-config NUCLEO_F767ZI_SPI1_TEST_MODE1
- bool "CPOL=0 CPHA=1"
-
-config NUCLEO_F767ZI_SPI1_TEST_MODE2
- bool "CPOL=1 CPHA=0"
-
-config NUCLEO_F767ZI_SPI1_TEST_MODE3
- bool "CPOL=1 CPHA=1"
-
-endchoice # "SPI BUS 1 Clock Mode"
-
-endif # NUCLEO_F767ZI_SPI1_TEST
-
-config NUCLEO_F767ZI_SPI2_TEST
- bool "Test SPI bus 2"
- default n
- depends on NUCLEO_F767ZI_SPI_TEST
- ---help---
- Enable Spi test - on SPI BUS 2
-
-if NUCLEO_F767ZI_SPI2_TEST
-
-config NUCLEO_F767ZI_SPI2_TEST_FREQ
- int "SPI 2 Clock Freq in Hz"
- default 12000000
- depends on NUCLEO_F767ZI_SPI2_TEST
- ---help---
- Sets SPI 2 Clock Freq
-
-config NUCLEO_F767ZI_SPI2_TEST_BITS
- int "SPI 2 number of bits"
- default 8
- depends on NUCLEO_F767ZI_SPI2_TEST
- ---help---
- Sets SPI 2 bit length
-
-choice
- prompt "SPI BUS 2 Clock Mode"
- default NUCLEO_F767ZI_SPI2_TEST_MODE3
- ---help---
- Sets SPI 2 clock mode
-
-config NUCLEO_F767ZI_SPI2_TEST_MODE0
- bool "CPOL=0 CPHA=0"
-
-config NUCLEO_F767ZI_SPI2_TEST_MODE1
- bool "CPOL=0 CPHA=1"
-
-config NUCLEO_F767ZI_SPI2_TEST_MODE2
- bool "CPOL=1 CPHA=0"
-
-config NUCLEO_F767ZI_SPI2_TEST_MODE3
- bool "CPOL=1 CPHA=1"
-
-endchoice # "SPI BUS 2 Clock Mode"
-
-endif # NUCLEO_F767ZI_SPI2_TEST
-
-config NUCLEO_F767ZI_SPI3_TEST
- bool "Test SPI bus 3"
- default n
- depends on NUCLEO_F767ZI_SPI_TEST
- ---help---
- Enable Spi test - on SPI BUS 3
-
-if NUCLEO_F767ZI_SPI3_TEST
-
-config NUCLEO_F767ZI_SPI3_TEST_FREQ
- int "SPI 3 Clock Freq in Hz"
- default 40000000
- depends on NUCLEO_F767ZI_SPI3_TEST
- ---help---
- Sets SPI 3 Clock Freq
-
-config NUCLEO_F767ZI_SPI3_TEST_BITS
- int "SPI 3 number of bits"
- default 8
- depends on NUCLEO_F767ZI_SPI3_TEST
- ---help---
- Sets SPI 3 bit length
-
-choice
- prompt "SPI BUS 3 Clock Mode"
- default NUCLEO_F767ZI_SPI3_TEST_MODE3
- ---help---
- Sets SPI 3 clock mode
-
-config NUCLEO_F767ZI_SPI3_TEST_MODE0
- bool "CPOL=0 CPHA=0"
-
-config NUCLEO_F767ZI_SPI3_TEST_MODE1
- bool "CPOL=0 CPHA=1"
-
-config NUCLEO_F767ZI_SPI3_TEST_MODE2
- bool "CPOL=1 CPHA=0"
-
-config NUCLEO_F767ZI_SPI3_TEST_MODE3
- bool "CPOL=1 CPHA=1"
-
-endchoice # "SPI BUS 3 Clock Mode"
-
-endif # NUCLEO_F767ZI_SPI3_TEST
-endif # NUCLEO_F767ZI_SPI_TEST
-
choice
prompt "CAN1 pins selection"
default NUCLEO_F767ZI_CAN1_MAP_PD0PD1
diff --git a/boards/arm/stm32f7/nucleo-f767zi/src/stm32_bringup.c b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_bringup.c
index 2f32d07346..06c41c98ba 100644
--- a/boards/arm/stm32f7/nucleo-f767zi/src/stm32_bringup.c
+++ b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_bringup.c
@@ -50,8 +50,12 @@
# include "stm32_romfs.h"
#endif
+#ifdef CONFIG_STM32F7_SPI_TEST
+# include "stm32_spitest.h"
+#endif
+
#ifdef CONFIG_SYSTEMTICK_HOOK
-#include <semaphore.h>
+# include <semaphore.h>
#endif
/****************************************************************************
@@ -149,7 +153,7 @@ int stm32_bringup(void)
}
#endif
-#if defined(CONFIG_NUCLEO_F722ZE_SPI_TEST)
+#ifdef CONFIG_STM32F7_SPI_TEST
/* Create SPI interfaces */
ret = stm32_spidev_bus_test();
diff --git a/boards/arm/stm32f7/nucleo-f767zi/src/stm32_spi.c b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_spi.c
index 4e346e1d82..1a4530c114 100644
--- a/boards/arm/stm32f7/nucleo-f767zi/src/stm32_spi.c
+++ b/boards/arm/stm32f7/nucleo-f767zi/src/stm32_spi.c
@@ -47,48 +47,6 @@
* Pre-processor Definitions
****************************************************************************/
-#if defined(CONFIG_NUCLEO_F767ZI_SPI1_TEST)
-# if defined(CONFIG_NUCLEO_F767ZI_SPI1_TEST_MODE0)
-# define CONFIG_NUCLEO_F767ZI_SPI1_TEST_MODE SPIDEV_MODE0
-# elif defined(CONFIG_NUCLEO_F767ZI_SPI1_TEST_MODE1)
-# define CONFIG_NUCLEO_F767ZI_SPI1_TEST_MODE SPIDEV_MODE1
-# elif defined(CONFIG_NUCLEO_F767ZI_SPI1_TEST_MODE2)
-# define CONFIG_NUCLEO_F767ZI_SPI1_TEST_MODE SPIDEV_MODE2
-# elif defined(CONFIG_NUCLEO_F767ZI_SPI1_TEST_MODE3)
-# define CONFIG_NUCLEO_F767ZI_SPI1_TEST_MODE SPIDEV_MODE3
-# else
-# error "No CONFIG_NUCLEO_F767ZI_SPI1_TEST_MODEx defined"
-# endif
-#endif
-
-#if defined(CONFIG_NUCLEO_F767ZI_SPI2_TEST)
-# if defined(CONFIG_NUCLEO_F767ZI_SPI2_TEST_MODE0)
-# define CONFIG_NUCLEO_F767ZI_SPI2_TEST_MODE SPIDEV_MODE0
-# elif defined(CONFIG_NUCLEO_F767ZI_SPI2_TEST_MODE1)
-# define CONFIG_NUCLEO_F767ZI_SPI2_TEST_MODE SPIDEV_MODE1
-# elif defined(CONFIG_NUCLEO_F767ZI_SPI2_TEST_MODE2)
-# define CONFIG_NUCLEO_F767ZI_SPI2_TEST_MODE SPIDEV_MODE2
-# elif defined(CONFIG_NUCLEO_F767ZI_SPI2_TEST_MODE3)
-# define CONFIG_NUCLEO_F767ZI_SPI2_TEST_MODE SPIDEV_MODE3
-# else
-# error "No CONFIG_NUCLEO_F767ZI_SPI2_TEST_MODEx defined"
-# endif
-#endif
-
-#if defined(CONFIG_NUCLEO_F767ZI_SPI3_TEST)
-# if defined(CONFIG_NUCLEO_F767ZI_SPI3_TEST_MODE0)
-# define CONFIG_NUCLEO_F767ZI_SPI3_TEST_MODE SPIDEV_MODE0
-# elif defined(CONFIG_NUCLEO_F767ZI_SPI3_TEST_MODE1)
-# define CONFIG_NUCLEO_F767ZI_SPI3_TEST_MODE SPIDEV_MODE1
-# elif defined(CONFIG_NUCLEO_F767ZI_SPI3_TEST_MODE2)
-# define CONFIG_NUCLEO_F767ZI_SPI3_TEST_MODE SPIDEV_MODE2
-# elif defined(CONFIG_NUCLEO_F767ZI_SPI3_TEST_MODE3)
-# define CONFIG_NUCLEO_F767ZI_SPI3_TEST_MODE SPIDEV_MODE3
-# else
-# error "No CONFIG_NUCLEO_F767ZI_SPI3_TEST_MODEx defined"
-# endif
-#endif
-
/****************************************************************************
* Private Data
****************************************************************************/
@@ -171,18 +129,6 @@ static const uint32_t g_spi3gpio[] =
};
#endif
-#if defined(CONFIG_NUCLEO_F767ZI_SPI_TEST)
-# if defined(CONFIG_STM32F7_SPI1)
-struct spi_dev_s *spi1;
-# endif
-# if defined(CONFIG_STM32F7_SPI2)
-struct spi_dev_s *spi2;
-# endif
-# if defined(CONFIG_STM32F7_SPI3)
-struct spi_dev_s *spi3;
-# endif
-#endif
-
/****************************************************************************
* Public Functions
****************************************************************************/
@@ -430,69 +376,4 @@ int stm32_spi6cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd)
#endif
#endif /* CONFIG_SPI_CMDDATA */
-
-#if defined(CONFIG_NUCLEO_F767ZI_SPI_TEST)
-int stm32_spidev_bus_test(void)
-{
- /* Configure and test SPI- */
-
- uint8_t *tx = (uint8_t *)CONFIG_NUCLEO_F767ZI_SPI_TEST_MESSAGE;
-
-#if defined(CONFIG_NUCLEO_F767ZI_SPI1_TEST)
- spi1 = stm32_spibus_initialize(1);
-
- if (!spi1)
- {
- syslog(LOG_ERR, "ERROR Failed to initialize SPI port 1\n");
- return -ENODEV;
- }
-
- /* Default SPI1 to NUCLEO_F767ZI_SPI1_FREQ and mode */
-
- SPI_SETFREQUENCY(spi1, CONFIG_NUCLEO_F767ZI_SPI1_TEST_FREQ);
- SPI_SETBITS(spi1, CONFIG_NUCLEO_F767ZI_SPI1_TEST_BITS);
- SPI_SETMODE(spi1, CONFIG_NUCLEO_F767ZI_SPI1_TEST_MODE);
- SPI_EXCHANGE(spi1, tx, NULL,
- nitems(CONFIG_NUCLEO_F767ZI_SPI_TEST_MESSAGE));
-#endif
-
-#if defined(CONFIG_NUCLEO_F767ZI_SPI2_TEST)
- spi2 = stm32_spibus_initialize(2);
-
- if (!spi2)
- {
- syslog(LOG_ERR, "ERROR Failed to initialize SPI port 2\n");
- return -ENODEV;
- }
-
- /* Default SPI2 to NUCLEO_F767ZI_SPI2_FREQ and mode */
-
- SPI_SETFREQUENCY(spi2, CONFIG_NUCLEO_F767ZI_SPI2_TEST_FREQ);
- SPI_SETBITS(spi2, CONFIG_NUCLEO_F767ZI_SPI2_TEST_BITS);
- SPI_SETMODE(spi2, CONFIG_NUCLEO_F767ZI_SPI2_TEST_MODE);
- SPI_EXCHANGE(spi2, tx, NULL,
- nitems(CONFIG_NUCLEO_F767ZI_SPI_TEST_MESSAGE));
-#endif
-
-#if defined(CONFIG_NUCLEO_F767ZI_SPI3_TEST)
- spi3 = stm32_spibus_initialize(3);
-
- if (!spi3)
- {
- syslog(LOG_ERR, "ERROR Failed to initialize SPI port 2\n");
- return -ENODEV;
- }
-
- /* Default SPI3 to NUCLEO_F767ZI_SPI3_FREQ and mode */
-
- SPI_SETFREQUENCY(spi3, CONFIG_NUCLEO_F767ZI_SPI3_TEST_FREQ);
- SPI_SETBITS(spi3, CONFIG_NUCLEO_F767ZI_SPI3_TEST_BITS);
- SPI_SETMODE(spi3, CONFIG_NUCLEO_F767ZI_SPI3_TEST_MODE);
- SPI_EXCHANGE(spi3, tx, NULL,
- nitems(CONFIG_NUCLEO_F767ZI_SPI_TEST_MESSAGE));
-#endif
-
- return OK;
-}
-#endif /* NUCLEO_F767ZI_SPI_TEST */
#endif /* defined(CONFIG_SPI) */