diff --git a/NuttX b/NuttX
index 8d51b780f6..33e56f1a3a 160000
--- a/NuttX
+++ b/NuttX
@@ -1 +1 @@
-Subproject commit 8d51b780f611ad73268a41a8d8007f39a344758a
+Subproject commit 33e56f1a3aac0ef5474c57b565bd9f9e8813b2fb
diff --git a/nuttx-configs/aerocore/nsh/defconfig b/nuttx-configs/aerocore/nsh/defconfig
index c44b074f31..29dff64aad 100644
--- a/nuttx-configs/aerocore/nsh/defconfig
+++ b/nuttx-configs/aerocore/nsh/defconfig
@@ -346,6 +346,7 @@ CONFIG_BOOT_RUNFROMFLASH=y
 #
 # Board Selection
 #
+CONFIG_ARCH_BOARD_AEROCORE=y
 CONFIG_ARCH_BOARD_CUSTOM=y
 CONFIG_ARCH_BOARD=""
 
diff --git a/nuttx-configs/px4fmu-v1/nsh/defconfig b/nuttx-configs/px4fmu-v1/nsh/defconfig
index 539634e3da..86ed041fff 100644
--- a/nuttx-configs/px4fmu-v1/nsh/defconfig
+++ b/nuttx-configs/px4fmu-v1/nsh/defconfig
@@ -3,7 +3,6 @@
 # Nuttx/ Configuration
 #
 CONFIG_NUTTX_NEWCONFIG=y
-
 #
 # Build Setup
 #
@@ -340,6 +339,7 @@ CONFIG_BOOT_RUNFROMFLASH=y
 #
 # Board Selection
 #
+CONFIG_ARCH_BOARD_PX4FMU_V1=y
 CONFIG_ARCH_BOARD_CUSTOM=y
 CONFIG_ARCH_BOARD=""
 
diff --git a/nuttx-configs/px4fmu-v2/nsh/defconfig b/nuttx-configs/px4fmu-v2/nsh/defconfig
index dedebdfa03..6a1aec22bd 100644
--- a/nuttx-configs/px4fmu-v2/nsh/defconfig
+++ b/nuttx-configs/px4fmu-v2/nsh/defconfig
@@ -381,6 +381,7 @@ CONFIG_BOOT_RUNFROMFLASH=y
 #
 # Board Selection
 #
+CONFIG_ARCH_BOARD_PX4FMU_V2=y
 CONFIG_ARCH_BOARD_CUSTOM=y
 CONFIG_ARCH_BOARD=""
 
diff --git a/src/drivers/drv_gpio.h b/src/drivers/drv_gpio.h
index 5acd0d3434..bacafe1dce 100644
--- a/src/drivers/drv_gpio.h
+++ b/src/drivers/drv_gpio.h
@@ -110,6 +110,11 @@
 /* no GPIO driver on the PX4IOv2 board */
 #endif
 
+#if !defined(CONFIG_ARCH_BOARD_PX4IO_V1) && !defined(CONFIG_ARCH_BOARD_PX4IO_V2)  && \
+	!defined(CONFIG_ARCH_BOARD_PX4FMU_V1) && !defined(CONFIG_ARCH_BOARD_PX4FMU_V2) && \
+	!defined(CONFIG_ARCH_BOARD_AEROCORE)
+# error No CONFIG_ARCH_BOARD_xxxx set
+#endif
 /*
  * IOCTL definitions.
  *