summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Xiong <[email protected]>2018-04-21 11:25:30 +0800
committerGitHub <[email protected]>2018-04-21 11:25:30 +0800
commitd5da0601a70adb9e53e04db25944c74335b03145 (patch)
treecb8b9474d4d51867ae516fb25568358510bc5506
parent58c1d721f7ac40237eb25765da911056856cb062 (diff)
parentf3a886bda0b63f7dec1c3cf457dc4bbed83bab99 (diff)
Merge pull request #1375 from uestczyh222/master
Add USB driver to fire
-rw-r--r--bsp/imxrt1052-evk/Kconfig2
-rw-r--r--bsp/imxrt1052-evk/drivers/SConscript17
2 files changed, 9 insertions, 10 deletions
diff --git a/bsp/imxrt1052-evk/Kconfig b/bsp/imxrt1052-evk/Kconfig
index 68bf0cac1d..735d7ac036 100644
--- a/bsp/imxrt1052-evk/Kconfig
+++ b/bsp/imxrt1052-evk/Kconfig
@@ -397,7 +397,6 @@ endmenu
default n
#endmenu
-if BOARD_RT1050_EVK
if RT_USING_USB_DEVICE
choice
prompt "select usb device controller"
@@ -409,6 +408,5 @@ if RT_USING_USB_DEVICE
bool "set EHCI1 as device"
endchoice
endif
-endif
endmenu
diff --git a/bsp/imxrt1052-evk/drivers/SConscript b/bsp/imxrt1052-evk/drivers/SConscript
index 96695bbc71..6a41ef3b6d 100644
--- a/bsp/imxrt1052-evk/drivers/SConscript
+++ b/bsp/imxrt1052-evk/drivers/SConscript
@@ -46,6 +46,15 @@ if GetDepend('RT_USING_LCD'):
if GetDepend('RT_USING_SDIO'):
src += ['drv_sdio.c']
+# add usb device driver code
+if GetDepend('RT_USING_USB_DEVICE'):
+ src += ['drv_usbd.c']
+ src += Glob('usb/device/*.c')
+# add usb phy driver code
+if GetDepend('RT_USING_USB_DEVICE'):
+ src += Glob('usb/phy/*.c')
+ CPPDEFINES += ['ENDIANNESS']
+
if GetDepend('BOARD_RT1050_EVK'):
src += ['hyper_flash_boot.c']
@@ -53,14 +62,6 @@ if GetDepend('BOARD_RT1050_EVK'):
src += ['drv_eth.c', 'fsl_phy.c']
CPPDEFINES += ['FSL_FEATURE_PHYKSZ8081_USE_RMII50M_MODE']
- if GetDepend('RT_USING_USB_DEVICE'):
- src += Glob('usb/phy/*.c')
- CPPDEFINES += ['ENDIANNESS']
-
- if GetDepend('RT_USING_USB_DEVICE'):
- src += ['drv_usbd.c']
- src += Glob('usb/device/*.c')
-
group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES=CPPDEFINES)
Return('group')