diff --git a/boards/px4/fmu-v5x/nuttx-config/Kconfig b/boards/px4/fmu-v5x/nuttx-config/Kconfig
index 520c5abadb..cfb361d30a 100644
--- a/boards/px4/fmu-v5x/nuttx-config/Kconfig
+++ b/boards/px4/fmu-v5x/nuttx-config/Kconfig
@@ -15,3 +15,9 @@ config BOARD_USE_PROBES
 
 	---help---
 		Select to use GPIO FMU-CH1-8, CAP1  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-v5x/nuttx-config/drivers/Kconfig b/boards/px4/fmu-v5x/nuttx-config/drivers/Kconfig
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/boards/px4/fmu-v5x/nuttx-config/nsh/defconfig b/boards/px4/fmu-v5x/nuttx-config/nsh/defconfig
index dbb28a5b28..43e40d4c1d 100644
--- a/boards/px4/fmu-v5x/nuttx-config/nsh/defconfig
+++ b/boards/px4/fmu-v5x/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
@@ -127,12 +130,9 @@ CONFIG_NSH_CMDPARMS=y
 CONFIG_NSH_CROMFSETC=y
 CONFIG_NSH_DISABLE_MB=y
 CONFIG_NSH_DISABLE_MH=y
-CONFIG_NSH_DRIPADDR=0XC0A800FE
-CONFIG_NSH_IPADDR=0XC0A8007B
 CONFIG_NSH_LINELEN=128
 CONFIG_NSH_MAXARGUMENTS=12
 CONFIG_NSH_NESTDEPTH=8
-CONFIG_NSH_NOMAC=y
 CONFIG_NSH_QUOTE=y
 CONFIG_NSH_ROMFSETC=y
 CONFIG_NSH_ROMFSSECTSIZE=128
@@ -200,6 +200,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_PHYSR=16
 CONFIG_STM32F7_PHYSR_100MBPS=0x0
 CONFIG_STM32F7_PHYSR_FULLDUPLEX=0x01