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/22 00:53:13 UTC

(nuttx) branch master updated (ef56aabe19 -> 17daa06222)

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 ef56aabe19 boards: riscv: esp32c6: Add partitioning support for OTA
     new 91b71867c5 boards/arm/stm32f7: fix nucleo boards break for cmake
     new 17daa06222 boards/arm/stm32f7/nucleo-xxxx: refresh config

The 2 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:
 boards/arm/stm32f7/common/src/CMakeLists.txt               | 4 ++--
 boards/arm/stm32f7/nucleo-f722ze/Kconfig                   | 2 +-
 boards/arm/stm32f7/nucleo-f722ze/configs/can/defconfig     | 2 +-
 boards/arm/stm32f7/nucleo-f722ze/configs/cansock/defconfig | 2 +-
 boards/arm/stm32f7/nucleo-f722ze/src/CMakeLists.txt        | 9 ---------
 boards/arm/stm32f7/nucleo-f746zg/Kconfig                   | 2 +-
 boards/arm/stm32f7/nucleo-f746zg/configs/pysim/defconfig   | 2 +-
 boards/arm/stm32f7/nucleo-f767zi/Kconfig                   | 2 +-
 8 files changed, 8 insertions(+), 17 deletions(-)


(nuttx) 02/02: boards/arm/stm32f7/nucleo-xxxx: refresh config

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 17daa0622229fda8fa6cd59b5dba7586546ef42f
Author: raiden00pl <ra...@railab.me>
AuthorDate: Mon Oct 21 21:08:34 2024 +0200

    boards/arm/stm32f7/nucleo-xxxx: refresh config
---
 boards/arm/stm32f7/nucleo-f722ze/Kconfig                   | 2 +-
 boards/arm/stm32f7/nucleo-f722ze/configs/can/defconfig     | 2 +-
 boards/arm/stm32f7/nucleo-f722ze/configs/cansock/defconfig | 2 +-
 boards/arm/stm32f7/nucleo-f746zg/Kconfig                   | 2 +-
 boards/arm/stm32f7/nucleo-f746zg/configs/pysim/defconfig   | 2 +-
 boards/arm/stm32f7/nucleo-f767zi/Kconfig                   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/boards/arm/stm32f7/nucleo-f722ze/Kconfig b/boards/arm/stm32f7/nucleo-f722ze/Kconfig
index cc1912c99a..60ec42530c 100644
--- a/boards/arm/stm32f7/nucleo-f722ze/Kconfig
+++ b/boards/arm/stm32f7/nucleo-f722ze/Kconfig
@@ -85,7 +85,7 @@ choice
 	default NUCLEO_F722ZE_CAN1_MAP_PD0PD1
 	depends on STM32F7_CAN1
 
-config NUCLEO_F722ZE_F722ZE_CAN1_MAP_D14D15
+config NUCLEO_F722ZE_CAN1_MAP_D14D15
 	bool "CAN1_TX=D14 CAN1_RX=D15"
 
 config NUCLEO_F722ZE_CAN1_MAP_PD0PD1
diff --git a/boards/arm/stm32f7/nucleo-f722ze/configs/can/defconfig b/boards/arm/stm32f7/nucleo-f722ze/configs/can/defconfig
index b960a5907c..13f00d142d 100644
--- a/boards/arm/stm32f7/nucleo-f722ze/configs/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_COMMON=y
 CONFIG_ARCH_BOARD="nucleo-f722ze"
+CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD_NUCLEO_F722ZE=y
 CONFIG_ARCH_BUTTONS=y
 CONFIG_ARCH_CHIP="stm32f7"
diff --git a/boards/arm/stm32f7/nucleo-f722ze/configs/cansock/defconfig b/boards/arm/stm32f7/nucleo-f722ze/configs/cansock/defconfig
index 532251939f..735779fd91 100644
--- a/boards/arm/stm32f7/nucleo-f722ze/configs/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_COMMON=y
 CONFIG_ARCH_BOARD="nucleo-f722ze"
+CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD_NUCLEO_F722ZE=y
 CONFIG_ARCH_BUTTONS=y
 CONFIG_ARCH_CHIP="stm32f7"
