From 694ae56afea4fdcd7d8ef665ab7a516e758dd7df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beat=20K=C3=BCng?= Date: Fri, 30 Aug 2019 14:41:18 +0200 Subject: [PATCH] px4/io-v2: update nuttx config px4_io - add knob to ensure ARCH_MATH_H is kept Upstream changes added ARCH_HAVE_MATH_H to protect from archs without math.h from causing isses for users setting CONFIG_ARCH_MATH_H and getting errors. PX4 provides a math.h and we need CONFIG_ARCH_MATH_H set. So this Selects ARCH_HAVE_MATH_H perserving CONFIG_ARCH_MATH_H a defconfig --- boards/px4/io-v2/nuttx-config/Kconfig | 9 +++++++++ boards/px4/io-v2/nuttx-config/drivers/Kconfig | 1 + boards/px4/io-v2/nuttx-config/nsh/defconfig | 5 +++-- 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 boards/px4/io-v2/nuttx-config/Kconfig create mode 100644 boards/px4/io-v2/nuttx-config/drivers/Kconfig diff --git a/boards/px4/io-v2/nuttx-config/Kconfig b/boards/px4/io-v2/nuttx-config/Kconfig new file mode 100644 index 0000000000..3c3c7347b2 --- /dev/null +++ b/boards/px4/io-v2/nuttx-config/Kconfig @@ -0,0 +1,9 @@ +# +# For a description of the syntax of this configuration file, +# see misc/tools/kconfig-language.txt. +# +# Hack to ensure ARCH_MATH_H is kept +config BOARD_HAVE_MATH_H + bool "Provide ARCH math.h (selects ARCH_HAVE_MATH_H)" + default y + select ARCH_HAVE_MATH_H diff --git a/boards/px4/io-v2/nuttx-config/drivers/Kconfig b/boards/px4/io-v2/nuttx-config/drivers/Kconfig new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/boards/px4/io-v2/nuttx-config/drivers/Kconfig @@ -0,0 +1 @@ + diff --git a/boards/px4/io-v2/nuttx-config/nsh/defconfig b/boards/px4/io-v2/nuttx-config/nsh/defconfig index bb71ca56ff..02cdd395be 100644 --- a/boards/px4/io-v2/nuttx-config/nsh/defconfig +++ b/boards/px4/io-v2/nuttx-config/nsh/defconfig @@ -7,8 +7,11 @@ # # CONFIG_DEV_NULL is not set CONFIG_ARCH="arm" +CONFIG_ARCH_BOARD_CUSTOM=y CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config" +CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y CONFIG_ARCH_BOARD_CUSTOM_NAME="px4" +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F100C8=y CONFIG_ARCH_MATH_H=y @@ -22,9 +25,7 @@ CONFIG_DEBUG_SYMBOLS=y CONFIG_DEFAULT_SMALL=y CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_MQUEUE=y -CONFIG_DISABLE_POLL=y CONFIG_DISABLE_PTHREAD=y -CONFIG_DISABLE_SIGNALS=y CONFIG_FDCLONE_DISABLE=y CONFIG_FDCLONE_STDIO=y CONFIG_HAVE_CXX=y