Merge remote-tracking branch 'upstream/master'

bsp/lpc54114-lite/drivers/Kconfig

@@ -19,6 +19,12 @@ menu "LPC54110 Bsp Config"
             default y
     endmenu
 
+    config BSP_USING_ROMFS
+        bool "Enable ROMFS"
+        select RT_USING_DFS
+        select RT_USING_DFS_ROMFS
+        default y
+
     config BSP_USING_SDCARD
         bool "Enable SDCARD"
         select BSP_USING_SPI2

bsp/lpc54114-lite/drivers/SConscript

@@ -5,6 +5,7 @@ cwd = GetCurrentDir()
 src = Split("""
 board.c
 clock_config.c
+drv_gpio.c
 """)
 
 CPPPATH = [cwd]
@@ -19,6 +20,9 @@ if GetDepend('BSP_USING_SPI2'):
 if GetDepend('BSP_USING_I2C4'):
     src = src + ['drv_i2c.c'] 
 
+if GetDepend('BSP_USING_ROMFS'):
+    src = src + ['drv_romfs.c'] 
+
 if GetDepend('BSP_USING_SDCARD'):
     src = src + ['drv_sdcard.c'] 
 

bsp/lpc54114-lite/project.uvprojx

@@ -407,6 +407,11 @@
               <FileType>1</FileType>
               <FilePath>drivers\clock_config.c</FilePath>
             </File>
+            <File>
+              <FileName>drv_gpio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>drivers\drv_gpio.c</FilePath>
+            </File>
             <File>
               <FileName>drv_uart.c</FileName>
               <FileType>1</FileType>

bsp/stm32/libraries/HAL_Drivers/config/f4/spi_config.h

@@ -37,8 +37,8 @@
     {                                                    \
         .Instance = SPI2,                                \
         .bus_name = "spi2",                              \
-        .dma_rx.dma_rx.dma_rcc = RCC_AHB1ENR_DMA1EN,     \
-        .dma_tx.dma_rx.dma_rcc = RCC_AHB1ENR_DMA1EN,     \
+        .dma_rx.dma_rcc = RCC_AHB1ENR_DMA1EN,            \
+        .dma_tx.dma_rcc = RCC_AHB1ENR_DMA1EN,            \
         .dma_rx.Instance = DMA1_Stream3,                 \
         .dma_rx.channel = DMA_CHANNEL_0,                 \
         .dma_rx.dma_irq = DMA1_Stream3_IRQn,             \