diff --git a/boards/arm/stm32f7/nucleo-f746zg/Kconfig b/boards/arm/stm32f7/nucleo-f746zg/Kconfig
index 4f7bdfdbe7..c1d96afcf0 100644
--- a/boards/arm/stm32f7/nucleo-f746zg/Kconfig
+++ b/boards/arm/stm32f7/nucleo-f746zg/Kconfig
@@ -85,7 +85,7 @@ choice
 	default NUCLEO_F746ZG_CAN1_MAP_PD0PD1
 	depends on STM32F7_CAN1
 
-config NUCLEO_F746ZG_F746ZG_CAN1_MAP_D14D15
+config NUCLEO_F746ZG_CAN1_MAP_D14D15
 	bool "CAN1_TX=D14 CAN1_RX=D15"
 
 config NUCLEO_F746ZG_CAN1_MAP_PD0PD1
diff --git a/boards/arm/stm32f7/nucleo-f746zg/configs/pysim/defconfig b/boards/arm/stm32f7/nucleo-f746zg/configs/pysim/defconfig
index 88d1b89769..d19581f71e 100644
--- a/boards/arm/stm32f7/nucleo-f746zg/configs/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_COMMON=y
 CONFIG_ARCH_BOARD="nucleo-f746zg"
+CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD_NUCLEO_F746ZG=y
 CONFIG_ARCH_BUTTONS=y
 CONFIG_ARCH_CHIP="stm32f7"
diff --git a/boards/arm/stm32f7/nucleo-f767zi/Kconfig b/boards/arm/stm32f7/nucleo-f767zi/Kconfig
index 95614b8189..e8eb80d5fa 100644
--- a/boards/arm/stm32f7/nucleo-f767zi/Kconfig
+++ b/boards/arm/stm32f7/nucleo-f767zi/Kconfig
@@ -85,7 +85,7 @@ choice
 	default NUCLEO_F767ZI_CAN1_MAP_PD0PD1
 	depends on STM32F7_CAN1
 
-config NUCLEO_F767ZI_F767ZI_CAN1_MAP_D14D15
+config NUCLEO_F767ZI_CAN1_MAP_D14D15
 	bool "CAN1_TX=D14 CAN1_RX=D15"
 
 config NUCLEO_F767ZI_CAN1_MAP_PD0PD1


(nuttx) 01/02: boards/arm/stm32f7: fix nucleo boards break for cmake

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 91b71867c5dbe3e86abfd9f9a698ee20c23a61b6
Author: raiden00pl <ra...@railab.me>
AuthorDate: Mon Oct 21 19:24:09 2024 +0200

    boards/arm/stm32f7: fix nucleo boards break for cmake
    
    fix nucleo-f722ze and nucleo-f746zg/pysim break for cmake
---
 boards/arm/stm32f7/common/src/CMakeLists.txt        | 4 ++--
 boards/arm/stm32f7/nucleo-f722ze/src/CMakeLists.txt | 9 ---------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/boards/arm/stm32f7/common/src/CMakeLists.txt b/boards/arm/stm32f7/common/src/CMakeLists.txt
index be18e09d37..00fcd922a7 100644
--- a/boards/arm/stm32f7/common/src/CMakeLists.txt
+++ b/boards/arm/stm32f7/common/src/CMakeLists.txt
@@ -34,10 +34,10 @@ endif()
 
 if(CONFIG_STM32F7_CAN)
   if(CONFIG_STM32F7_CAN_CHARDRIVER)
-    list(APPEND SRCS stm32_can.c)
+    list(APPEND SRCS stm32_can_setup.c)
   endif()
   if(CONFIG_STM32F7_CAN_SOCKET)
-    list(APPEND SRCS stm32_cansock.c)
+    list(APPEND SRCS stm32_cansock_setup.c)
   endif()
 endif()
 
diff --git a/boards/arm/stm32f7/nucleo-f722ze/src/CMakeLists.txt b/boards/arm/stm32f7/nucleo-f722ze/src/CMakeLists.txt
index 7c56a5c4ab..11f59840f0 100644
--- a/boards/arm/stm32f7/nucleo-f722ze/src/CMakeLists.txt
+++ b/boards/arm/stm32f7/nucleo-f722ze/src/CMakeLists.txt
@@ -66,15 +66,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()