From 504d951c75fda334ba6ad0691cef83e8a66e5af4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beat=20K=C3=BCng?= Date: Tue, 13 Dec 2022 13:23:41 +0100 Subject: [PATCH] fix kconfig: rename LINUX to LINUX_TARGET LINUX is defined by cmake >= 3.25: https://cmake.org/cmake/help/latest/variable/LINUX.html --- Kconfig | 4 ++-- boards/beaglebone/blue/default.px4board | 2 +- boards/emlid/navio2/default.px4board | 2 +- boards/px4/raspberrypi/default.px4board | 2 +- boards/scumaker/pilotpi/default.px4board | 2 +- cmake/kconfig.cmake | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Kconfig b/Kconfig index 425cf9fa82..382ce5a91b 100644 --- a/Kconfig +++ b/Kconfig @@ -37,8 +37,8 @@ menu "Toolchain" help forces nolockstep behaviour, despite REPLAY env variable - config BOARD_LINUX - bool "Linux OS" + config BOARD_LINUX_TARGET + bool "Linux OS Target" depends on PLATFORM_POSIX help Board Platform is running the Linux operating system diff --git a/boards/beaglebone/blue/default.px4board b/boards/beaglebone/blue/default.px4board index db48c3e318..a08c32290a 100644 --- a/boards/beaglebone/blue/default.px4board +++ b/boards/beaglebone/blue/default.px4board @@ -1,5 +1,5 @@ CONFIG_PLATFORM_POSIX=y -CONFIG_BOARD_LINUX=y +CONFIG_BOARD_LINUX_TARGET=y CONFIG_BOARD_TOOLCHAIN="arm-linux-gnueabihf" CONFIG_BOARD_ARCHITECTURE="cortex-a8" CONFIG_BOARD_TESTING=y diff --git a/boards/emlid/navio2/default.px4board b/boards/emlid/navio2/default.px4board index 0a5409e8c3..c86f69dcc4 100644 --- a/boards/emlid/navio2/default.px4board +++ b/boards/emlid/navio2/default.px4board @@ -1,5 +1,5 @@ CONFIG_PLATFORM_POSIX=y -CONFIG_BOARD_LINUX=y +CONFIG_BOARD_LINUX_TARGET=y CONFIG_BOARD_TOOLCHAIN="arm-linux-gnueabihf" CONFIG_BOARD_ARCHITECTURE="cortex-a53" CONFIG_BOARD_TESTING=y diff --git a/boards/px4/raspberrypi/default.px4board b/boards/px4/raspberrypi/default.px4board index 5cd14674eb..c1792437f2 100644 --- a/boards/px4/raspberrypi/default.px4board +++ b/boards/px4/raspberrypi/default.px4board @@ -1,5 +1,5 @@ CONFIG_PLATFORM_POSIX=y -CONFIG_BOARD_LINUX=y +CONFIG_BOARD_LINUX_TARGET=y CONFIG_BOARD_TOOLCHAIN="arm-linux-gnueabihf" CONFIG_BOARD_ARCHITECTURE="cortex-a53" CONFIG_BOARD_TESTING=y diff --git a/boards/scumaker/pilotpi/default.px4board b/boards/scumaker/pilotpi/default.px4board index 21cf686403..61907fc459 100644 --- a/boards/scumaker/pilotpi/default.px4board +++ b/boards/scumaker/pilotpi/default.px4board @@ -1,5 +1,5 @@ CONFIG_PLATFORM_POSIX=y -CONFIG_BOARD_LINUX=y +CONFIG_BOARD_LINUX_TARGET=y CONFIG_BOARD_TOOLCHAIN="arm-linux-gnueabihf" CONFIG_BOARD_ARCHITECTURE="cortex-a53" CONFIG_BOARD_TESTING=y diff --git a/cmake/kconfig.cmake b/cmake/kconfig.cmake index 71878e6ba3..58f46d8403 100644 --- a/cmake/kconfig.cmake +++ b/cmake/kconfig.cmake @@ -341,7 +341,7 @@ if(EXISTS ${BOARD_DEFCONFIG}) add_definitions( ${COMPILE_DEFINITIONS}) endif() - if(LINUX) + if(LINUX_TARGET) add_definitions( "-D__PX4_LINUX" ) endif()