diff --git a/boards/av/x-v1/nuttx-config/Kconfig b/boards/av/x-v1/nuttx-config/Kconfig
new file mode 100644
index 0000000000..f9eca7479a
--- /dev/null
+++ b/boards/av/x-v1/nuttx-config/Kconfig
@@ -0,0 +1,5 @@
+# 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/av/x-v1/nuttx-config/drivers/Kconfig b/boards/av/x-v1/nuttx-config/drivers/Kconfig
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/boards/av/x-v1/nuttx-config/nsh/defconfig b/boards/av/x-v1/nuttx-config/nsh/defconfig
index 1ddcd0872e..6a0239b720 100644
--- a/boards/av/x-v1/nuttx-config/nsh/defconfig
+++ b/boards/av/x-v1/nuttx-config/nsh/defconfig
@@ -40,8 +40,11 @@
 # CONFIG_NSH_DISABLE_WGET is not set
 # CONFIG_NSH_DISABLE_XD 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_STM32F777NI=y
 CONFIG_ARCH_CHIP_STM32F7=y
 CONFIG_ARCH_INTERRUPTSTACK=512