Browse Source

Merge pull request #1375 from uestczyh222/master

Add USB driver to fire
Bernard Xiong 7 years ago
parent
commit
d5da0601a7
2 changed files with 9 additions and 10 deletions
  1. 0 2
      bsp/imxrt1052-evk/Kconfig
  2. 9 8
      bsp/imxrt1052-evk/drivers/SConscript

+ 0 - 2
bsp/imxrt1052-evk/Kconfig

@@ -397,7 +397,6 @@ endmenu
         default n 
         default n 
 #endmenu
 #endmenu
 
 
-if BOARD_RT1050_EVK
 if RT_USING_USB_DEVICE
 if RT_USING_USB_DEVICE
     choice
     choice
         prompt "select usb device controller"
         prompt "select usb device controller"
@@ -409,6 +408,5 @@ if RT_USING_USB_DEVICE
             bool "set EHCI1 as device"
             bool "set EHCI1 as device"
     endchoice
     endchoice
 endif
 endif
-endif
 
 
 endmenu
 endmenu

+ 9 - 8
bsp/imxrt1052-evk/drivers/SConscript

@@ -46,6 +46,15 @@ if GetDepend('RT_USING_LCD'):
 if GetDepend('RT_USING_SDIO'):
 if GetDepend('RT_USING_SDIO'):
     src += ['drv_sdio.c']
     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'):
 if GetDepend('BOARD_RT1050_EVK'):
     src += ['hyper_flash_boot.c']
     src += ['hyper_flash_boot.c']
 
 
@@ -53,14 +62,6 @@ if GetDepend('BOARD_RT1050_EVK'):
         src += ['drv_eth.c', 'fsl_phy.c']
         src += ['drv_eth.c', 'fsl_phy.c']
         CPPDEFINES += ['FSL_FEATURE_PHYKSZ8081_USE_RMII50M_MODE']
         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)
 group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES=CPPDEFINES)
 
 
 Return('group')
 Return('group')