Browse Source

Merge pull request #12 from RT-Thread/master

update
Meco Man 4 years ago
parent
commit
7405618eaf
2 changed files with 10 additions and 1 deletions
  1. 1 1
      bsp/imxrt/libraries/drivers/drv_uart.c
  2. 9 0
      bsp/nrf5x/nrf52840/board/Kconfig

+ 1 - 1
bsp/imxrt/libraries/drivers/drv_uart.c

@@ -206,7 +206,7 @@ static void uart_get_dma_config(void)
     uarts[LPUART2_INDEX].dma_flag |= RT_DEVICE_FLAG_DMA_RX;
 #endif
 #ifdef BSP_LPUART2_TX_USING_DMA
-    static struct dma_tx_config uart2_dma_tx = {.request = kDmaRequestMuxLPUART4Tx, .channel = BSP_LPUART2_TX_DMA_CHANNEL};
+    static struct dma_tx_config uart2_dma_tx = {.request = kDmaRequestMuxLPUART2Tx, .channel = BSP_LPUART2_TX_DMA_CHANNEL};
     uarts[LPUART2_INDEX].dma_tx = &uart2_dma_tx;
     uarts[LPUART2_INDEX].dma_flag |= RT_DEVICE_FLAG_DMA_TX;
 #endif

+ 9 - 0
bsp/nrf5x/nrf52840/board/Kconfig

@@ -325,6 +325,9 @@ menu "On-chip Peripheral Drivers"
                 bool "Enable SPI0 bus"
                 default y
             if BSP_USING_SPI0
+                config NRFX_SPI0_ENABLED
+                    int "Enable SPI0 instance"
+                    default 1
                 config BSP_SPI0_SCK_PIN
                     int "SPI0 sck pin number set"
                     range 0 47
@@ -347,6 +350,9 @@ menu "On-chip Peripheral Drivers"
                 bool "Enable SPI1 bus"
                 default n
             if BSP_USING_SPI1
+                config NRFX_SPI1_ENABLED
+                    int "Enable SPI1 instance"
+                    default 1
                 config BSP_SPI1_SCK_PIN
                     int "SPI0 sck pin number set"
                     range 0 47
@@ -369,6 +375,9 @@ menu "On-chip Peripheral Drivers"
                 bool "Enable SPI2 bus"
                 default n
             if BSP_USING_SPI2
+                config NRFX_SPI2_ENABLED
+                    int "Enable SPI2 instance"
+                    default 1
                 config BSP_SPI2_SCK_PIN
                     int "SPI0 sck pin number set"
                     range 0 47