diff options
| author | WBI\nxf44444 <[email protected]> | 2020-10-26 15:51:03 +0800 |
|---|---|---|
| committer | WBI\nxf44444 <[email protected]> | 2020-10-26 15:51:03 +0800 |
| commit | 3a6b776e6d27c4b8182c5a890ce122ac0dc10bcf (patch) | |
| tree | 3ad571c5eb78d6b01a8c65b01d02ec7bb9d611c6 /bsp/imxrt/libraries/drivers/SConscript | |
| parent | b982de3971467f5c5cac5f8ce8f954bb9842ec0f (diff) | |
add audio
Diffstat (limited to 'bsp/imxrt/libraries/drivers/SConscript')
| -rw-r--r-- | bsp/imxrt/libraries/drivers/SConscript | 5 |
1 files changed, 1 insertions, 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) |