From 685d5cb473355df7e3ac28c7256b49371e1bc0d8 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/modalai/voxl2/default.px4board | 2 +- boards/px4/raspberrypi/default.px4board | 2 +- boards/scumaker/pilotpi/default.px4board | 2 +- cmake/kconfig.cmake | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Kconfig b/Kconfig index 499c95b923..f8b4f3e782 100644 --- a/Kconfig +++ b/Kconfig @@ -40,8 +40,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 e304eec5c2..b04d0574e7 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 c632eb5601..ca13adfbf1 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/modalai/voxl2/default.px4board b/boards/modalai/voxl2/default.px4board index bdef841c5c..1f5de86f2b 100644 --- a/boards/modalai/voxl2/default.px4board +++ b/boards/modalai/voxl2/default.px4board @@ -1,5 +1,5 @@ CONFIG_PLATFORM_POSIX=y -CONFIG_BOARD_LINUX=y +CONFIG_BOARD_LINUX_TARGET=y CONFIG_BOARD_TOOLCHAIN="aarch64-linux-gnu" CONFIG_MODULES_MUORB_APPS=y CONFIG_SYSTEMCMDS_PERF=y diff --git a/boards/px4/raspberrypi/default.px4board b/boards/px4/raspberrypi/default.px4board index b0b52a5158..a9e562f424 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 797ea34c08..9776fce445 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 b27213107f..c5f09082e4 100644 --- a/cmake/kconfig.cmake +++ b/cmake/kconfig.cmake @@ -362,7 +362,7 @@ if(EXISTS ${BOARD_DEFCONFIG}) add_definitions( ${COMPILE_DEFINITIONS}) endif() - if(LINUX) + if(LINUX_TARGET) add_definitions( "-D__PX4_LINUX" ) endif()