Home Explore Help
Register Sign In
lqb
/
rt-thread
mirror of https://gitee.com/rtthread/rt-thread.git
1
0
Fork 0
Files Issues 0 Wiki
Browse Source

add audio

WBI\nxf44444 4 years ago
parent
b982de3971
commit
3a6b776e6d
1 changed files with 1 additions and 4 deletions
Unified View Show Diff Stats
  1. 1 4
      bsp/imxrt/libraries/drivers/SConscript

+ 1 - 4
bsp/imxrt/libraries/drivers/SConscript
View File 

@@ -45,7 +45,6 @@ if GetDepend('BSP_USING_LCD'):
 
 if GetDepend('BSP_USING_ETH'):
 
 if GetDepend('BSP_USING_ETH'):
 
     src += ['drv_eth.c']
 
     src += ['drv_eth.c']
 
 
 
-<<<<<<< HEAD
 
 if GetDepend('BSP_USING_AUDIO'):
 
 if GetDepend('BSP_USING_AUDIO'):
 
     src += ['drv_sai.c']
 
     src += ['drv_sai.c']
 
     src += ['bsp_wm8960.c']
 
     src += ['bsp_wm8960.c']
 
@@ -53,7 +52,6 @@ if GetDepend('BSP_USING_AUDIO'):
 
 if GetDepend('BSP_USING_SDIO'):
 
 if GetDepend('BSP_USING_SDIO'):
 
     src += ['drv_sdio.c'] 
     src += ['drv_sdio.c'] 
     
     
-=======
 
 if GetDepend('BSP_USING_USB_DEVICE'):
 
 if GetDepend('BSP_USING_USB_DEVICE'):
 
     src += ['drv_usbd.c']
 
     src += ['drv_usbd.c']
 
     src += Glob('usb/device/*.c')
 
     src += Glob('usb/device/*.c')
 
@@ -61,8 +59,7 @@ if GetDepend('BSP_USING_USB_DEVICE'):
 
 if GetDepend('BSP_USING_USB_DEVICE'):
 
 if GetDepend('BSP_USING_USB_DEVICE'):
 
     src += Glob('usb/phy/*.c')
 
     src += Glob('usb/phy/*.c')
 
     CPPDEFINES += ['ENDIANNESS']
 
     CPPDEFINES += ['ENDIANNESS']
 
-
 
->>>>>>> upstream/master
 
+    
 path =  [cwd,cwd + '/config']
 
 path =  [cwd,cwd + '/config']
 
 
 
 group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES=CPPDEFINES)
 
 group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES=CPPDEFINES)