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 2023/07/21 16:59:50 UTC
[nuttx] branch master updated (ed6503b9a3 -> 26dda05cdf)
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 ed6503b9a3 ci/check: install format tool before run style check script
new f97199340e cmake: port missing nrf52 boards
new 26dda05cdf tools/ci: migrate some ci build configurations to CMake
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:
.../src/CMakeLists.txt | 10 +--
.../src/CMakeLists.txt | 10 +--
.../src/CMakeLists.txt | 12 ++--
.../{nrf52832-dk => thingy52}/src/CMakeLists.txt | 12 ++--
boards/arm/nrf53/thingy53/src/CMakeLists.txt | 6 --
tools/ci/testlist/arm-05.dat | 74 ++++++++++++++++++++++
tools/ci/testlist/arm-07.dat | 32 ++++++++++
tools/ci/testlist/arm-08.dat | 52 +++++++++++++++
tools/ci/testlist/arm-12.dat | 54 ++++++++++++++++
9 files changed, 229 insertions(+), 33 deletions(-)
copy boards/arm/nrf52/{nrf52-feather => nrf52832-mdk}/src/CMakeLists.txt (86%)
copy boards/arm/nrf52/{nrf52-feather => nrf52832-sparkfun}/src/CMakeLists.txt (86%)
copy boards/arm/nrf52/{nrf52-feather => nrf52840-dongle}/src/CMakeLists.txt (85%)
copy boards/arm/nrf52/{nrf52832-dk => thingy52}/src/CMakeLists.txt (90%)
[nuttx] 01/02: cmake: port missing nrf52 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 f97199340e4cf3a97de95c7e9b01c59aa2db93f4
Author: raiden00pl <ra...@railab.me>
AuthorDate: Thu Jul 20 09:13:40 2023 +0200
cmake: port missing nrf52 boards
---
boards/arm/nrf52/nrf52832-mdk/src/CMakeLists.txt | 37 +++++++++++++++++
.../arm/nrf52/nrf52832-sparkfun/src/CMakeLists.txt | 37 +++++++++++++++++
.../arm/nrf52/nrf52840-dongle/src/CMakeLists.txt | 47 ++++++++++++++++++++++
boards/arm/nrf52/thingy52/src/CMakeLists.txt | 41 +++++++++++++++++++
4 files changed, 162 insertions(+)
diff --git a/boards/arm/nrf52/nrf52832-mdk/src/CMakeLists.txt b/boards/arm/nrf52/nrf52832-mdk/src/CMakeLists.txt
new file mode 100644
index 0000000000..b361612bfe
--- /dev/null
+++ b/boards/arm/nrf52/nrf52832-mdk/src/CMakeLists.txt
@@ -0,0 +1,37 @@
+############################################################################
+# boards/arm/nrf52/nrf52832-mdk/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 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.
+#
+############################################################################
+
+set(SRCS nrf52_boot.c nrf52_bringup.c)
+
+if(CONFIG_BOARDCTL)
+ list(APPEND SRCS nrf52_appinit.c)
+endif()
+
+if(CONFIG_ARCH_LEDS)
+ list(APPEND SRCS nrf52_autoleds.c)
+endif()
+
+target_sources(board PRIVATE ${SRCS})
+
+if(CONFIG_ARCH_BOARD_COMMON)
+ set_property(GLOBAL PROPERTY LD_SCRIPT "${NUTTX_COMMON_DIR}/scripts/flash_config.ld")
+else()
+ set_property(GLOBAL PROPERTY LD_SCRIPT "${NUTTX_BOARD_DIR}/scripts/flash_config.ld")
+endif()
diff --git a/boards/arm/nrf52/nrf52832-sparkfun/src/CMakeLists.txt b/boards/arm/nrf52/nrf52832-sparkfun/src/CMakeLists.txt
new file mode 100644
index 0000000000..d5729e45b6
--- /dev/null
+++ b/boards/arm/nrf52/nrf52832-sparkfun/src/CMakeLists.txt
@@ -0,0 +1,37 @@
+############################################################################
+# boards/arm/nrf52/nrf52832-sparkfun/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 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.
+#
+############################################################################
+
+set(SRCS nrf52_boot.c nrf52_bringup.c)
+
+if(CONFIG_BOARDCTL)
+ list(APPEND SRCS nrf52_appinit.c)
+endif()
+
+if(CONFIG_ARCH_LEDS)
+ list(APPEND SRCS nrf52_autoleds.c)
+endif()
+
+target_sources(board PRIVATE ${SRCS})
+
+if(CONFIG_ARCH_BOARD_COMMON)
+ set_property(GLOBAL PROPERTY LD_SCRIPT "${NUTTX_COMMON_DIR}/scripts/flash_config.ld")
+else()
+ set_property(GLOBAL PROPERTY LD_SCRIPT "${NUTTX_BOARD_DIR}/scripts/flash_config.ld")
+endif()
diff --git a/boards/arm/nrf52/nrf52840-dongle/src/CMakeLists.txt b/boards/arm/nrf52/nrf52840-dongle/src/CMakeLists.txt
new file mode 100644
index 0000000000..c633cf9235
--- /dev/null
+++ b/boards/arm/nrf52/nrf52840-dongle/src/CMakeLists.txt
@@ -0,0 +1,47 @@
+############################################################################
+# boards/arm/nrf52/nrf52840-dongle/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 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.
+#
+############################################################################
+
+set(SRCS nrf52_boot.c nrf52_bringup.c)
+
+if(CONFIG_BOARDCTL)
+ list(APPEND SRCS nrf52_appinit.c)
+endif()
+
+if(CONFIG_ARCH_LEDS)
+ list(APPEND SRCS nrf52_autoleds.c)
+else()
+ list(APPEND SRCS nrf52_userleds.c)
+endif()
+
+if(CONFIG_USBDEV)
+ list(APPEND SRCS nrf52_usb.c)
+endif()
+
+if(CONFIG_USBDEV_COMPOSITE)
+ list(APPEND SRCS nrf52_composite.c)
+endif()
+
+target_sources(board PRIVATE ${SRCS})
+
+if(CONFIG_ARCH_BOARD_COMMON)
+ set_property(GLOBAL PROPERTY LD_SCRIPT "${NUTTX_COMMON_DIR}/scripts/flash_config.ld")
+else()
+ set_property(GLOBAL PROPERTY LD_SCRIPT "${NUTTX_BOARD_DIR}/scripts/flash_config.ld")
+endif()
diff --git a/boards/arm/nrf52/thingy52/src/CMakeLists.txt b/boards/arm/nrf52/thingy52/src/CMakeLists.txt
new file mode 100644
index 0000000000..acc49b5a39
--- /dev/null
+++ b/boards/arm/nrf52/thingy52/src/CMakeLists.txt
@@ -0,0 +1,41 @@
+############################################################################
+# boards/arm/nrf52/thingy52/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 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.
+#
+############################################################################
+
+set(SRCS nrf52_boot.c nrf52_bringup.c)
+
+if(CONFIG_BOARDCTL)
+ list(APPEND SRCS nrf52_appinit.c)
+endif()
+
+if(CONFIG_ARCH_BUTTONS)
+ list(APPEND SRCS nrf52_buttons.c)
+endif()
+
+if(CONFIG_IOEXPANDER_SX1509)
+ list(APPEND SRCS nrf52_sx1509.c)
+endif()
+
+target_sources(board PRIVATE ${SRCS})
+
+if(CONFIG_ARCH_BOARD_COMMON)
+ set_property(GLOBAL PROPERTY LD_SCRIPT "${NUTTX_COMMON_DIR}/scripts/flash_config.ld")
+else()
+ set_property(GLOBAL PROPERTY LD_SCRIPT "${NUTTX_BOARD_DIR}/scripts/flash_config.ld")
+endif()
[nuttx] 02/02: tools/ci: migrate some ci build configurations to 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 26dda05cdf031183e3b90e49119b3a2e11b92019
Author: raiden00pl <ra...@railab.me>
AuthorDate: Tue Jul 18 21:40:45 2023 +0200
tools/ci: migrate some ci build configurations to CMake
---
boards/arm/nrf53/thingy53/src/CMakeLists.txt | 6 ---
tools/ci/testlist/arm-05.dat | 74 ++++++++++++++++++++++++++++
tools/ci/testlist/arm-07.dat | 32 ++++++++++++
tools/ci/testlist/arm-08.dat | 52 +++++++++++++++++++
tools/ci/testlist/arm-12.dat | 54 ++++++++++++++++++++
5 files changed, 212 insertions(+), 6 deletions(-)
diff --git a/boards/arm/nrf53/thingy53/src/CMakeLists.txt b/boards/arm/nrf53/thingy53/src/CMakeLists.txt
index 005e2049c6..788259ed2e 100644
--- a/boards/arm/nrf53/thingy53/src/CMakeLists.txt
+++ b/boards/arm/nrf53/thingy53/src/CMakeLists.txt
@@ -24,12 +24,6 @@ if(CONFIG_BOARDCTL)
list(APPEND SRCS nrf53_appinit.c)
endif()
-if(CONFIG_ARCH_LEDS)
- list(APPEND SRCS nrf53_autoleds.c)
-else()
- list(APPEND SRCS nrf53_userleds.c)
-endif()
-
if(CONFIG_NRF53_APPCORE)
list(APPEND SRCS nrf53_cpunet_boot.c)
endif()
diff --git a/tools/ci/testlist/arm-05.dat b/tools/ci/testlist/arm-05.dat
index d12fd998e6..73113d72ee 100644
--- a/tools/ci/testlist/arm-05.dat
+++ b/tools/ci/testlist/arm-05.dat
@@ -4,3 +4,77 @@
/arm/s32k1xx,CONFIG_ARM_TOOLCHAIN_GNU_EABI
/arm/sam34,CONFIG_ARM_TOOLCHAIN_GNU_EABI
+
+# Boards build by CMake
+
+CMake,nrf52832-dk:buttons
+# CMake,nrf52832-dk:mcuboot_app
+# CMake,nrf52832-dk:mcuboot_loader
+# CMake,nrf52832-dk:mcuboot_loader_minimal
+CMake,nrf52832-dk:nsh
+CMake,nrf52832-dk:ostest_tickless
+# CMake,nrf52832-dk:sdc
+# CMake,nrf52832-dk:sdc_nimble
+CMake,nrf52832-dk:wdog
+
+CMake,nrf52832-mdk:nsh
+
+CMake,nrf52832-sparkfun:nsh
+
+CMake,nrf52840-dk:adc
+CMake,nrf52840-dk:buttons
+CMake,nrf52840-dk:cdcacm
+# CMake,nrf52840-dk:composite
+CMake,nrf52840-dk:highpri
+# CMake,nrf52840-dk:mcuboot_app
+# CMake,nrf52840-dk:mcuboot_loader
+CMake,nrf52840-dk:nsh
+CMake,nrf52840-dk:ostest_tickless
+CMake,nrf52840-dk:pwm
+CMake,nrf52840-dk:qspi
+#CMake,nrf52840-dk:rndis
+# CMake,nrf52840-dk:sdc
+# CMake,nrf52840-dk:sdc_nimble
+CMake,nrf52840-dk:sx127x
+CMake,nrf52840-dk:timer
+
+CMake,nrf52840-dongle:nsh
+CMake,nrf52840-dongle:usbnsh
+
+CMake,nrf52-feather:i2c
+CMake,nrf52-feather:nsh
+CMake,nrf52-feather:userleds
+
+CMake,thingy52:nsh
+
+CMake,nrf5340-audio-dk:nsh_cpuapp
+
+CMake,nrf5340-dk:adc_cpuapp
+CMake,nrf5340-dk:buttons_cpuapp
+# CMake,nrf5340-dk:composite_cpuapp
+# CMake,nrf5340-dk:mcuboot_app_cpuapp
+# CMake,nrf5340-dk:mcuboot_loader_cpuapp
+CMake,nrf5340-dk:nsh_cpuapp
+CMake,nrf5340-dk:nsh_cpunet
+CMake,nrf5340-dk:ostest_tickless_cpuapp
+CMake,nrf5340-dk:pwm_cpuapp
+CMake,nrf5340-dk:qspi_cpuapp
+# CMake,nrf5340-dk:rpmsghci_bt_cpuapp
+# CMake,nrf5340-dk:rpmsghci_nimble_cpuapp
+# CMake,nrf5340-dk:rpmsghci_sdc_cpunet
+# CMake,nrf5340-dk:rptun_cpuapp
+# CMake,nrf5340-dk:rptun_cpunet
+# CMake,nrf5340-dk:sdc_cpunet
+# CMake,nrf5340-dk:sdc_nimble_cpunet
+CMake,nrf5340-dk:timer_cpuapp
+
+# CMake,thingy53:composite_cpuapp
+CMake,thingy53:nsh_cpuapp
+CMake,thingy53:nsh_cpunet
+
+# CMake,nrf9160-dk:mcuboot_app
+# CMake,nrf9160-dk:mcuboot_loader
+CMake,nrf9160-dk:miniboot_s
+# CMake,nrf9160-dk:modem_ns
+CMake,nrf9160-dk:nsh
+CMake,nrf9160-dk:ostest_tickless
diff --git a/tools/ci/testlist/arm-07.dat b/tools/ci/testlist/arm-07.dat
index b817103a5c..dda347b33d 100644
--- a/tools/ci/testlist/arm-07.dat
+++ b/tools/ci/testlist/arm-07.dat
@@ -5,3 +5,35 @@
/arm/stm32/nucleo-f2*,CONFIG_ARM_TOOLCHAIN_CLANG
/arm/stm32/nucleo-f30*,CONFIG_ARM_TOOLCHAIN_GNU_EABI
+
+# Boards build by CMake
+
+CMake,nucleo-f103rb:adc
+CMake,nucleo-f103rb:ihm07m1_b16
+CMake,nucleo-f103rb:nsh
+CMake,nucleo-f103rb:pwm
+CMake,nucleo-f103rb:qenco
+
+CMake,nucleo-f207zg:adc
+CMake,nucleo-f207zg:nsh
+CMake,nucleo-f207zg:pwm
+
+# CMake,nucleo-f302r8:can
+CMake,nucleo-f302r8:cansock
+CMake,nucleo-f302r8:highpri
+CMake,nucleo-f302r8:ihm07m1_b16
+CMake,nucleo-f302r8:ihm07m1_f32
+CMake,nucleo-f302r8:nsh
+CMake,nucleo-f302r8:qenco
+
+CMake,nucleo-f303re:adc
+# CMake,nucleo-f303re:can
+CMake,nucleo-f303re:hello
+CMake,nucleo-f303re:nsh
+# CMake,nucleo-f303re:nxlines
+CMake,nucleo-f303re:pwm
+# CMake,nucleo-f303re:serialrx
+
+CMake,nucleo-f303ze:adc
+CMake,nucleo-f303ze:nsh
+# CMake,nucleo-f303ze:nxlines_oled
diff --git a/tools/ci/testlist/arm-08.dat b/tools/ci/testlist/arm-08.dat
index 29fc366f68..5448f9f668 100644
--- a/tools/ci/testlist/arm-08.dat
+++ b/tools/ci/testlist/arm-08.dat
@@ -7,3 +7,55 @@
/arm/stm32/nucleo-l*,CONFIG_ARM_TOOLCHAIN_CLANG
/arm/stm32/olimex-*,CONFIG_ARM_TOOLCHAIN_GNU_EABI
+
+# Boards build by CMake
+
+CMake,nucleo-f334r8:adc
+CMake,nucleo-f334r8:highpri
+CMake,nucleo-f334r8:nsh
+CMake,nucleo-f334r8:spwm1
+CMake,nucleo-f334r8:spwm2
+
+CMake,nucleo-f410rb:nsh
+
+CMake,nucleo-f412zg:nsh
+
+CMake,nucleo-f429zi:netnsh
+CMake,nucleo-f429zi:nsh
+
+CMake,nucleo-f446re:adc
+# CMake,nucleo-f446re:can
+CMake,nucleo-f446re:cansock
+CMake,nucleo-f446re:dac
+CMake,nucleo-f446re:gpio
+CMake,nucleo-f446re:ihm08m1_b16
+CMake,nucleo-f446re:ihm08m1_f32
+# CMake,nucleo-f446re:lcd
+CMake,nucleo-f446re:nsh
+CMake,nucleo-f446re:pwm
+CMake,nucleo-f446re:qenco
+
+CMake,nucleo-f4x1re:f401-fb
+CMake,nucleo-f4x1re:f401-nsh
+CMake,nucleo-f4x1re:f411-mcp2515-extid
+CMake,nucleo-f4x1re:f411-nsh
+
+CMake,nucleo-g431kb:comp
+CMake,nucleo-g431kb:nsh
+CMake,nucleo-g431kb:pwm
+
+CMake,nucleo-g431rb:adc
+# CMake,nucleo-g431rb:can
+CMake,nucleo-g431rb:cansock
+CMake,nucleo-g431rb:cordic
+CMake,nucleo-g431rb:ihm16m1_b16
+CMake,nucleo-g431rb:ihm16m1_f32
+CMake,nucleo-g431rb:nsh
+CMake,nucleo-g431rb:pwm
+CMake,nucleo-g431rb:qenco
+
+# CMake,nucleo-g474re:nsh
+# CMake,nucleo-g474re:usbserial
+
+# CMake,nucleo-l152re:lcd
+CMake,nucleo-l152re:nsh
diff --git a/tools/ci/testlist/arm-12.dat b/tools/ci/testlist/arm-12.dat
index 82b3b1e0d0..5e404651b6 100644
--- a/tools/ci/testlist/arm-12.dat
+++ b/tools/ci/testlist/arm-12.dat
@@ -1,3 +1,57 @@
/arm/stm32f*,CONFIG_ARM_TOOLCHAIN_CLANG
/arm/stm32h*,CONFIG_ARM_TOOLCHAIN_CLANG
+
+# Boards build by CMake
+
+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,steval-eth001v1:foc_b16
+CMake,steval-eth001v1:foc_f32
+CMake,steval-eth001v1:nsh
+
+CMake,stm32f746g-disco:audio
+CMake,stm32f746g-disco:fb
+# CMake,stm32f746g-disco:lvgl
+CMake,stm32f746g-disco:netnsh
+CMake,stm32f746g-disco:nsh
+# CMake,stm32f746g-disco:nxdemo
+# CMake,stm32f746g-disco:nxterm
+
+CMake,stm32f746-ws:nsh
+
+CMake,stm32f769i-disco:netnsh
+CMake,stm32f769i-disco:nsh
+
+CMake,stm32f777zit6-meadow:nsh
+# CMake,stm32f777zit6-meadow:sdram
+
+# CMake,nucleo-h743zi:composite
+# CMake,nucleo-h743zi:elf
+# CMake,nucleo-h743zi:mcuboot-app
+# CMake,nucleo-h743zi:mcuboot-loader
+CMake,nucleo-h743zi:netnsh
+CMake,nucleo-h743zi:nsh
+# CMake,nucleo-h743zi:nxlines_oled
+CMake,nucleo-h743zi:otg_fs_host
+CMake,nucleo-h743zi:pwm
+# CMake,nucleo-h743zi:rndis
+
+# CMake,nucleo-h743zi2:jumbo
+CMake,nucleo-h743zi2:netnsh
+CMake,nucleo-h743zi2:nsh
+CMake,nucleo-h743zi2:pysim
+CMake,nucleo-h743zi2:socketcan
+
+# CMake,stm32h745i-disco:lvgl
+CMake,stm32h745i-disco:netnsh
+CMake,stm32h745i-disco:nsh
+CMake,stm32h745i-disco:touchtest