From 0e1f3a2d626dcfff8c404a3465cd7dcf5708a1de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beat=20K=C3=BCng?= Date: Sat, 31 Jul 2021 21:35:37 +0200 Subject: [PATCH] px4_add_board: infer VENDOR, MODEL & LABEL from cmake file name --- boards/airmind/mindpx-v2/default.cmake | 3 --- boards/ark/can-flow/canbootloader.cmake | 3 --- boards/ark/can-flow/debug.cmake | 3 --- boards/ark/can-flow/default.cmake | 3 --- boards/ark/can-gps/canbootloader.cmake | 3 --- boards/ark/can-gps/debug.cmake | 3 --- boards/ark/can-gps/default.cmake | 3 --- boards/av/x-v1/default.cmake | 3 --- boards/beaglebone/blue/default.cmake | 3 --- boards/bitcraze/crazyflie/default.cmake | 2 -- boards/bitcraze/crazyflie21/default.cmake | 2 -- boards/cuav/can-gps-v1/canbootloader.cmake | 3 --- boards/cuav/can-gps-v1/debug.cmake | 3 --- boards/cuav/can-gps-v1/default.cmake | 3 --- boards/cuav/nora/bootloader.cmake | 3 --- boards/cuav/nora/default.cmake | 3 --- boards/cuav/nora/test.cmake | 3 --- boards/cuav/x7pro/bootloader.cmake | 3 --- boards/cuav/x7pro/default.cmake | 3 --- boards/cuav/x7pro/test.cmake | 3 --- boards/cubepilot/cubeorange/bootloader.cmake | 3 --- boards/cubepilot/cubeorange/default.cmake | 3 --- boards/cubepilot/cubeorange/test.cmake | 3 --- boards/cubepilot/cubeyellow/default.cmake | 3 --- boards/cubepilot/cubeyellow/test.cmake | 3 --- boards/cubepilot/io-v2/default.cmake | 2 -- boards/emlid/navio2/default.cmake | 3 --- .../freefly/can-rtk-gps/canbootloader.cmake | 3 --- boards/freefly/can-rtk-gps/default.cmake | 3 --- boards/holybro/can-gps-v1/canbootloader.cmake | 3 --- boards/holybro/can-gps-v1/debug.cmake | 3 --- boards/holybro/can-gps-v1/default.cmake | 3 --- boards/holybro/durandal-v1/bootloader.cmake | 3 --- boards/holybro/durandal-v1/default.cmake | 3 --- boards/holybro/durandal-v1/test.cmake | 3 --- boards/holybro/kakutef7/default.cmake | 3 --- boards/holybro/pix32v5/default.cmake | 3 --- boards/holybro/pix32v5/test.cmake | 3 --- boards/modalai/fc-v1/default.cmake | 3 --- boards/modalai/fc-v1/rtps.cmake | 3 --- boards/modalai/fc-v1/test.cmake | 3 --- boards/modalai/fc-v2/bootloader.cmake | 3 --- boards/modalai/fc-v2/default.cmake | 3 --- boards/modalai/fc-v2/test.cmake | 3 --- boards/mro/ctrl-zero-f7-oem/default.cmake | 3 --- boards/mro/ctrl-zero-f7/default.cmake | 3 --- boards/mro/ctrl-zero-h7-oem/bootloader.cmake | 3 --- boards/mro/ctrl-zero-h7-oem/default.cmake | 3 --- boards/mro/ctrl-zero-h7/bootloader.cmake | 3 --- boards/mro/ctrl-zero-h7/default.cmake | 3 --- boards/mro/pixracerpro/bootloader.cmake | 3 --- boards/mro/pixracerpro/default.cmake | 3 --- boards/mro/x21-777/default.cmake | 3 --- boards/mro/x21/default.cmake | 3 --- boards/nxp/fmuk66-e/default.cmake | 3 --- boards/nxp/fmuk66-e/rtps.cmake | 3 --- boards/nxp/fmuk66-e/socketcan.cmake | 3 --- boards/nxp/fmuk66-v3/default.cmake | 3 --- boards/nxp/fmuk66-v3/rtps.cmake | 3 --- boards/nxp/fmuk66-v3/socketcan.cmake | 3 --- boards/nxp/fmuk66-v3/test.cmake | 3 --- boards/nxp/fmurt1062-v1/default.cmake | 3 --- boards/nxp/ucans32k146/canbootloader.cmake | 3 --- boards/nxp/ucans32k146/default.cmake | 3 --- boards/omnibus/f4sd/default.cmake | 3 --- boards/px4/fmu-v2/default.cmake | 3 --- boards/px4/fmu-v2/fixedwing.cmake | 3 --- boards/px4/fmu-v2/multicopter.cmake | 3 --- boards/px4/fmu-v2/rover.cmake | 3 --- boards/px4/fmu-v2/test.cmake | 3 --- boards/px4/fmu-v3/default.cmake | 3 --- boards/px4/fmu-v3/test.cmake | 3 --- boards/px4/fmu-v4/cannode.cmake | 3 --- boards/px4/fmu-v4/default.cmake | 3 --- boards/px4/fmu-v4/test.cmake | 3 --- boards/px4/fmu-v4pro/default.cmake | 3 --- boards/px4/fmu-v4pro/test.cmake | 3 --- boards/px4/fmu-v5/ctrlalloc.cmake | 3 --- boards/px4/fmu-v5/debug.cmake | 3 --- boards/px4/fmu-v5/default.cmake | 3 --- boards/px4/fmu-v5/fixedwing.cmake | 3 --- boards/px4/fmu-v5/multicopter.cmake | 3 --- boards/px4/fmu-v5/optimized.cmake | 3 --- boards/px4/fmu-v5/rover.cmake | 3 --- boards/px4/fmu-v5/rtps.cmake | 3 --- boards/px4/fmu-v5/stackcheck.cmake | 3 --- boards/px4/fmu-v5/test.cmake | 3 --- boards/px4/fmu-v5/uavcanv0periph.cmake | 3 --- boards/px4/fmu-v5/uavcanv1.cmake | 3 --- boards/px4/fmu-v5x/base_phy_DP83848C.cmake | 3 --- boards/px4/fmu-v5x/default.cmake | 3 --- boards/px4/fmu-v5x/test.cmake | 3 --- boards/px4/fmu-v6u/bootloader.cmake | 3 --- boards/px4/fmu-v6u/default.cmake | 3 --- boards/px4/fmu-v6u/test.cmake | 3 --- boards/px4/fmu-v6x/bootloader.cmake | 3 --- boards/px4/fmu-v6x/default.cmake | 3 --- boards/px4/fmu-v6x/test.cmake | 3 --- boards/px4/io-v2/default.cmake | 2 -- boards/px4/raspberrypi/default.cmake | 3 --- boards/px4/sitl/ctrlalloc.cmake | 3 --- boards/px4/sitl/default.cmake | 3 --- boards/px4/sitl/nolockstep.cmake | 3 --- boards/px4/sitl/replay.cmake | 3 --- boards/px4/sitl/rtps.cmake | 3 --- boards/px4/sitl/test.cmake | 3 --- boards/scumaker/pilotpi/arm64.cmake | 3 --- boards/scumaker/pilotpi/default.cmake | 3 --- boards/spracing/h7extreme/default.cmake | 3 --- boards/uvify/core/default.cmake | 3 --- cmake/px4_add_board.cmake | 26 +++++++------------ 111 files changed, 9 insertions(+), 343 deletions(-) diff --git a/boards/airmind/mindpx-v2/default.cmake b/boards/airmind/mindpx-v2/default.cmake index 0b4b5fa835..24950c8b4a 100644 --- a/boards/airmind/mindpx-v2/default.cmake +++ b/boards/airmind/mindpx-v2/default.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR airmind - MODEL mindpx-v2 - LABEL default TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 CONSTRAINED_MEMORY diff --git a/boards/ark/can-flow/canbootloader.cmake b/boards/ark/can-flow/canbootloader.cmake index 1ca01c65a6..d6d38d89a4 100644 --- a/boards/ark/can-flow/canbootloader.cmake +++ b/boards/ark/can-flow/canbootloader.cmake @@ -2,9 +2,6 @@ include (${CMAKE_CURRENT_LIST_DIR}/uavcan_board_identity) px4_add_board( PLATFORM nuttx - VENDOR ark - MODEL can-flow - LABEL canbootloader TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 CONSTRAINED_MEMORY diff --git a/boards/ark/can-flow/debug.cmake b/boards/ark/can-flow/debug.cmake index 7bb2301b5f..27b017d694 100644 --- a/boards/ark/can-flow/debug.cmake +++ b/boards/ark/can-flow/debug.cmake @@ -2,9 +2,6 @@ include (${CMAKE_CURRENT_LIST_DIR}/uavcan_board_identity) px4_add_board( PLATFORM nuttx - VENDOR ark - MODEL can-flow - LABEL debug TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 CONSTRAINED_MEMORY diff --git a/boards/ark/can-flow/default.cmake b/boards/ark/can-flow/default.cmake index 692a8f2bb8..80962e07d9 100644 --- a/boards/ark/can-flow/default.cmake +++ b/boards/ark/can-flow/default.cmake @@ -2,9 +2,6 @@ include (${CMAKE_CURRENT_LIST_DIR}/uavcan_board_identity) px4_add_board( PLATFORM nuttx - VENDOR ark - MODEL can-flow - LABEL default TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 CONSTRAINED_FLASH diff --git a/boards/ark/can-gps/canbootloader.cmake b/boards/ark/can-gps/canbootloader.cmake index 500ef73cd2..d6d38d89a4 100644 --- a/boards/ark/can-gps/canbootloader.cmake +++ b/boards/ark/can-gps/canbootloader.cmake @@ -2,9 +2,6 @@ include (${CMAKE_CURRENT_LIST_DIR}/uavcan_board_identity) px4_add_board( PLATFORM nuttx - VENDOR ark - MODEL can-gps - LABEL canbootloader TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 CONSTRAINED_MEMORY diff --git a/boards/ark/can-gps/debug.cmake b/boards/ark/can-gps/debug.cmake index 79cd512032..2464bbfd99 100644 --- a/boards/ark/can-gps/debug.cmake +++ b/boards/ark/can-gps/debug.cmake @@ -2,9 +2,6 @@ include (${CMAKE_CURRENT_LIST_DIR}/uavcan_board_identity) px4_add_board( PLATFORM nuttx - VENDOR ark - MODEL can-gps - LABEL debug TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 CONSTRAINED_MEMORY diff --git a/boards/ark/can-gps/default.cmake b/boards/ark/can-gps/default.cmake index 07a542d6ad..6a46aabbce 100644 --- a/boards/ark/can-gps/default.cmake +++ b/boards/ark/can-gps/default.cmake @@ -2,9 +2,6 @@ include (${CMAKE_CURRENT_LIST_DIR}/uavcan_board_identity) px4_add_board( PLATFORM nuttx - VENDOR ark - MODEL can-gps - LABEL default TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 #CONSTRAINED_FLASH diff --git a/boards/av/x-v1/default.cmake b/boards/av/x-v1/default.cmake index 88c43e9cb1..da00f74dd4 100644 --- a/boards/av/x-v1/default.cmake +++ b/boards/av/x-v1/default.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR av - MODEL x-v1 - LABEL default TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common diff --git a/boards/beaglebone/blue/default.cmake b/boards/beaglebone/blue/default.cmake index a98fcd3120..f7be75b634 100644 --- a/boards/beaglebone/blue/default.cmake +++ b/boards/beaglebone/blue/default.cmake @@ -5,9 +5,6 @@ add_definitions( ) px4_add_board( - VENDOR beaglebone - MODEL blue - LABEL default PLATFORM posix ARCHITECTURE cortex-a8 ROMFSROOT px4fmu_common diff --git a/boards/bitcraze/crazyflie/default.cmake b/boards/bitcraze/crazyflie/default.cmake index 7547c13ee1..b2cf37e5d5 100644 --- a/boards/bitcraze/crazyflie/default.cmake +++ b/boards/bitcraze/crazyflie/default.cmake @@ -3,8 +3,6 @@ add_compile_options(-Wno-narrowing) px4_add_board( PLATFORM nuttx - VENDOR bitcraze - MODEL crazyflie TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 CONSTRAINED_MEMORY diff --git a/boards/bitcraze/crazyflie21/default.cmake b/boards/bitcraze/crazyflie21/default.cmake index bddc80c825..a9dede1447 100644 --- a/boards/bitcraze/crazyflie21/default.cmake +++ b/boards/bitcraze/crazyflie21/default.cmake @@ -3,8 +3,6 @@ add_compile_options(-Wno-narrowing) px4_add_board( PLATFORM nuttx - VENDOR bitcraze - MODEL crazyflie21 TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 CONSTRAINED_MEMORY diff --git a/boards/cuav/can-gps-v1/canbootloader.cmake b/boards/cuav/can-gps-v1/canbootloader.cmake index 048aba3880..d6d38d89a4 100644 --- a/boards/cuav/can-gps-v1/canbootloader.cmake +++ b/boards/cuav/can-gps-v1/canbootloader.cmake @@ -2,9 +2,6 @@ include (${CMAKE_CURRENT_LIST_DIR}/uavcan_board_identity) px4_add_board( PLATFORM nuttx - VENDOR cuav - MODEL can-gps-v1 - LABEL canbootloader TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 CONSTRAINED_MEMORY diff --git a/boards/cuav/can-gps-v1/debug.cmake b/boards/cuav/can-gps-v1/debug.cmake index 90687e12f3..a7c47e7951 100644 --- a/boards/cuav/can-gps-v1/debug.cmake +++ b/boards/cuav/can-gps-v1/debug.cmake @@ -4,9 +4,6 @@ add_definitions(-DUSE_S_RGB_LED_DMA) px4_add_board( PLATFORM nuttx - VENDOR cuav - MODEL can-gps-v1 - LABEL debug TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 CONSTRAINED_MEMORY diff --git a/boards/cuav/can-gps-v1/default.cmake b/boards/cuav/can-gps-v1/default.cmake index 6f1eb8c488..2f108dcc13 100644 --- a/boards/cuav/can-gps-v1/default.cmake +++ b/boards/cuav/can-gps-v1/default.cmake @@ -4,9 +4,6 @@ add_definitions(-DUSE_S_RGB_LED_DMA) px4_add_board( PLATFORM nuttx - VENDOR cuav - MODEL can-gps-v1 - LABEL default TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 CONSTRAINED_MEMORY diff --git a/boards/cuav/nora/bootloader.cmake b/boards/cuav/nora/bootloader.cmake index 3aef9b2599..05f7f2e248 100644 --- a/boards/cuav/nora/bootloader.cmake +++ b/boards/cuav/nora/bootloader.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR cuav - MODEL nora - LABEL bootloader TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ) diff --git a/boards/cuav/nora/default.cmake b/boards/cuav/nora/default.cmake index 034eb66833..d1bef5d4f1 100644 --- a/boards/cuav/nora/default.cmake +++ b/boards/cuav/nora/default.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR cuav - MODEL nora - LABEL default TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common diff --git a/boards/cuav/nora/test.cmake b/boards/cuav/nora/test.cmake index 8079689dbd..0b79e030c7 100644 --- a/boards/cuav/nora/test.cmake +++ b/boards/cuav/nora/test.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR cuav - MODEL nora - LABEL test TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common diff --git a/boards/cuav/x7pro/bootloader.cmake b/boards/cuav/x7pro/bootloader.cmake index 93299343dc..05f7f2e248 100644 --- a/boards/cuav/x7pro/bootloader.cmake +++ b/boards/cuav/x7pro/bootloader.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR cuav - MODEL x7pro - LABEL bootloader TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ) diff --git a/boards/cuav/x7pro/default.cmake b/boards/cuav/x7pro/default.cmake index 740cab5a48..9af17219da 100644 --- a/boards/cuav/x7pro/default.cmake +++ b/boards/cuav/x7pro/default.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR cuav - MODEL x7pro - LABEL default TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common diff --git a/boards/cuav/x7pro/test.cmake b/boards/cuav/x7pro/test.cmake index fdd536b2ec..df17de06ec 100644 --- a/boards/cuav/x7pro/test.cmake +++ b/boards/cuav/x7pro/test.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR cuav - MODEL x7pro - LABEL test TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common diff --git a/boards/cubepilot/cubeorange/bootloader.cmake b/boards/cubepilot/cubeorange/bootloader.cmake index 69782041e2..05f7f2e248 100644 --- a/boards/cubepilot/cubeorange/bootloader.cmake +++ b/boards/cubepilot/cubeorange/bootloader.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR cubepilot - MODEL cubeorange - LABEL bootloader TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ) diff --git a/boards/cubepilot/cubeorange/default.cmake b/boards/cubepilot/cubeorange/default.cmake index 8ed42b3618..e85a8eafbb 100644 --- a/boards/cubepilot/cubeorange/default.cmake +++ b/boards/cubepilot/cubeorange/default.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR cubepilot - MODEL cubeorange - LABEL default TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common diff --git a/boards/cubepilot/cubeorange/test.cmake b/boards/cubepilot/cubeorange/test.cmake index db4e047c3d..486b225418 100644 --- a/boards/cubepilot/cubeorange/test.cmake +++ b/boards/cubepilot/cubeorange/test.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR cubepilot - MODEL cubeorange - LABEL test TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common diff --git a/boards/cubepilot/cubeyellow/default.cmake b/boards/cubepilot/cubeyellow/default.cmake index 658bf21ff1..bda31b59b1 100644 --- a/boards/cubepilot/cubeyellow/default.cmake +++ b/boards/cubepilot/cubeyellow/default.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR cubepilot - MODEL cubeyellow - LABEL default TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common diff --git a/boards/cubepilot/cubeyellow/test.cmake b/boards/cubepilot/cubeyellow/test.cmake index 97900b1c36..7c35e3f300 100644 --- a/boards/cubepilot/cubeyellow/test.cmake +++ b/boards/cubepilot/cubeyellow/test.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR cubepilot - MODEL cubeyellow - LABEL test TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common diff --git a/boards/cubepilot/io-v2/default.cmake b/boards/cubepilot/io-v2/default.cmake index 7be8f4d6cd..6461439f86 100644 --- a/boards/cubepilot/io-v2/default.cmake +++ b/boards/cubepilot/io-v2/default.cmake @@ -1,8 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR cubepilot - MODEL io-v2 TOOLCHAIN arm-none-eabi CONSTRAINED_FLASH ARCHITECTURE cortex-m3 diff --git a/boards/emlid/navio2/default.cmake b/boards/emlid/navio2/default.cmake index 865b3cd61a..5711fb3540 100644 --- a/boards/emlid/navio2/default.cmake +++ b/boards/emlid/navio2/default.cmake @@ -3,9 +3,6 @@ add_definitions( ) px4_add_board( - VENDOR emlid - MODEL navio2 - LABEL default PLATFORM posix ARCHITECTURE cortex-a53 ROMFSROOT px4fmu_common diff --git a/boards/freefly/can-rtk-gps/canbootloader.cmake b/boards/freefly/can-rtk-gps/canbootloader.cmake index 00d56652b0..470d7d837b 100644 --- a/boards/freefly/can-rtk-gps/canbootloader.cmake +++ b/boards/freefly/can-rtk-gps/canbootloader.cmake @@ -2,9 +2,6 @@ include (${CMAKE_CURRENT_LIST_DIR}/uavcan_board_identity) px4_add_board( PLATFORM nuttx - VENDOR freefly - MODEL can-rtk-gps - LABEL canbootloader TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 CONSTRAINED_MEMORY diff --git a/boards/freefly/can-rtk-gps/default.cmake b/boards/freefly/can-rtk-gps/default.cmake index 1e79514858..f140915b6c 100644 --- a/boards/freefly/can-rtk-gps/default.cmake +++ b/boards/freefly/can-rtk-gps/default.cmake @@ -2,9 +2,6 @@ include (${CMAKE_CURRENT_LIST_DIR}/uavcan_board_identity) px4_add_board( PLATFORM nuttx - VENDOR freefly - MODEL can-rtk-gps - LABEL default TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 #CONSTRAINED_FLASH diff --git a/boards/holybro/can-gps-v1/canbootloader.cmake b/boards/holybro/can-gps-v1/canbootloader.cmake index 510604a31c..d6d38d89a4 100644 --- a/boards/holybro/can-gps-v1/canbootloader.cmake +++ b/boards/holybro/can-gps-v1/canbootloader.cmake @@ -2,9 +2,6 @@ include (${CMAKE_CURRENT_LIST_DIR}/uavcan_board_identity) px4_add_board( PLATFORM nuttx - VENDOR holybro - MODEL can-gps-v1 - LABEL canbootloader TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 CONSTRAINED_MEMORY diff --git a/boards/holybro/can-gps-v1/debug.cmake b/boards/holybro/can-gps-v1/debug.cmake index 3c72c1065f..a949b4ac9e 100644 --- a/boards/holybro/can-gps-v1/debug.cmake +++ b/boards/holybro/can-gps-v1/debug.cmake @@ -2,9 +2,6 @@ include (${CMAKE_CURRENT_LIST_DIR}/uavcan_board_identity) px4_add_board( PLATFORM nuttx - VENDOR holybro - MODEL can-gps-v1 - LABEL debug TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 CONSTRAINED_MEMORY diff --git a/boards/holybro/can-gps-v1/default.cmake b/boards/holybro/can-gps-v1/default.cmake index dc810b18c0..7e4b7a3524 100644 --- a/boards/holybro/can-gps-v1/default.cmake +++ b/boards/holybro/can-gps-v1/default.cmake @@ -2,9 +2,6 @@ include (${CMAKE_CURRENT_LIST_DIR}/uavcan_board_identity) px4_add_board( PLATFORM nuttx - VENDOR holybro - MODEL can-gps-v1 - LABEL default TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 CONSTRAINED_MEMORY diff --git a/boards/holybro/durandal-v1/bootloader.cmake b/boards/holybro/durandal-v1/bootloader.cmake index 131491293a..05f7f2e248 100644 --- a/boards/holybro/durandal-v1/bootloader.cmake +++ b/boards/holybro/durandal-v1/bootloader.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR holybro - MODEL durandal-v1 - LABEL bootloader TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ) diff --git a/boards/holybro/durandal-v1/default.cmake b/boards/holybro/durandal-v1/default.cmake index b0590e0db6..5778fbd8cb 100644 --- a/boards/holybro/durandal-v1/default.cmake +++ b/boards/holybro/durandal-v1/default.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR holybro - MODEL durandal-v1 - LABEL default TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common diff --git a/boards/holybro/durandal-v1/test.cmake b/boards/holybro/durandal-v1/test.cmake index 0d3c69ebc7..7b48a54334 100644 --- a/boards/holybro/durandal-v1/test.cmake +++ b/boards/holybro/durandal-v1/test.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR holybro - MODEL durandal-v1 - LABEL test TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common diff --git a/boards/holybro/kakutef7/default.cmake b/boards/holybro/kakutef7/default.cmake index 50dcf5b710..29e04c3488 100644 --- a/boards/holybro/kakutef7/default.cmake +++ b/boards/holybro/kakutef7/default.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR holybro - MODEL kakutef7 - LABEL default TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 EXTERNAL_METADATA diff --git a/boards/holybro/pix32v5/default.cmake b/boards/holybro/pix32v5/default.cmake index 0e7f1b49ec..70020a5395 100644 --- a/boards/holybro/pix32v5/default.cmake +++ b/boards/holybro/pix32v5/default.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR holybro - MODEL pix32v5 - LABEL default TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common diff --git a/boards/holybro/pix32v5/test.cmake b/boards/holybro/pix32v5/test.cmake index f6378db4af..9b960cfa8d 100644 --- a/boards/holybro/pix32v5/test.cmake +++ b/boards/holybro/pix32v5/test.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR holybro - MODEL pix32v5 - LABEL test TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common diff --git a/boards/modalai/fc-v1/default.cmake b/boards/modalai/fc-v1/default.cmake index 7a21df918b..2cd6683429 100644 --- a/boards/modalai/fc-v1/default.cmake +++ b/boards/modalai/fc-v1/default.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR modalai - MODEL fc-v1 - LABEL default TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common diff --git a/boards/modalai/fc-v1/rtps.cmake b/boards/modalai/fc-v1/rtps.cmake index 3e56f4cf6c..fa2f3fafb9 100644 --- a/boards/modalai/fc-v1/rtps.cmake +++ b/boards/modalai/fc-v1/rtps.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR modalai - MODEL fc-v1 - LABEL rtps TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common diff --git a/boards/modalai/fc-v1/test.cmake b/boards/modalai/fc-v1/test.cmake index 9766e83215..a347a5a4a7 100644 --- a/boards/modalai/fc-v1/test.cmake +++ b/boards/modalai/fc-v1/test.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR modalai - MODEL fc-v1 - LABEL test TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common diff --git a/boards/modalai/fc-v2/bootloader.cmake b/boards/modalai/fc-v2/bootloader.cmake index f39259aff1..05f7f2e248 100644 --- a/boards/modalai/fc-v2/bootloader.cmake +++ b/boards/modalai/fc-v2/bootloader.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR modalai - MODEL fc-v2 - LABEL bootloader TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ) diff --git a/boards/modalai/fc-v2/default.cmake b/boards/modalai/fc-v2/default.cmake index 899d1e314b..09593fb5c5 100644 --- a/boards/modalai/fc-v2/default.cmake +++ b/boards/modalai/fc-v2/default.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR modalai - MODEL fc-v2 - LABEL default TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common diff --git a/boards/modalai/fc-v2/test.cmake b/boards/modalai/fc-v2/test.cmake index cc05d6d2ef..98e7c0079a 100644 --- a/boards/modalai/fc-v2/test.cmake +++ b/boards/modalai/fc-v2/test.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR modalai - MODEL fc-v2 - LABEL test TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common diff --git a/boards/mro/ctrl-zero-f7-oem/default.cmake b/boards/mro/ctrl-zero-f7-oem/default.cmake index 7047ef0574..729d6efc0c 100644 --- a/boards/mro/ctrl-zero-f7-oem/default.cmake +++ b/boards/mro/ctrl-zero-f7-oem/default.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR mro - MODEL ctrl-zero-f7-oem - LABEL default TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common diff --git a/boards/mro/ctrl-zero-f7/default.cmake b/boards/mro/ctrl-zero-f7/default.cmake index dce6756bee..c761b678b7 100644 --- a/boards/mro/ctrl-zero-f7/default.cmake +++ b/boards/mro/ctrl-zero-f7/default.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR mro - MODEL ctrl-zero-f7 - LABEL default TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common diff --git a/boards/mro/ctrl-zero-h7-oem/bootloader.cmake b/boards/mro/ctrl-zero-h7-oem/bootloader.cmake index d4543ee775..05f7f2e248 100644 --- a/boards/mro/ctrl-zero-h7-oem/bootloader.cmake +++ b/boards/mro/ctrl-zero-h7-oem/bootloader.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR mro - MODEL ctrl-zero-h7-oem - LABEL bootloader TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ) diff --git a/boards/mro/ctrl-zero-h7-oem/default.cmake b/boards/mro/ctrl-zero-h7-oem/default.cmake index 7620b988e0..9d71fa810b 100644 --- a/boards/mro/ctrl-zero-h7-oem/default.cmake +++ b/boards/mro/ctrl-zero-h7-oem/default.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR mro - MODEL ctrl-zero-h7-oem - LABEL default TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common diff --git a/boards/mro/ctrl-zero-h7/bootloader.cmake b/boards/mro/ctrl-zero-h7/bootloader.cmake index 0679706aa2..05f7f2e248 100644 --- a/boards/mro/ctrl-zero-h7/bootloader.cmake +++ b/boards/mro/ctrl-zero-h7/bootloader.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR mro - MODEL ctrl-zero-h7 - LABEL bootloader TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ) diff --git a/boards/mro/ctrl-zero-h7/default.cmake b/boards/mro/ctrl-zero-h7/default.cmake index e0fe51bbf1..6ced4ff3b7 100644 --- a/boards/mro/ctrl-zero-h7/default.cmake +++ b/boards/mro/ctrl-zero-h7/default.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR mro - MODEL ctrl-zero-h7 - LABEL default TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common diff --git a/boards/mro/pixracerpro/bootloader.cmake b/boards/mro/pixracerpro/bootloader.cmake index dc38de86b8..05f7f2e248 100644 --- a/boards/mro/pixracerpro/bootloader.cmake +++ b/boards/mro/pixracerpro/bootloader.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR mro - MODEL pixracerpro - LABEL bootloader TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ) diff --git a/boards/mro/pixracerpro/default.cmake b/boards/mro/pixracerpro/default.cmake index 8a3fd6f4a7..3812eddc77 100644 --- a/boards/mro/pixracerpro/default.cmake +++ b/boards/mro/pixracerpro/default.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR mro - MODEL pixracerpro - LABEL default TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common diff --git a/boards/mro/x21-777/default.cmake b/boards/mro/x21-777/default.cmake index 08f530c9e3..89eccc9961 100644 --- a/boards/mro/x21-777/default.cmake +++ b/boards/mro/x21-777/default.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR mro - MODEL x21-777 - LABEL default TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common diff --git a/boards/mro/x21/default.cmake b/boards/mro/x21/default.cmake index d7209deb48..269e37fc53 100644 --- a/boards/mro/x21/default.cmake +++ b/boards/mro/x21/default.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR mro - MODEL x21 - LABEL default TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 CONSTRAINED_MEMORY diff --git a/boards/nxp/fmuk66-e/default.cmake b/boards/nxp/fmuk66-e/default.cmake index e88d27617a..24ea759654 100644 --- a/boards/nxp/fmuk66-e/default.cmake +++ b/boards/nxp/fmuk66-e/default.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR nxp - MODEL fmuk66-e - LABEL default TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 CONSTRAINED_MEMORY diff --git a/boards/nxp/fmuk66-e/rtps.cmake b/boards/nxp/fmuk66-e/rtps.cmake index 5aa0d3ed0b..56c6a9d27b 100644 --- a/boards/nxp/fmuk66-e/rtps.cmake +++ b/boards/nxp/fmuk66-e/rtps.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR nxp - MODEL fmuk66-e - LABEL rtps TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 CONSTRAINED_MEMORY diff --git a/boards/nxp/fmuk66-e/socketcan.cmake b/boards/nxp/fmuk66-e/socketcan.cmake index 70a912f41a..4f69b596aa 100644 --- a/boards/nxp/fmuk66-e/socketcan.cmake +++ b/boards/nxp/fmuk66-e/socketcan.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR nxp - MODEL fmuk66-e - LABEL socketcan TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 CONSTRAINED_MEMORY diff --git a/boards/nxp/fmuk66-v3/default.cmake b/boards/nxp/fmuk66-v3/default.cmake index 35c9d53869..625e0f0646 100644 --- a/boards/nxp/fmuk66-v3/default.cmake +++ b/boards/nxp/fmuk66-v3/default.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR nxp - MODEL fmuk66-v3 - LABEL default TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 CONSTRAINED_MEMORY diff --git a/boards/nxp/fmuk66-v3/rtps.cmake b/boards/nxp/fmuk66-v3/rtps.cmake index 1decc7e645..ae8a0da7ee 100644 --- a/boards/nxp/fmuk66-v3/rtps.cmake +++ b/boards/nxp/fmuk66-v3/rtps.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR nxp - MODEL fmuk66-v3 - LABEL rtps TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 CONSTRAINED_MEMORY diff --git a/boards/nxp/fmuk66-v3/socketcan.cmake b/boards/nxp/fmuk66-v3/socketcan.cmake index f0aec2f77e..0e94115564 100644 --- a/boards/nxp/fmuk66-v3/socketcan.cmake +++ b/boards/nxp/fmuk66-v3/socketcan.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR nxp - MODEL fmuk66-v3 - LABEL socketcan TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 CONSTRAINED_MEMORY diff --git a/boards/nxp/fmuk66-v3/test.cmake b/boards/nxp/fmuk66-v3/test.cmake index c181d6ccbf..4c340d03ba 100644 --- a/boards/nxp/fmuk66-v3/test.cmake +++ b/boards/nxp/fmuk66-v3/test.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR nxp - MODEL fmuk66-v3 - LABEL test TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 CONSTRAINED_MEMORY diff --git a/boards/nxp/fmurt1062-v1/default.cmake b/boards/nxp/fmurt1062-v1/default.cmake index 6e0ee9eb92..676d662c63 100644 --- a/boards/nxp/fmurt1062-v1/default.cmake +++ b/boards/nxp/fmurt1062-v1/default.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR nxp - MODEL fmurt1062-v1 - LABEL default TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common diff --git a/boards/nxp/ucans32k146/canbootloader.cmake b/boards/nxp/ucans32k146/canbootloader.cmake index 00b17e04af..d6d38d89a4 100644 --- a/boards/nxp/ucans32k146/canbootloader.cmake +++ b/boards/nxp/ucans32k146/canbootloader.cmake @@ -2,9 +2,6 @@ include (${CMAKE_CURRENT_LIST_DIR}/uavcan_board_identity) px4_add_board( PLATFORM nuttx - VENDOR nxp - MODEL ucans32k146 - LABEL canbootloader TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 CONSTRAINED_MEMORY diff --git a/boards/nxp/ucans32k146/default.cmake b/boards/nxp/ucans32k146/default.cmake index c9c9006493..cafd05864e 100644 --- a/boards/nxp/ucans32k146/default.cmake +++ b/boards/nxp/ucans32k146/default.cmake @@ -2,9 +2,6 @@ include (${CMAKE_CURRENT_LIST_DIR}/uavcan_board_identity) px4_add_board( PLATFORM nuttx - VENDOR nxp - MODEL ucans32k146 - LABEL default TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 CONSTRAINED_MEMORY diff --git a/boards/omnibus/f4sd/default.cmake b/boards/omnibus/f4sd/default.cmake index 6b6a1664e4..da35a5d805 100644 --- a/boards/omnibus/f4sd/default.cmake +++ b/boards/omnibus/f4sd/default.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR omnibus - MODEL f4sd - LABEL default TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 CONSTRAINED_MEMORY diff --git a/boards/px4/fmu-v2/default.cmake b/boards/px4/fmu-v2/default.cmake index 1683464c6f..26196863c7 100644 --- a/boards/px4/fmu-v2/default.cmake +++ b/boards/px4/fmu-v2/default.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR px4 - MODEL fmu-v2 - LABEL default TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 CONSTRAINED_MEMORY diff --git a/boards/px4/fmu-v2/fixedwing.cmake b/boards/px4/fmu-v2/fixedwing.cmake index 0d6485004d..5b849a97c2 100644 --- a/boards/px4/fmu-v2/fixedwing.cmake +++ b/boards/px4/fmu-v2/fixedwing.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR px4 - MODEL fmu-v2 - LABEL fixedwing TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 CONSTRAINED_MEMORY diff --git a/boards/px4/fmu-v2/multicopter.cmake b/boards/px4/fmu-v2/multicopter.cmake index f6b8011e20..5bf50a5f8c 100644 --- a/boards/px4/fmu-v2/multicopter.cmake +++ b/boards/px4/fmu-v2/multicopter.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR px4 - MODEL fmu-v2 - LABEL multicopter TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 CONSTRAINED_MEMORY diff --git a/boards/px4/fmu-v2/rover.cmake b/boards/px4/fmu-v2/rover.cmake index c6332b80ec..62bd55e8b8 100644 --- a/boards/px4/fmu-v2/rover.cmake +++ b/boards/px4/fmu-v2/rover.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR px4 - MODEL fmu-v2 - LABEL rover TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 CONSTRAINED_MEMORY diff --git a/boards/px4/fmu-v2/test.cmake b/boards/px4/fmu-v2/test.cmake index cdd996eb54..3599c72d89 100644 --- a/boards/px4/fmu-v2/test.cmake +++ b/boards/px4/fmu-v2/test.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR px4 - MODEL fmu-v2 - LABEL test TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 CONSTRAINED_MEMORY diff --git a/boards/px4/fmu-v3/default.cmake b/boards/px4/fmu-v3/default.cmake index 30c49f1839..1c7a331669 100644 --- a/boards/px4/fmu-v3/default.cmake +++ b/boards/px4/fmu-v3/default.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR px4 - MODEL fmu-v3 - LABEL default TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 CONSTRAINED_MEMORY diff --git a/boards/px4/fmu-v3/test.cmake b/boards/px4/fmu-v3/test.cmake index 48f75098ad..f761c3a09b 100644 --- a/boards/px4/fmu-v3/test.cmake +++ b/boards/px4/fmu-v3/test.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR px4 - MODEL fmu-v3 - LABEL test TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 CONSTRAINED_MEMORY diff --git a/boards/px4/fmu-v4/cannode.cmake b/boards/px4/fmu-v4/cannode.cmake index f70382ddc6..645d756056 100644 --- a/boards/px4/fmu-v4/cannode.cmake +++ b/boards/px4/fmu-v4/cannode.cmake @@ -20,9 +20,6 @@ add_definitions( px4_add_board( PLATFORM nuttx - VENDOR px4 - MODEL fmu-v4 - LABEL cannode TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 CONSTRAINED_MEMORY diff --git a/boards/px4/fmu-v4/default.cmake b/boards/px4/fmu-v4/default.cmake index 5dc2f8171c..b1af9c6dc2 100644 --- a/boards/px4/fmu-v4/default.cmake +++ b/boards/px4/fmu-v4/default.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR px4 - MODEL fmu-v4 - LABEL default TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 CONSTRAINED_MEMORY diff --git a/boards/px4/fmu-v4/test.cmake b/boards/px4/fmu-v4/test.cmake index 50041a5b23..584bbbb038 100644 --- a/boards/px4/fmu-v4/test.cmake +++ b/boards/px4/fmu-v4/test.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR px4 - MODEL fmu-v4 - LABEL test TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 CONSTRAINED_MEMORY diff --git a/boards/px4/fmu-v4pro/default.cmake b/boards/px4/fmu-v4pro/default.cmake index 08a20f747c..a32a3aedad 100644 --- a/boards/px4/fmu-v4pro/default.cmake +++ b/boards/px4/fmu-v4pro/default.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR px4 - MODEL fmu-v4pro - LABEL default TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 CONSTRAINED_MEMORY diff --git a/boards/px4/fmu-v4pro/test.cmake b/boards/px4/fmu-v4pro/test.cmake index 81063e5d27..8b3bc795e6 100644 --- a/boards/px4/fmu-v4pro/test.cmake +++ b/boards/px4/fmu-v4pro/test.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR px4 - MODEL fmu-v4pro - LABEL test TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 CONSTRAINED_MEMORY diff --git a/boards/px4/fmu-v5/ctrlalloc.cmake b/boards/px4/fmu-v5/ctrlalloc.cmake index 6495dcc1ec..cb3fe05474 100644 --- a/boards/px4/fmu-v5/ctrlalloc.cmake +++ b/boards/px4/fmu-v5/ctrlalloc.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR px4 - MODEL fmu-v5 - LABEL ctrlalloc TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common diff --git a/boards/px4/fmu-v5/debug.cmake b/boards/px4/fmu-v5/debug.cmake index ff36857423..5ebc233fe0 100644 --- a/boards/px4/fmu-v5/debug.cmake +++ b/boards/px4/fmu-v5/debug.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR px4 - MODEL fmu-v5 - LABEL debug TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common diff --git a/boards/px4/fmu-v5/default.cmake b/boards/px4/fmu-v5/default.cmake index 9a9bebf07f..63080685ed 100644 --- a/boards/px4/fmu-v5/default.cmake +++ b/boards/px4/fmu-v5/default.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR px4 - MODEL fmu-v5 - LABEL default TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common diff --git a/boards/px4/fmu-v5/fixedwing.cmake b/boards/px4/fmu-v5/fixedwing.cmake index 31d7b286d9..b6fc754045 100644 --- a/boards/px4/fmu-v5/fixedwing.cmake +++ b/boards/px4/fmu-v5/fixedwing.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR px4 - MODEL fmu-v5 - LABEL fixedwing TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common diff --git a/boards/px4/fmu-v5/multicopter.cmake b/boards/px4/fmu-v5/multicopter.cmake index 230c5a3c8a..9da3c7c5a1 100644 --- a/boards/px4/fmu-v5/multicopter.cmake +++ b/boards/px4/fmu-v5/multicopter.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR px4 - MODEL fmu-v5 - LABEL multicopter TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common diff --git a/boards/px4/fmu-v5/optimized.cmake b/boards/px4/fmu-v5/optimized.cmake index 8dc891cbac..314173c710 100644 --- a/boards/px4/fmu-v5/optimized.cmake +++ b/boards/px4/fmu-v5/optimized.cmake @@ -5,9 +5,6 @@ add_compile_options(-Wno-error=array-bounds) px4_add_board( PLATFORM nuttx - VENDOR px4 - MODEL fmu-v5 - LABEL optimized TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common diff --git a/boards/px4/fmu-v5/rover.cmake b/boards/px4/fmu-v5/rover.cmake index 0a4c93571b..f4a8d5bf69 100644 --- a/boards/px4/fmu-v5/rover.cmake +++ b/boards/px4/fmu-v5/rover.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR px4 - MODEL fmu-v5 - LABEL rover TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common diff --git a/boards/px4/fmu-v5/rtps.cmake b/boards/px4/fmu-v5/rtps.cmake index ba8015f543..5547383e77 100644 --- a/boards/px4/fmu-v5/rtps.cmake +++ b/boards/px4/fmu-v5/rtps.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR px4 - MODEL fmu-v5 - LABEL rtps TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common diff --git a/boards/px4/fmu-v5/stackcheck.cmake b/boards/px4/fmu-v5/stackcheck.cmake index b44b19ad35..2d53ab6b8a 100644 --- a/boards/px4/fmu-v5/stackcheck.cmake +++ b/boards/px4/fmu-v5/stackcheck.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR px4 - MODEL fmu-v5 - LABEL stackcheck TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common diff --git a/boards/px4/fmu-v5/test.cmake b/boards/px4/fmu-v5/test.cmake index ca69556d3a..60c6b8cf4a 100644 --- a/boards/px4/fmu-v5/test.cmake +++ b/boards/px4/fmu-v5/test.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR px4 - MODEL fmu-v5 - LABEL test TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common diff --git a/boards/px4/fmu-v5/uavcanv0periph.cmake b/boards/px4/fmu-v5/uavcanv0periph.cmake index 3e6897702f..106c65a376 100644 --- a/boards/px4/fmu-v5/uavcanv0periph.cmake +++ b/boards/px4/fmu-v5/uavcanv0periph.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR px4 - MODEL fmu-v5 - LABEL uavcanv0periph TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common diff --git a/boards/px4/fmu-v5/uavcanv1.cmake b/boards/px4/fmu-v5/uavcanv1.cmake index be00ab3ed9..09447f4d7b 100644 --- a/boards/px4/fmu-v5/uavcanv1.cmake +++ b/boards/px4/fmu-v5/uavcanv1.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR px4 - MODEL fmu-v5 - LABEL uavcanv1 TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common diff --git a/boards/px4/fmu-v5x/base_phy_DP83848C.cmake b/boards/px4/fmu-v5x/base_phy_DP83848C.cmake index 584c0a0b0d..d3889eb068 100644 --- a/boards/px4/fmu-v5x/base_phy_DP83848C.cmake +++ b/boards/px4/fmu-v5x/base_phy_DP83848C.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR px4 - MODEL fmu-v5x - LABEL base_phy_DP83848C TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common diff --git a/boards/px4/fmu-v5x/default.cmake b/boards/px4/fmu-v5x/default.cmake index ec34a4fdbd..6293b88397 100644 --- a/boards/px4/fmu-v5x/default.cmake +++ b/boards/px4/fmu-v5x/default.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR px4 - MODEL fmu-v5x - LABEL default TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common diff --git a/boards/px4/fmu-v5x/test.cmake b/boards/px4/fmu-v5x/test.cmake index cffc8df2e3..ab937b8908 100644 --- a/boards/px4/fmu-v5x/test.cmake +++ b/boards/px4/fmu-v5x/test.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR px4 - MODEL fmu-v5x - LABEL test TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common diff --git a/boards/px4/fmu-v6u/bootloader.cmake b/boards/px4/fmu-v6u/bootloader.cmake index 48735b897f..05f7f2e248 100644 --- a/boards/px4/fmu-v6u/bootloader.cmake +++ b/boards/px4/fmu-v6u/bootloader.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR px4 - MODEL fmu-v6u - LABEL bootloader TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ) diff --git a/boards/px4/fmu-v6u/default.cmake b/boards/px4/fmu-v6u/default.cmake index 4ceb5ad77f..aa2ac66ee9 100644 --- a/boards/px4/fmu-v6u/default.cmake +++ b/boards/px4/fmu-v6u/default.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR px4 - MODEL fmu-v6u - LABEL default TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common diff --git a/boards/px4/fmu-v6u/test.cmake b/boards/px4/fmu-v6u/test.cmake index f934a7ec4a..23e626864d 100644 --- a/boards/px4/fmu-v6u/test.cmake +++ b/boards/px4/fmu-v6u/test.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR px4 - MODEL fmu-v6u - LABEL test TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common diff --git a/boards/px4/fmu-v6x/bootloader.cmake b/boards/px4/fmu-v6x/bootloader.cmake index 5de42a9f72..05f7f2e248 100644 --- a/boards/px4/fmu-v6x/bootloader.cmake +++ b/boards/px4/fmu-v6x/bootloader.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR px4 - MODEL fmu-v6x - LABEL bootloader TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ) diff --git a/boards/px4/fmu-v6x/default.cmake b/boards/px4/fmu-v6x/default.cmake index 2f5aebf267..92751faa81 100644 --- a/boards/px4/fmu-v6x/default.cmake +++ b/boards/px4/fmu-v6x/default.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR px4 - MODEL fmu-v6x - LABEL default TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common diff --git a/boards/px4/fmu-v6x/test.cmake b/boards/px4/fmu-v6x/test.cmake index 48a13002cd..db7050dafc 100644 --- a/boards/px4/fmu-v6x/test.cmake +++ b/boards/px4/fmu-v6x/test.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR px4 - MODEL fmu-v6x - LABEL test TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common diff --git a/boards/px4/io-v2/default.cmake b/boards/px4/io-v2/default.cmake index 21956f2e9b..6461439f86 100644 --- a/boards/px4/io-v2/default.cmake +++ b/boards/px4/io-v2/default.cmake @@ -1,8 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR px4 - MODEL io-v2 TOOLCHAIN arm-none-eabi CONSTRAINED_FLASH ARCHITECTURE cortex-m3 diff --git a/boards/px4/raspberrypi/default.cmake b/boards/px4/raspberrypi/default.cmake index c1407d649f..3a344a7237 100644 --- a/boards/px4/raspberrypi/default.cmake +++ b/boards/px4/raspberrypi/default.cmake @@ -3,9 +3,6 @@ add_definitions( ) px4_add_board( - VENDOR px4 - MODEL raspberrypi - LABEL default PLATFORM posix ARCHITECTURE cortex-a53 ROMFSROOT px4fmu_common diff --git a/boards/px4/sitl/ctrlalloc.cmake b/boards/px4/sitl/ctrlalloc.cmake index 45571cff0c..3e046829d8 100644 --- a/boards/px4/sitl/ctrlalloc.cmake +++ b/boards/px4/sitl/ctrlalloc.cmake @@ -1,10 +1,7 @@ px4_add_board( PLATFORM posix - VENDOR px4 - MODEL sitl ROMFSROOT px4fmu_common - LABEL ctrlalloc TESTING DRIVERS #barometer # all available barometer drivers diff --git a/boards/px4/sitl/default.cmake b/boards/px4/sitl/default.cmake index 6bf5e1de3b..ee55255f3d 100644 --- a/boards/px4/sitl/default.cmake +++ b/boards/px4/sitl/default.cmake @@ -1,10 +1,7 @@ px4_add_board( PLATFORM posix - VENDOR px4 - MODEL sitl ROMFSROOT px4fmu_common - LABEL default TESTING ETHERNET DRIVERS diff --git a/boards/px4/sitl/nolockstep.cmake b/boards/px4/sitl/nolockstep.cmake index 308920a272..dc8747c6bf 100644 --- a/boards/px4/sitl/nolockstep.cmake +++ b/boards/px4/sitl/nolockstep.cmake @@ -1,10 +1,7 @@ px4_add_board( PLATFORM posix - VENDOR px4 - MODEL sitl ROMFSROOT px4fmu_common - LABEL nolockstep TESTING DRIVERS #barometer # all available barometer drivers diff --git a/boards/px4/sitl/replay.cmake b/boards/px4/sitl/replay.cmake index fca852c46c..c437f80b4f 100644 --- a/boards/px4/sitl/replay.cmake +++ b/boards/px4/sitl/replay.cmake @@ -1,10 +1,7 @@ px4_add_board( PLATFORM posix - VENDOR px4 - MODEL sitl ROMFSROOT px4fmu_common - LABEL replay MODULES ekf2 logger diff --git a/boards/px4/sitl/rtps.cmake b/boards/px4/sitl/rtps.cmake index a446b93f2e..454bbc141f 100644 --- a/boards/px4/sitl/rtps.cmake +++ b/boards/px4/sitl/rtps.cmake @@ -1,10 +1,7 @@ px4_add_board( PLATFORM posix - VENDOR px4 - MODEL sitl ROMFSROOT px4fmu_common - LABEL rtps TESTING DRIVERS #barometer # all available barometer drivers diff --git a/boards/px4/sitl/test.cmake b/boards/px4/sitl/test.cmake index e950e9579d..cab5707d25 100644 --- a/boards/px4/sitl/test.cmake +++ b/boards/px4/sitl/test.cmake @@ -1,10 +1,7 @@ px4_add_board( PLATFORM posix - VENDOR px4 - MODEL sitl ROMFSROOT px4fmu_common - LABEL test TESTING DRIVERS #barometer # all available barometer drivers diff --git a/boards/scumaker/pilotpi/arm64.cmake b/boards/scumaker/pilotpi/arm64.cmake index 408e5730c6..e6c8b4e0d8 100644 --- a/boards/scumaker/pilotpi/arm64.cmake +++ b/boards/scumaker/pilotpi/arm64.cmake @@ -3,9 +3,6 @@ add_definitions( ) px4_add_board( - VENDOR scumaker - MODEL pilotpi - LABEL arm64 PLATFORM posix ARCHITECTURE cortex-a53 ROMFSROOT px4fmu_common diff --git a/boards/scumaker/pilotpi/default.cmake b/boards/scumaker/pilotpi/default.cmake index 0851f9c653..8b02cef63f 100644 --- a/boards/scumaker/pilotpi/default.cmake +++ b/boards/scumaker/pilotpi/default.cmake @@ -3,9 +3,6 @@ add_definitions( ) px4_add_board( - VENDOR scumaker - MODEL pilotpi - LABEL default PLATFORM posix ARCHITECTURE cortex-a53 ROMFSROOT px4fmu_common diff --git a/boards/spracing/h7extreme/default.cmake b/boards/spracing/h7extreme/default.cmake index 250247064e..5ec64bb064 100644 --- a/boards/spracing/h7extreme/default.cmake +++ b/boards/spracing/h7extreme/default.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR spracing - MODEL h7extreme - LABEL default TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common diff --git a/boards/uvify/core/default.cmake b/boards/uvify/core/default.cmake index 591b1d17bd..b038cdbbcb 100644 --- a/boards/uvify/core/default.cmake +++ b/boards/uvify/core/default.cmake @@ -1,9 +1,6 @@ px4_add_board( PLATFORM nuttx - VENDOR uvify - MODEL core - LABEL default TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 CONSTRAINED_MEMORY diff --git a/cmake/px4_add_board.cmake b/cmake/px4_add_board.cmake index 4b874e9379..f8d3c4dd34 100644 --- a/cmake/px4_add_board.cmake +++ b/cmake/px4_add_board.cmake @@ -40,9 +40,6 @@ # Usage: # px4_add_board( # PLATFORM -# VENDOR -# MODEL -# [ LABEL ] # [ TOOLCHAIN ] # [ ARCHITECTURE ] # [ ROMFSROOT ] @@ -68,9 +65,6 @@ # # Input: # PLATFORM : PX4 platform name (posix, nuttx, qurt) -# VENDOR : name of board vendor/manufacturer/brand/etc -# MODEL : name of board model -# LABEL : optional label, set to default if not specified # TOOLCHAIN : cmake toolchain # ARCHITECTURE : name of the CPU CMake is building for (used by the toolchain) # ROMFSROOT : relative path to the ROMFS root directory @@ -97,8 +91,6 @@ # Example: # px4_add_board( # PLATFORM nuttx -# VENDOR px4 -# MODEL fmu-v5 # TOOLCHAIN arm-none-eabi # ARCHITECTURE cortex-m7 # ROMFSROOT px4fmu_common @@ -145,9 +137,6 @@ function(px4_add_board) NAME px4_add_board ONE_VALUE PLATFORM - VENDOR - MODEL - LABEL TOOLCHAIN ARCHITECTURE ROMFSROOT @@ -174,13 +163,17 @@ function(px4_add_board) ETHERNET REQUIRED PLATFORM - VENDOR - MODEL ARGN ${ARGN}) set(PX4_BOARD_DIR ${CMAKE_CURRENT_LIST_DIR} CACHE STRING "PX4 board directory" FORCE) include_directories(${PX4_BOARD_DIR}/src) + # get the VENDOR & MODEL from the caller's directory names + get_filename_component(base_dir "${CMAKE_CURRENT_LIST_FILE}" DIRECTORY) + get_filename_component(MODEL "${base_dir}" NAME) + get_filename_component(base_dir "${base_dir}" DIRECTORY) + get_filename_component(VENDOR "${base_dir}" NAME) + set(PX4_BOARD ${VENDOR}_${MODEL} CACHE STRING "PX4 board" FORCE) # board name is uppercase with no underscores when used as a define @@ -191,11 +184,10 @@ function(px4_add_board) set(PX4_BOARD_VENDOR ${VENDOR} CACHE STRING "PX4 board vendor" FORCE) set(PX4_BOARD_MODEL ${MODEL} CACHE STRING "PX4 board model" FORCE) - if(LABEL) - set(PX4_BOARD_LABEL ${LABEL} CACHE STRING "PX4 board label" FORCE) - else() - set(PX4_BOARD_LABEL "default" CACHE STRING "PX4 board label" FORCE) + if(NOT LABEL) + get_filename_component(LABEL "${CMAKE_CURRENT_LIST_FILE}" NAME_WE) endif() + set(PX4_BOARD_LABEL ${LABEL} CACHE STRING "PX4 board label" FORCE) set(PX4_CONFIG "${PX4_BOARD_VENDOR}_${PX4_BOARD_MODEL}_${PX4_BOARD_LABEL}" CACHE STRING "PX4 config" FORCE)