cmake use standard mechanisms for settings flags

2026-05-21 01:12:11 +00:00 · 2018-11-23 12:39:44 -05:00
parent 11be2b8873
commit 3e0a3559a9
68 changed files with 292 additions and 665 deletions
--- a/boards/aerotenna/ocpoc/ubuntu.cmake
+++ b/boards/aerotenna/ocpoc/ubuntu.cmake
@@ -4,7 +4,7 @@ px4_add_board(
 	MODEL ocpoc
 	LABEL ubuntu
 	PLATFORM posix
-	PROCESSOR cortex-a9
+	ARCHITECTURE cortex-a9
 	TOOLCHAIN arm-linux-gnueabihf
 	TESTING

--- a/boards/airmind/mindpx-v2/default.cmake
+++ b/boards/airmind/mindpx-v2/default.cmake
@@ -4,7 +4,7 @@ px4_add_board(
 	VENDOR airmind
 	MODEL mindpx-v2
 	TOOLCHAIN arm-none-eabi
-	PROCESSOR cortex-m4
+	ARCHITECTURE cortex-m4
 	ROMFSROOT px4fmu_common
 	TESTING
 	UAVCAN_INTERFACES 1
--- a/boards/atlflight/eagle/default.cmake
+++ b/boards/atlflight/eagle/default.cmake
@@ -25,16 +25,24 @@ set(DISABLE_PARAMS_MODULE_SCOPING TRUE)
 set(CONFIG_SHMEM "1")
 add_definitions(-DORB_COMMUNICATOR)

-# This definition allows to differentiate if this just the usual POSIX build
-# or if it is for the Snapdragon.
-add_definitions(-D__PX4_POSIX_EAGLE)
+# atlflight toolchain doesn't properly set the compiler, so these aren't set automatically
+add_compile_options($<$<COMPILE_LANGUAGE:C>:-std=gnu99>)
+add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-std=gnu++11>)
+
+add_definitions(
+	-D__PX4_POSIX_EAGLE
+	-D__PX4_LINUX
+
+	# For DriverFramework
+	-D__DF_LINUX
+)

 px4_add_board(
 	PLATFORM posix
 	VENDOR atlflight
 	MODEL eagle
 	LABEL default
-	TESTING
+	#TESTING
 	TOOLCHAIN arm-linux-gnueabihf

 	DRIVERS
@@ -100,18 +108,18 @@ px4_add_board(
 		reboot
 		sd_bench
 		shutdown
-		tests # tests and test runner
+		#tests # tests and test runner
 		top
 		topic_listener
 		tune_control
 		ver

 	EXAMPLES
-		bottle_drop # OBC challenge
-		fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control
+		#bottle_drop # OBC challenge
+		#fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control
 		#hwtest # Hardware test
-		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
-		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
-		rover_steering_control # Rover example app
-		segway
+		#px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
+		#px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
+		#rover_steering_control # Rover example app
+		#segway
 	)
--- a/boards/atlflight/eagle/src/board_config.h
+++ b/boards/atlflight/eagle/src/board_config.h
@@ -47,8 +47,6 @@

 #define BOARD_NUMBER_BRICKS     0

-#define CONFIG_ARCH_BOARD_SITL 1
-
 /*
 * I2C busses
 */
--- a/boards/atlflight/excelsior/default.cmake
+++ b/boards/atlflight/excelsior/default.cmake
@@ -25,9 +25,17 @@ set(DISABLE_PARAMS_MODULE_SCOPING TRUE)
 set(CONFIG_SHMEM "1")
 add_definitions(-DORB_COMMUNICATOR)

-# This definition allows to differentiate if this just the usual POSIX build
-# or if it is for the Snapdragon.
-add_definitions(-D__PX4_POSIX_EXCELSIOR)
+# atlflight toolchain doesn't properly set the compiler, so these aren't set automatically
+add_compile_options($<$<COMPILE_LANGUAGE:C>:-std=gnu99>)
+add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-std=gnu++11>)
+
+add_definitions(
+	-D__PX4_POSIX_EXCELSIOR
+	-D__PX4_LINUX
+
+	# For DriverFramework
+	-D__DF_LINUX
+)

 px4_add_board(
 	PLATFORM posix
--- a/boards/atmel/same70xplained/default.cmake
+++ b/boards/atmel/same70xplained/default.cmake
@@ -4,7 +4,7 @@ px4_add_board(
 	VENDOR atmel
 	MODEL same70xplained
 	TOOLCHAIN arm-none-eabi
-	PROCESSOR cortex-m7
+	ARCHITECTURE cortex-m7
 	ROMFSROOT px4fmu_common
 	TESTING
 	#UAVCAN_INTERFACES 1
--- a/boards/auav/esc35-v1/default.cmake
+++ b/boards/auav/esc35-v1/default.cmake
@@ -41,7 +41,7 @@ px4_add_board(
 	VENDOR auav
 	MODEL esc35-v1
 	TOOLCHAIN arm-none-eabi
-	PROCESSOR cortex-m4
+	ARCHITECTURE cortex-m4

 	DRIVERS
 		bootloaders
--- a/boards/auav/x21/default.cmake
+++ b/boards/auav/x21/default.cmake
@@ -4,7 +4,7 @@ px4_add_board(
 	VENDOR auav
 	MODEL x21
 	TOOLCHAIN arm-none-eabi
-	PROCESSOR cortex-m4
+	ARCHITECTURE cortex-m4
 	ROMFSROOT px4fmu_common
 	IO px4_io-v2_default
 	TESTING
--- a/boards/av/x-v1/default.cmake
+++ b/boards/av/x-v1/default.cmake
@@ -4,7 +4,7 @@ px4_add_board(
 	VENDOR av
 	MODEL x-v1
 	TOOLCHAIN arm-none-eabi
-	PROCESSOR cortex-m7
+	ARCHITECTURE cortex-m7
 	ROMFSROOT px4fmu_common
 	TESTING
 	UAVCAN_INTERFACES 2
--- a/boards/beaglebone/blue/cross.cmake
+++ b/boards/beaglebone/blue/cross.cmake
@@ -4,7 +4,7 @@ px4_add_board(
 	MODEL blue
 	LABEL cross
 	PLATFORM posix
-	PROCESSOR cortex-a8
+	ARCHITECTURE cortex-a8
 	TOOLCHAIN arm-linux-gnueabihf
 	TESTING

--- a/boards/bitcraze/crazyflie/default.cmake
+++ b/boards/bitcraze/crazyflie/default.cmake
@@ -4,7 +4,7 @@ px4_add_board(
 	VENDOR bitcraze
 	MODEL crazyflie
 	TOOLCHAIN arm-none-eabi
-	PROCESSOR cortex-m4
+	ARCHITECTURE cortex-m4
 	ROMFSROOT px4fmu_common

 	DRIVERS
--- a/boards/emlid/navio2/cross.cmake
+++ b/boards/emlid/navio2/cross.cmake
@@ -4,7 +4,7 @@ px4_add_board(
 	MODEL navio2
 	LABEL cross
 	PLATFORM posix
-	PROCESSOR cortex-a53
+	ARCHITECTURE cortex-a53
 	TOOLCHAIN arm-linux-gnueabihf
 	TESTING

--- a/boards/gumstix/aerocore2/default.cmake
+++ b/boards/gumstix/aerocore2/default.cmake
@@ -4,7 +4,7 @@ px4_add_board(
 	VENDOR gumstix
 	MODEL aerocore2
 	TOOLCHAIN arm-none-eabi
-	PROCESSOR cortex-m4
+	ARCHITECTURE cortex-m4
 	ROMFSROOT px4fmu_common
 	UAVCAN_INTERFACES 1

--- a/boards/intel/aerofc-v1/default.cmake
+++ b/boards/intel/aerofc-v1/default.cmake
@@ -4,7 +4,7 @@ px4_add_board(
 	VENDOR intel
 	MODEL aerofc-v1
 	TOOLCHAIN arm-none-eabi
-	PROCESSOR cortex-m4
+	ARCHITECTURE cortex-m4
 	ROMFSROOT px4fmu_common

 	SERIAL_PORTS
--- a/boards/intel/aerofc-v1/rtps.cmake
+++ b/boards/intel/aerofc-v1/rtps.cmake
@@ -5,7 +5,7 @@ px4_add_board(
 	MODEL aerofc-v1
 	LABEL rtsp
 	TOOLCHAIN arm-none-eabi
-	PROCESSOR cortex-m4
+	ARCHITECTURE cortex-m4
 	ROMFSROOT px4fmu_common

 	SERIAL_PORTS
--- a/boards/nxp/hlite-v3/default.cmake
+++ b/boards/nxp/hlite-v3/default.cmake
@@ -4,7 +4,7 @@ px4_add_board(
 	VENDOR nxp
 	MODEL hlite-v3
 	TOOLCHAIN arm-none-eabi
-	PROCESSOR cortex-m4
+	ARCHITECTURE cortex-m4
 	ROMFSROOT px4fmu_common
 	TESTING
 	UAVCAN_INTERFACES 2
--- a/boards/nxp/hlite-v3/nuttx-config/Kconfig
+++ b/boards/nxp/hlite-v3/nuttx-config/Kconfig
@@ -3,7 +3,7 @@
 # see misc/tools/kconfig-language.txt.
 #

-if ARCH_BOARD_NXPHLITE_V3
+if ARCH_BOARD_NXP_HLITE_V3
 config NXPHLITE_SDHC_AUTOMOUNT
 	bool "SDHC automounter"
 	default n
--- a/boards/nxp/hlite-v3/nuttx-config/include/board.h
+++ b/boards/nxp/hlite-v3/nuttx-config/include/board.h
@@ -35,8 +35,8 @@
 *
 ************************************************************************************/

-#ifndef __CONFIG_NXPHLITE_V3_INCLUDE_BOARD_H
-#define __CONFIG_NXPHLITE_V3_INCLUDE_BOARD_H
+#ifndef __CONFIG_NXP_HLITE_V3_INCLUDE_BOARD_H
+#define __CONFIG_NXP_HLITE_V3_INCLUDE_BOARD_H

 /************************************************************************************
 * Included Files
@@ -556,4 +556,4 @@ void kinetis_boardinitialize(void);
 #endif

 #endif /* __ASSEMBLY__ */
-#endif  /* __CONFIG_NXPHLITE_V23_INCLUDE_BOARD_H */
+#endif  /* __CONFIG_NXP_HLITE_V3_INCLUDE_BOARD_H */
--- a/boards/omnibus/f4sd/default.cmake
+++ b/boards/omnibus/f4sd/default.cmake
@@ -4,7 +4,7 @@ px4_add_board(
 	VENDOR omnibus
 	MODEL f4sd
 	TOOLCHAIN arm-none-eabi
-	PROCESSOR cortex-m4
+	ARCHITECTURE cortex-m4
 	ROMFSROOT px4fmu_common

 	SERIAL_PORTS
--- a/boards/parrot/bebop/default.cmake
+++ b/boards/parrot/bebop/default.cmake
@@ -3,7 +3,7 @@ px4_add_board(
 	VENDOR parrot
 	MODEL bebop
 	PLATFORM posix
-	PROCESSOR cortex-a53
+	ARCHITECTURE cortex-a53
 	TOOLCHAIN arm-linux-gnueabihf

 	DRIVERS
--- a/boards/px4/cannode-v1/default.cmake
+++ b/boards/px4/cannode-v1/default.cmake
@@ -39,7 +39,7 @@ px4_add_board(
 	VENDOR px4
 	MODEL cannode-v1
 	TOOLCHAIN arm-none-eabi
-	PROCESSOR cortex-m3
+	ARCHITECTURE cortex-m3

 	DRIVERS
 		bootloaders
--- a/boards/px4/esc-v1/default.cmake
+++ b/boards/px4/esc-v1/default.cmake
@@ -41,7 +41,7 @@ px4_add_board(
 	VENDOR px4
 	MODEL esc-v1
 	TOOLCHAIN arm-none-eabi
-	PROCESSOR cortex-m4
+	ARCHITECTURE cortex-m4

 	DRIVERS
 		bootloaders
--- a/boards/px4/fmu-v2/default.cmake
+++ b/boards/px4/fmu-v2/default.cmake
@@ -4,7 +4,7 @@ px4_add_board(
 	VENDOR px4
 	MODEL fmu-v2
 	TOOLCHAIN arm-none-eabi
-	PROCESSOR cortex-m4
+	ARCHITECTURE cortex-m4
 	ROMFSROOT px4fmu_common
 	BOOTLOADER ${PX4_SOURCE_DIR}/ROMFS/px4fmu_common/extras/px4fmuv3_bl.bin
 	IO px4_io-v2_default
--- a/boards/px4/fmu-v2/lpe.cmake
+++ b/boards/px4/fmu-v2/lpe.cmake
@@ -5,7 +5,7 @@ px4_add_board(
 	MODEL fmu-v2
 	LABEL lpe
 	TOOLCHAIN arm-none-eabi
-	PROCESSOR cortex-m4
+	ARCHITECTURE cortex-m4
 	ROMFSROOT px4fmu_common
 	BOOTLOADER ${PX4_SOURCE_DIR}/ROMFS/px4fmu_common/extras/px4fmuv3_bl.bin
 	IO px4_io-v2_default
--- a/boards/px4/fmu-v2/test.cmake
+++ b/boards/px4/fmu-v2/test.cmake
@@ -5,7 +5,7 @@ px4_add_board(
 	MODEL fmu-v2
 	LABEL test
 	TOOLCHAIN arm-none-eabi
-	PROCESSOR cortex-m4
+	ARCHITECTURE cortex-m4
 	ROMFSROOT px4fmu_test
 	IO px4_io-v2_default
 	TESTING
--- a/boards/px4/fmu-v3/default.cmake
+++ b/boards/px4/fmu-v3/default.cmake
@@ -7,7 +7,7 @@ px4_add_board(
 	MODEL fmu-v3
 	LABEL default
 	TOOLCHAIN arm-none-eabi
-	PROCESSOR cortex-m4
+	ARCHITECTURE cortex-m4
 	ROMFSROOT px4fmu_common
 	IO px4_io-v2_default
 	TESTING
--- a/boards/px4/fmu-v3/rtps.cmake
+++ b/boards/px4/fmu-v3/rtps.cmake
@@ -7,7 +7,7 @@ px4_add_board(
 	MODEL fmu-v3
 	LABEL rtps
 	TOOLCHAIN arm-none-eabi
-	PROCESSOR cortex-m4
+	ARCHITECTURE cortex-m4
 	ROMFSROOT px4fmu_common
 	IO px4_io-v2_default
 	TESTING
--- a/boards/px4/fmu-v3/stackcheck.cmake
+++ b/boards/px4/fmu-v3/stackcheck.cmake
@@ -7,7 +7,7 @@ px4_add_board(
 	MODEL fmu-v3
 	LABEL stackcheck
 	TOOLCHAIN arm-none-eabi
-	PROCESSOR cortex-m4
+	ARCHITECTURE cortex-m4
 	ROMFSROOT px4fmu_common
 	IO px4_io-v2_default
 	TESTING
--- a/boards/px4/fmu-v4/default.cmake
+++ b/boards/px4/fmu-v4/default.cmake
@@ -5,7 +5,7 @@ px4_add_board(
 	MODEL fmu-v4
 	LABEL default
 	TOOLCHAIN arm-none-eabi
-	PROCESSOR cortex-m4
+	ARCHITECTURE cortex-m4
 	ROMFSROOT px4fmu_common
 	TESTING
 	UAVCAN_INTERFACES 1
--- a/boards/px4/fmu-v4/rtps.cmake
+++ b/boards/px4/fmu-v4/rtps.cmake
@@ -5,7 +5,7 @@ px4_add_board(
 	MODEL fmu-v4
 	LABEL rtps
 	TOOLCHAIN arm-none-eabi
-	PROCESSOR cortex-m4
+	ARCHITECTURE cortex-m4
 	ROMFSROOT px4fmu_common
 	TESTING
 	UAVCAN_INTERFACES 1
--- a/boards/px4/fmu-v4/stackcheck.cmake
+++ b/boards/px4/fmu-v4/stackcheck.cmake
@@ -5,7 +5,7 @@ px4_add_board(
 	MODEL fmu-v4
 	LABEL stackcheck
 	TOOLCHAIN arm-none-eabi
-	PROCESSOR cortex-m4
+	ARCHITECTURE cortex-m4
 	ROMFSROOT px4fmu_common
 	TESTING
 	#UAVCAN_INTERFACES 1
--- a/boards/px4/fmu-v4pro/default.cmake
+++ b/boards/px4/fmu-v4pro/default.cmake
@@ -5,7 +5,7 @@ px4_add_board(
 	MODEL fmu-v4pro
 	LABEL default
 	TOOLCHAIN arm-none-eabi
-	PROCESSOR cortex-m4
+	ARCHITECTURE cortex-m4
 	ROMFSROOT px4fmu_common
 	IO px4_io-v2_default
 	TESTING
--- a/boards/px4/fmu-v4pro/rtps.cmake
+++ b/boards/px4/fmu-v4pro/rtps.cmake
@@ -5,7 +5,7 @@ px4_add_board(
 	MODEL fmu-v4pro
 	LABEL default
 	TOOLCHAIN arm-none-eabi
-	PROCESSOR cortex-m4
+	ARCHITECTURE cortex-m4
 	ROMFSROOT px4fmu_common
 	IO px4_io-v2_default
 	TESTING
--- a/boards/px4/fmu-v4pro/src/board_config.h
+++ b/boards/px4/fmu-v4pro/src/board_config.h
@@ -318,8 +318,6 @@
 * the connector interface and Spektrum requires VDD 3v3 to be controllable
 */

-#define	BOARD_NAME "PX4_FMU_V4PRO"
-
 /* By Providing BOARD_ADC_USB_CONNECTED (using the px4_arch abstraction)
 * this board support the ADC system_power interface, and therefore
 * provides the true logic GPIO BOARD_ADC_xxxx macros.
--- a/boards/px4/fmu-v5/default.cmake
+++ b/boards/px4/fmu-v5/default.cmake
@@ -4,7 +4,7 @@ px4_add_board(
 	VENDOR px4
 	MODEL fmu-v5
 	TOOLCHAIN arm-none-eabi
-	PROCESSOR cortex-m7
+	ARCHITECTURE cortex-m7
 	ROMFSROOT px4fmu_common
 	IO px4_io-v2_default
 	TESTING
--- a/boards/px4/fmu-v5/rtps.cmake
+++ b/boards/px4/fmu-v5/rtps.cmake
@@ -5,7 +5,7 @@ px4_add_board(
 	MODEL fmu-v5
 	LABEL rtps
 	TOOLCHAIN arm-none-eabi
-	PROCESSOR cortex-m7
+	ARCHITECTURE cortex-m7
 	ROMFSROOT px4fmu_common
 	IO px4_io-v2_default
 	TESTING
--- a/boards/px4/fmu-v5/stackcheck.cmake
+++ b/boards/px4/fmu-v5/stackcheck.cmake
@@ -5,7 +5,7 @@ px4_add_board(
 	MODEL fmu-v5
 	LABEL stackcheck
 	TOOLCHAIN arm-none-eabi
-	PROCESSOR cortex-m7
+	ARCHITECTURE cortex-m7
 	ROMFSROOT px4fmu_common
 	IO px4_io-v2_default
 	TESTING
--- a/boards/px4/io-v2/default.cmake
+++ b/boards/px4/io-v2/default.cmake
@@ -4,7 +4,7 @@ px4_add_board(
 	VENDOR px4
 	MODEL io-v2
 	TOOLCHAIN arm-none-eabi
-	PROCESSOR cortex-m3
+	ARCHITECTURE cortex-m3
 	DRIVERS
 		stm32
 	MODULES
--- a/boards/px4/raspberrypi/cross.cmake
+++ b/boards/px4/raspberrypi/cross.cmake
@@ -4,7 +4,7 @@ px4_add_board(
 	MODEL raspberrypi
 	LABEL cross
 	PLATFORM posix
-	PROCESSOR cortex-a53
+	ARCHITECTURE cortex-a53
 	TOOLCHAIN Toolchain-arm-linux-gnueabihf
 	TESTING

--- a/boards/px4/sitl/src/board_config.h
+++ b/boards/px4/sitl/src/board_config.h
@@ -47,8 +47,6 @@
 #define BOARD_HAS_NO_RESET
 #define BOARD_HAS_NO_BOOTLOADER

-#define CONFIG_ARCH_BOARD_SITL 1
-
 #define PX4_I2C_BUS_EXPANSION	1
 #define PX4_I2C_BUS_ONBOARD		2
 #define PX4_NUMBER_I2C_BUSES 1
--- a/boards/stm/32f4discovery/default.cmake
+++ b/boards/stm/32f4discovery/default.cmake
@@ -4,7 +4,7 @@ px4_add_board(
 	VENDOR stm
 	MODEL 32f4discovery
 	TOOLCHAIN arm-none-eabi
-	PROCESSOR cortex-m4
+	ARCHITECTURE cortex-m4
 	ROMFSROOT px4fmu_common
 	#TESTING

--- a/boards/stm/nucleo-F767ZI/default.cmake
+++ b/boards/stm/nucleo-F767ZI/default.cmake
@@ -4,7 +4,7 @@ px4_add_board(
 	VENDOR stm
 	MODEL nucleo-F767ZI
 	TOOLCHAIN arm-none-eabi
-	PROCESSOR cortex-m7
+	ARCHITECTURE cortex-m7
 	ROMFSROOT px4fmu_common
 	TESTING
 	#UAVCAN_INTERFACES 2
--- a/boards/thiemar/s2740vc-v1/default.cmake
+++ b/boards/thiemar/s2740vc-v1/default.cmake
@@ -32,7 +32,7 @@ px4_add_board(
 	VENDOR thiemar
 	MODEL s2740vc-v1
 	TOOLCHAIN arm-none-eabi
-	PROCESSOR cortex-m4
+	ARCHITECTURE cortex-m4

 	DRIVERS
 		bootloaders