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

add audio

Browse Source
This commit is contained in:
WBI\nxf44444
2020-10-26 15:51:03 +08:00
parent b982de3971
commit 3a6b776e6d
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bsp/imxrt/libraries/drivers/SConscript
+1 -4
View File
@@ -45,7 +45,6 @@ if GetDepend('BSP_USING_LCD'):
if GetDepend('BSP_USING_ETH'):
src += ['drv_eth.c']
<<<<<<< HEAD
if GetDepend('BSP_USING_AUDIO'):
src += ['drv_sai.c']
src += ['bsp_wm8960.c']
@@ -53,7 +52,6 @@ if GetDepend('BSP_USING_AUDIO'):
if GetDepend('BSP_USING_SDIO'):
src += ['drv_sdio.c']
=======
if GetDepend('BSP_USING_USB_DEVICE'):
src += ['drv_usbd.c']
src += Glob('usb/device/*.c')
@@ -61,8 +59,7 @@ if GetDepend('BSP_USING_USB_DEVICE'):
if GetDepend('BSP_USING_USB_DEVICE'):
src += Glob('usb/phy/*.c')
CPPDEFINES += ['ENDIANNESS']
>>>>>>> upstream/master
path = [cwd,cwd + '/config']
group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES=CPPDEFINES)