From 3a6b776e6d27c4b8182c5a890ce122ac0dc10bcf Mon Sep 17 00:00:00 2001 From: "WBI\\nxf44444" Date: Mon, 26 Oct 2020 15:51:03 +0800 Subject: [PATCH] add audio --- bsp/imxrt/libraries/drivers/SConscript | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/bsp/imxrt/libraries/drivers/SConscript b/bsp/imxrt/libraries/drivers/SConscript index 7a7ffca2dd..893a25b3a7 100644 --- a/bsp/imxrt/libraries/drivers/SConscript +++ b/bsp/imxrt/libraries/drivers/SConscript @@ -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)