diff --git a/boards/intel/aerofc-v1/nuttx-config/include/board.h b/boards/intel/aerofc-v1/nuttx-config/include/board.h
index 39c9065946..a024bedd3c 100644
--- a/boards/intel/aerofc-v1/nuttx-config/include/board.h
+++ b/boards/intel/aerofc-v1/nuttx-config/include/board.h
@@ -40,6 +40,7 @@
 /************************************************************************************
  * Included Files
  ************************************************************************************/
+#include "board_dma_map.h"
 
 #include <nuttx/config.h>
 
@@ -219,7 +220,6 @@
 // ESC
 #define GPIO_USART1_TX	GPIO_USART1_TX_2
 #define GPIO_USART1_RX	GPIO_USART1_RX_2
-#define DMAMAP_USART1_RX DMAMAP_USART1_RX_2
 
 // Companion
 #define GPIO_USART2_TX	GPIO_USART2_TX_1
@@ -245,7 +245,6 @@
 // Serial console
 #define GPIO_USART6_TX	GPIO_USART6_TX_1
 #define GPIO_USART6_RX	GPIO_USART6_RX_1
-#define DMAMAP_USART6_RX DMAMAP_USART6_RX_2
 
 /*
  * I2C
diff --git a/boards/intel/aerofc-v1/nuttx-config/include/board_dma_map.h b/boards/intel/aerofc-v1/nuttx-config/include/board_dma_map.h
new file mode 100644
index 0000000000..4a9df10477
--- /dev/null
+++ b/boards/intel/aerofc-v1/nuttx-config/include/board_dma_map.h
@@ -0,0 +1,54 @@
+/****************************************************************************
+ *
+ *   Copyright (c) 2020 PX4 Development Team. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name PX4 nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+#pragma once
+
+
+// DMA1 Channel/Stream Selections
+//--------------------------------------------//---------------------------//----------------
+//      DMAMAP_UART5_RX                       // DMA1, Stream 0, Channel 4
+//      AVAILABLE                             // DMA1, Stream 1
+//      DMAMAP_UART4_RX                       // DMA1, Stream 2, Channel 4
+//      DMAMAP_UART7_RX                       // DMA1, Stream 3, Channel 5
+//      AVAILABLE                             // DMA1, Stream 4
+//      DMAMAP_USART2_RX                      // DMA1, Stream 5, Channel 4
+
+
+//  DMA2 Channel/Stream Selections
+//--------------------------------------------//---------------------------//----------------
+#define DMACHAN_SPI1_RX    DMAMAP_SPI1_RX_1   // DMA2, Stream 0, Channel 3    (SPI sensors RX)
+#define DMAMAP_USART6_RX   DMAMAP_USART6_RX_1 // DMA2, Stream 1, Channel 4    (CONSOLE)
+#define DMAMAP_USART1_RX   DMAMAP_USART1_RX_1 // DMA2, Stream 2, Channel 4
+#define DMACHAN_SPI1_TX    DMAMAP_SPI1_TX_1   // DMA2, Stream 3, Channel 3    (SPI sensors TX)
+//      AVAILABLE                             // DMA2, Stream 4
+//      AVAILABLE                             // DMA2, Stream 5
diff --git a/boards/intel/aerofc-v1/nuttx-config/nsh/defconfig b/boards/intel/aerofc-v1/nuttx-config/nsh/defconfig
index 522610e1db..3edad3b3a2 100644
--- a/boards/intel/aerofc-v1/nuttx-config/nsh/defconfig
+++ b/boards/intel/aerofc-v1/nuttx-config/nsh/defconfig
@@ -161,6 +161,8 @@ CONFIG_STM32_RTC_MAGIC_REG=1
 CONFIG_STM32_SERIALBRK_BSDCOMPAT=y
 CONFIG_STM32_SERIAL_DISABLE_REORDERING=y
 CONFIG_STM32_SPI1=y
+CONFIG_STM32_SPI1_DMA=y
+CONFIG_STM32_SPI_DMA=y
 CONFIG_STM32_TIM10=y
 CONFIG_STM32_TIM11=y
 CONFIG_STM32_TIM1=y