cmake remove need for platform px4_add_board_os

- explicitly set TOOLCHAIN on all NuttX targets
2026-05-21 01:12:11 +00:00 · 2018-11-23 10:01:03 -05:00
parent f22f331e4a
commit fa0fe4cac6
40 changed files with 80 additions and 373 deletions
--- a/boards/aerotenna/ocpoc/ubuntu.cmake
+++ b/boards/aerotenna/ocpoc/ubuntu.cmake
@@ -5,7 +5,7 @@ px4_add_board(
 	LABEL ubuntu
 	PLATFORM posix
 	ARCH cortex-a9
-	TOOLCHAIN Toolchain-arm-linux-gnueabihf
+	TOOLCHAIN arm-linux-gnueabihf
 	TESTING

 	DRIVERS
--- a/boards/airmind/mindpx-v2/default.cmake
+++ b/boards/airmind/mindpx-v2/default.cmake
@@ -3,6 +3,7 @@ px4_add_board(
 	PLATFORM nuttx
 	VENDOR airmind
 	MODEL mindpx-v2
+	TOOLCHAIN arm-none-eabi
 	ARCH cortex-m4
 	ROMFS
 	ROMFSROOT px4fmu_common
--- a/boards/atlflight/eagle/default.cmake
+++ b/boards/atlflight/eagle/default.cmake
@@ -3,7 +3,10 @@

 include(px4_git)
 px4_add_git_submodule(TARGET git_cmake_hexagon PATH "${PX4_SOURCE_DIR}/boards/atlflight/cmake_hexagon")
-list(APPEND CMAKE_MODULE_PATH "${PX4_SOURCE_DIR}/boards/atlflight/cmake_hexagon")
+list(APPEND CMAKE_MODULE_PATH
+	"${PX4_SOURCE_DIR}/boards/atlflight/cmake_hexagon"
+	"${PX4_SOURCE_DIR}/boards/atlflight/cmake_hexagon/toolchain"
+	)

 # Get $QC_SOC_TARGET from environment if existing.
 if (DEFINED ENV{QC_SOC_TARGET})
@@ -32,8 +35,7 @@ px4_add_board(
 	MODEL eagle
 	LABEL default
 	TESTING
-	TOOLCHAIN
-		toolchain/Toolchain-arm-linux-gnueabihf
+	TOOLCHAIN arm-linux-gnueabihf

 	DRIVERS
 		#barometer # all available barometer drivers
--- a/boards/atlflight/excelsior/default.cmake
+++ b/boards/atlflight/excelsior/default.cmake
@@ -3,7 +3,10 @@

 include(px4_git)
 px4_add_git_submodule(TARGET git_cmake_hexagon PATH "${PX4_SOURCE_DIR}/boards/atlflight/cmake_hexagon")
-list(APPEND CMAKE_MODULE_PATH "${PX4_SOURCE_DIR}/boards/atlflight/cmake_hexagon")
+list(APPEND CMAKE_MODULE_PATH
+	"${PX4_SOURCE_DIR}/boards/atlflight/cmake_hexagon"
+	"${PX4_SOURCE_DIR}/boards/atlflight/cmake_hexagon/toolchain"
+	)

 # Get $QC_SOC_TARGET from environment if existing.
 if (DEFINED ENV{QC_SOC_TARGET})
@@ -32,8 +35,7 @@ px4_add_board(
 	MODEL excelsior
 	LABEL default
 	TESTING
-	TOOLCHAIN
-		toolchain/Toolchain-arm-oemllib32-linux-gnueabi
+	TOOLCHAIN arm-oemllib32-linux-gnueabi

 	DRIVERS
 		#barometer # all available barometer drivers
--- a/boards/atlflight/excelsior/qurt-default.cmake
+++ b/boards/atlflight/excelsior/qurt-default.cmake
@@ -1,3 +1,4 @@
+
 # Excelsior is the code name of a board currently in development.
 #
 # This cmake config builds for QURT which is the operating system running on
--- a/boards/auav/esc35-v1/default.cmake
+++ b/boards/auav/esc35-v1/default.cmake
@@ -40,6 +40,7 @@ px4_add_board(
 	PLATFORM nuttx
 	VENDOR auav
 	MODEL esc35-v1
+	TOOLCHAIN arm-none-eabi
 	ARCH cortex-m4

 	DRIVERS
--- a/boards/auav/x21/default.cmake
+++ b/boards/auav/x21/default.cmake
@@ -4,6 +4,7 @@ px4_add_board(
 	VENDOR auav
 	MODEL x21
 	LABEL default
+	TOOLCHAIN arm-none-eabi
 	ARCH cortex-m4
 	ROMFS
 	ROMFSROOT px4fmu_common
--- a/boards/beaglebone/blue/cross.cmake
+++ b/boards/beaglebone/blue/cross.cmake
@@ -5,7 +5,7 @@ px4_add_board(
 	LABEL cross
 	PLATFORM posix
 	ARCH cortex-a8
-	TOOLCHAIN Toolchain-arm-linux-gnueabihf
+	TOOLCHAIN arm-linux-gnueabihf
 	TESTING

 	DRIVERS
--- a/boards/beaglebone/blue/native.cmake
+++ b/boards/beaglebone/blue/native.cmake
@@ -4,7 +4,6 @@ px4_add_board(
 	MODEL blue
 	LABEL native
 	PLATFORM posix
-	TOOLCHAIN Toolchain-native
 	TESTING

 	DRIVERS
--- a/boards/bitcraze/crazyflie/default.cmake
+++ b/boards/bitcraze/crazyflie/default.cmake
@@ -3,6 +3,7 @@ px4_add_board(
 	PLATFORM nuttx
 	VENDOR bitcraze
 	MODEL crazyflie
+	TOOLCHAIN arm-none-eabi
 	ARCH cortex-m4
 	ROMFS
 	ROMFSROOT px4fmu_common
--- a/boards/emlid/navio2/cross.cmake
+++ b/boards/emlid/navio2/cross.cmake
@@ -5,7 +5,7 @@ px4_add_board(
 	LABEL cross
 	PLATFORM posix
 	ARCH cortex-a53
-	TOOLCHAIN Toolchain-arm-linux-gnueabihf
+	TOOLCHAIN arm-linux-gnueabihf
 	TESTING

 	DRIVERS
--- a/boards/emlid/navio2/native.cmake
+++ b/boards/emlid/navio2/native.cmake
@@ -4,7 +4,6 @@ px4_add_board(
 	MODEL navio2
 	LABEL native
 	PLATFORM posix
-	TOOLCHAIN Toolchain-native
 	TESTING

 	DRIVERS
--- a/boards/gumstix/aerocore2/default.cmake
+++ b/boards/gumstix/aerocore2/default.cmake
@@ -3,6 +3,7 @@ px4_add_board(
 	PLATFORM nuttx
 	VENDOR gumstix
 	MODEL aerocore2
+	TOOLCHAIN arm-none-eabi
 	ARCH cortex-m4
 	ROMFS
 	ROMFSROOT px4fmu_common
--- a/boards/intel/aerofc-v1/default.cmake
+++ b/boards/intel/aerofc-v1/default.cmake
@@ -3,6 +3,7 @@ px4_add_board(
 	PLATFORM nuttx
 	VENDOR intel
 	MODEL aerofc-v1
+	TOOLCHAIN arm-none-eabi
 	ARCH cortex-m4
 	ROMFS
 	ROMFSROOT px4fmu_common
--- a/boards/intel/aerofc-v1/rtps.cmake
+++ b/boards/intel/aerofc-v1/rtps.cmake
@@ -4,6 +4,7 @@ px4_add_board(
 	VENDOR intel
 	MODEL aerofc-v1
 	LABEL rtsp
+	TOOLCHAIN arm-none-eabi
 	ARCH cortex-m4
 	ROMFS
 	ROMFSROOT px4fmu_common
--- a/boards/nxp/hlite-v3/default.cmake
+++ b/boards/nxp/hlite-v3/default.cmake
@@ -3,6 +3,7 @@ px4_add_board(
 	PLATFORM nuttx
 	VENDOR nxp
 	MODEL hlite-v3
+	TOOLCHAIN arm-none-eabi
 	ARCH cortex-m4
 	ROMFS
 	ROMFSROOT px4fmu_common
--- a/boards/omnibus/f4sd/default.cmake
+++ b/boards/omnibus/f4sd/default.cmake
@@ -3,6 +3,7 @@ px4_add_board(
 	PLATFORM nuttx
 	VENDOR omnibus
 	MODEL f4sd
+	TOOLCHAIN arm-none-eabi
 	ARCH cortex-m4
 	ROMFS
 	ROMFSROOT px4fmu_common
--- a/boards/parrot/bebop/default.cmake
+++ b/boards/parrot/bebop/default.cmake
@@ -4,7 +4,7 @@ px4_add_board(
 	MODEL bebop
 	PLATFORM posix
 	ARCH cortex-a53
-	TOOLCHAIN Toolchain-arm-linux-gnueabihf
+	TOOLCHAIN arm-linux-gnueabihf

 	DRIVERS
 		gps
--- a/boards/px4/cannode-v1/default.cmake
+++ b/boards/px4/cannode-v1/default.cmake
@@ -38,6 +38,7 @@ px4_add_board(
 	PLATFORM nuttx
 	VENDOR px4
 	MODEL cannode-v1
+	TOOLCHAIN arm-none-eabi
 	ARCH cortex-m3

 	DRIVERS
--- a/boards/px4/esc-v1/default.cmake
+++ b/boards/px4/esc-v1/default.cmake
@@ -40,6 +40,7 @@ px4_add_board(
 	PLATFORM nuttx
 	VENDOR px4
 	MODEL esc-v1
+	TOOLCHAIN arm-none-eabi
 	ARCH cortex-m4

 	DRIVERS
--- a/boards/px4/fmu-v2/default.cmake
+++ b/boards/px4/fmu-v2/default.cmake
@@ -4,6 +4,7 @@ px4_add_board(
 	VENDOR px4
 	MODEL fmu-v2
 	LABEL default
+	TOOLCHAIN arm-none-eabi
 	ARCH cortex-m4
 	ROMFS
 	ROMFSROOT px4fmu_common
--- a/boards/px4/fmu-v2/lpe.cmake
+++ b/boards/px4/fmu-v2/lpe.cmake
@@ -4,6 +4,7 @@ px4_add_board(
 	VENDOR px4
 	MODEL fmu-v2
 	LABEL lpe
+	TOOLCHAIN arm-none-eabi
 	ARCH cortex-m4
 	ROMFS
 	ROMFSROOT px4fmu_common
--- a/boards/px4/fmu-v2/test.cmake
+++ b/boards/px4/fmu-v2/test.cmake
@@ -4,6 +4,7 @@ px4_add_board(
 	VENDOR px4
 	MODEL fmu-v2
 	LABEL test
+	TOOLCHAIN arm-none-eabi
 	ARCH cortex-m4
 	ROMFS
 	ROMFSROOT px4fmu_test
--- a/boards/px4/fmu-v3/default.cmake
+++ b/boards/px4/fmu-v3/default.cmake
@@ -6,6 +6,7 @@ px4_add_board(
 	VENDOR px4
 	MODEL fmu-v3
 	LABEL default
+	TOOLCHAIN arm-none-eabi
 	ARCH cortex-m4
 	ROMFS
 	ROMFSROOT px4fmu_common
--- a/boards/px4/fmu-v3/rtps.cmake
+++ b/boards/px4/fmu-v3/rtps.cmake
@@ -6,6 +6,7 @@ px4_add_board(
 	VENDOR px4
 	MODEL fmu-v3
 	LABEL rtps
+	TOOLCHAIN arm-none-eabi
 	ARCH cortex-m4
 	ROMFS
 	ROMFSROOT px4fmu_common
--- a/boards/px4/fmu-v3/stackcheck.cmake
+++ b/boards/px4/fmu-v3/stackcheck.cmake
@@ -6,6 +6,7 @@ px4_add_board(
 	VENDOR px4
 	MODEL fmu-v3
 	LABEL stackcheck
+	TOOLCHAIN arm-none-eabi
 	ARCH cortex-m4
 	ROMFS
 	ROMFSROOT px4fmu_common
--- a/boards/px4/fmu-v4/default.cmake
+++ b/boards/px4/fmu-v4/default.cmake
@@ -4,6 +4,7 @@ px4_add_board(
 	VENDOR px4
 	MODEL fmu-v4
 	LABEL default
+	TOOLCHAIN arm-none-eabi
 	ARCH cortex-m4
 	ROMFS
 	ROMFSROOT px4fmu_common
--- a/boards/px4/fmu-v4/rtps.cmake
+++ b/boards/px4/fmu-v4/rtps.cmake
@@ -4,6 +4,7 @@ px4_add_board(
 	VENDOR px4
 	MODEL fmu-v4
 	LABEL rtps
+	TOOLCHAIN arm-none-eabi
 	ARCH cortex-m4
 	ROMFS
 	ROMFSROOT px4fmu_common
--- a/boards/px4/fmu-v4/stackcheck.cmake
+++ b/boards/px4/fmu-v4/stackcheck.cmake
@@ -4,6 +4,7 @@ px4_add_board(
 	VENDOR px4
 	MODEL fmu-v4
 	LABEL stackcheck
+	TOOLCHAIN arm-none-eabi
 	ARCH cortex-m4
 	ROMFS
 	ROMFSROOT px4fmu_common
--- a/boards/px4/fmu-v4pro/default.cmake
+++ b/boards/px4/fmu-v4pro/default.cmake
@@ -4,6 +4,7 @@ px4_add_board(
 	VENDOR px4
 	MODEL fmu-v4pro
 	LABEL default
+	TOOLCHAIN arm-none-eabi
 	ARCH cortex-m4
 	ROMFS
 	ROMFSROOT px4fmu_common
--- a/boards/px4/fmu-v4pro/rtps.cmake
+++ b/boards/px4/fmu-v4pro/rtps.cmake
@@ -4,6 +4,7 @@ px4_add_board(
 	VENDOR px4
 	MODEL fmu-v4pro
 	LABEL default
+	TOOLCHAIN arm-none-eabi
 	ARCH cortex-m4
 	ROMFS
 	ROMFSROOT px4fmu_common
--- a/boards/px4/io-v2/default.cmake
+++ b/boards/px4/io-v2/default.cmake
@@ -3,6 +3,7 @@ px4_add_board(
 	PLATFORM nuttx
 	VENDOR px4
 	MODEL io-v2
+	TOOLCHAIN arm-none-eabi
 	ARCH cortex-m3
 	DRIVERS
 		stm32
--- a/boards/px4/raspberrypi/native.cmake
+++ b/boards/px4/raspberrypi/native.cmake
@@ -4,7 +4,6 @@ px4_add_board(
 	MODEL raspberrypi
 	LABEL native
 	PLATFORM posix
-	TOOLCHAIN Toolchain-native
 	TESTING

 	DRIVERS
--- a/boards/stm/32f4discovery/default.cmake
+++ b/boards/stm/32f4discovery/default.cmake
@@ -3,6 +3,7 @@ px4_add_board(
 	PLATFORM nuttx
 	VENDOR stm
 	MODEL 32f4discovery
+	TOOLCHAIN arm-none-eabi
 	ARCH cortex-m4
 	ROMFS
 	ROMFSROOT px4fmu_common
--- a/boards/thiemar/s2740vc-v1/default.cmake
+++ b/boards/thiemar/s2740vc-v1/default.cmake
@@ -31,6 +31,7 @@ px4_add_board(
 	PLATFORM nuttx
 	VENDOR thiemar
 	MODEL s2740vc-v1
+	TOOLCHAIN arm-none-eabi
 	ARCH cortex-m4

 	DRIVERS