From 58799dc7d17b01e4e586463b23cb83692b678b77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beat=20K=C3=BCng?= Date: Fri, 30 Aug 2019 14:41:33 +0200 Subject: [PATCH] px4/fmu-v5: update nuttx config px4_fmuv5:Needed PROGMEM fmu-v5:Kconfig - 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/fmu-v5/nuttx-config/Kconfig | 6 ++++++ boards/px4/fmu-v5/nuttx-config/drivers/Kconfig | 1 + boards/px4/fmu-v5/nuttx-config/nsh/defconfig | 4 ++++ 3 files changed, 11 insertions(+) create mode 100644 boards/px4/fmu-v5/nuttx-config/drivers/Kconfig diff --git a/boards/px4/fmu-v5/nuttx-config/Kconfig b/boards/px4/fmu-v5/nuttx-config/Kconfig index a7f002b0b0..7913e4a9ca 100644 --- a/boards/px4/fmu-v5/nuttx-config/Kconfig +++ b/boards/px4/fmu-v5/nuttx-config/Kconfig @@ -15,3 +15,9 @@ config BOARD_USE_PROBES ---help--- Select to use GPIO FMU-CH1-8, CAP1-3 to provide timing signals from selected drivers. + +# 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/fmu-v5/nuttx-config/drivers/Kconfig b/boards/px4/fmu-v5/nuttx-config/drivers/Kconfig new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/boards/px4/fmu-v5/nuttx-config/drivers/Kconfig @@ -0,0 +1 @@ + diff --git a/boards/px4/fmu-v5/nuttx-config/nsh/defconfig b/boards/px4/fmu-v5/nuttx-config/nsh/defconfig index f1185bc0c0..9ef4144e69 100644 --- a/boards/px4/fmu-v5/nuttx-config/nsh/defconfig +++ b/boards/px4/fmu-v5/nuttx-config/nsh/defconfig @@ -22,8 +22,11 @@ # CONFIG_NSH_DISABLE_SEMICOLON is not set # CONFIG_NSH_DISABLE_TIME 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="stm32f7" CONFIG_ARCH_CHIP_STM32F765II=y CONFIG_ARCH_CHIP_STM32F7=y CONFIG_ARCH_INTERRUPTSTACK=512 @@ -176,6 +179,7 @@ CONFIG_STM32F7_I2C4=y CONFIG_STM32F7_I2C_DYNTIMEO=y CONFIG_STM32F7_I2C_DYNTIMEO_STARTSTOP=10 CONFIG_STM32F7_OTGFS=y +CONFIG_STM32F7_PROGMEM=y CONFIG_STM32F7_PWR=y CONFIG_STM32F7_RTC=y CONFIG_STM32F7_RTC_HSECLOCK=y