Mirrors_Framework/rt-thread
1
0 Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2026-11-09 20:45:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Hao Zhu committed 2018-12-11 23:08:55 +08:00
2 parents b9b05fff4b 54053454e6
commit 757232cdb6
5 files changed
+138 -111
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

bsp/lpc54114-lite/drivers/Kconfig
+6
View File
@@ -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
+4
View File
@@ -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.uvoptx
+121 -109
View File
File diff suppressed because it is too large. Load diff
bsp/lpc54114-lite/project.uvprojx
+5
View File
@@ -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
+2 -2
View File
@@ -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, \