Skip to content

Commit b9f4daa

Browse files
zhugengyuzhugengyu
authored
[BSP][Phytium] add support for mainbranch cherryusb (xhci host + pusb2 device/host)
1 parent 66738d7 commit b9f4daa

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+11601
-635
lines changed

‎.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,7 @@ cmake-build-debug
5454
# vDSO
5555
vdso_sys.os
5656
vdso.lds
57+
58+
# cherryusb libraries
59+
!components/drivers/usb/cherryusb/port/pusb2/*.a
60+
!components/drivers/usb/cherryusb/port/xhci/phytium/*.a

‎bsp/phytium/aarch32/.config

+73-27
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,41 @@ CONFIG_RT_USING_QSPI=y
246246
CONFIG_RT_USING_PIN=y
247247
CONFIG_RT_USING_KTIME=y
248248
# CONFIG_RT_USING_HWTIMER is not set
249-
# CONFIG_RT_USING_CHERRYUSB is not set
249+
CONFIG_RT_USING_CHERRYUSB=y
250+
# CONFIG_RT_CHERRYUSB_DEVICE is not set
251+
CONFIG_RT_CHERRYUSB_HOST=y
252+
# CONFIG_RT_CHERRYUSB_HOST_CUSTOM is not set
253+
# CONFIG_RT_CHERRYUSB_HOST_EHCI_BL is not set
254+
# CONFIG_RT_CHERRYUSB_HOST_EHCI_HPM is not set
255+
# CONFIG_RT_CHERRYUSB_HOST_EHCI_AIC is not set
256+
# CONFIG_RT_CHERRYUSB_HOST_EHCI_NUVOTON_NUC980 is not set
257+
# CONFIG_RT_CHERRYUSB_HOST_EHCI_NUVOTON_MA35D0 is not set
258+
# CONFIG_RT_CHERRYUSB_HOST_EHCI_CUSTOM is not set
259+
# CONFIG_RT_CHERRYUSB_HOST_DWC2_ST is not set
260+
# CONFIG_RT_CHERRYUSB_HOST_DWC2_ESP is not set
261+
# CONFIG_RT_CHERRYUSB_HOST_DWC2_CUSTOM is not set
262+
# CONFIG_RT_CHERRYUSB_HOST_MUSB_ES is not set
263+
# CONFIG_RT_CHERRYUSB_HOST_MUSB_SUNXI is not set
264+
# CONFIG_RT_CHERRYUSB_HOST_MUSB_BK is not set
265+
# CONFIG_RT_CHERRYUSB_HOST_MUSB_CUSTOM is not set
266+
CONFIG_RT_CHERRYUSB_HOST_PUSB2=y
267+
# CONFIG_RT_CHERRYUSB_HOST_XHCI is not set
268+
# CONFIG_RT_CHERRYUSB_HOST_CDC_ACM is not set
269+
CONFIG_RT_CHERRYUSB_HOST_HID=y
270+
CONFIG_RT_CHERRYUSB_HOST_MSC=y
271+
# CONFIG_RT_CHERRYUSB_HOST_CDC_ECM is not set
272+
# CONFIG_RT_CHERRYUSB_HOST_CDC_RNDIS is not set
273+
# CONFIG_RT_CHERRYUSB_HOST_CDC_NCM is not set
274+
# CONFIG_RT_CHERRYUSB_HOST_VIDEO is not set
275+
# CONFIG_RT_CHERRYUSB_HOST_AUDIO is not set
276+
# CONFIG_RT_CHERRYUSB_HOST_BLUETOOTH is not set
277+
# CONFIG_RT_CHERRYUSB_HOST_ASIX is not set
278+
# CONFIG_RT_CHERRYUSB_HOST_RTL8152 is not set
279+
# CONFIG_RT_CHERRYUSB_HOST_FTDI is not set
280+
# CONFIG_RT_CHERRYUSB_HOST_CH34X is not set
281+
# CONFIG_RT_CHERRYUSB_HOST_CP210X is not set
282+
# CONFIG_RT_CHERRYUSB_HOST_PL2303 is not set
283+
# CONFIG_CHERRYUSB_HOST_TEMPLATE is not set
250284
# end of Device Drivers
251285

252286
#
@@ -325,6 +359,7 @@ CONFIG_NETDEV_USING_IFCONFIG=y
325359
CONFIG_NETDEV_USING_PING=y
326360
CONFIG_NETDEV_USING_NETSTAT=y
327361
CONFIG_NETDEV_USING_AUTO_DEFAULT=y
362+
# CONFIG_NETDEV_USING_LINK_STATUS_CALLBACK is not set
328363
# CONFIG_NETDEV_USING_IPV6 is not set
329364
CONFIG_NETDEV_IPV4=1
330365
CONFIG_NETDEV_IPV6=0
@@ -587,6 +622,7 @@ CONFIG_RT_USING_ADT_REF=y
587622
# CONFIG_PKG_USING_JSMN is not set
588623
# CONFIG_PKG_USING_AGILE_JSMN is not set
589624
# CONFIG_PKG_USING_PARSON is not set
625+
# CONFIG_PKG_USING_RYAN_JSON is not set
590626
# end of JSON: JavaScript Object Notation, a lightweight data-interchange format
591627

592628
#
@@ -706,6 +742,8 @@ CONFIG_RT_USING_ADT_REF=y
706742
# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set
707743
# end of enhanced kernel services
708744

745+
# CONFIG_PKG_USING_AUNITY is not set
746+
709747
#
710748
# acceleration: Assembly language or algorithmic acceleration packages
711749
#
@@ -796,12 +834,29 @@ CONFIG_RT_USING_ADT_REF=y
796834
#
797835
# STM32 HAL & SDK Drivers
798836
#
837+
# CONFIG_PKG_USING_STM32F4_HAL_DRIVER is not set
838+
# CONFIG_PKG_USING_STM32F4_CMSIS_DRIVER is not set
799839
# CONFIG_PKG_USING_STM32L4_HAL_DRIVER is not set
800840
# CONFIG_PKG_USING_STM32L4_CMSIS_DRIVER is not set
801841
# CONFIG_PKG_USING_STM32WB55_SDK is not set
802842
# CONFIG_PKG_USING_STM32_SDIO is not set
803843
# end of STM32 HAL & SDK Drivers
804844

845+
#
846+
# Infineon HAL Packages
847+
#
848+
# CONFIG_PKG_USING_INFINEON_CAT1CM0P is not set
849+
# CONFIG_PKG_USING_INFINEON_CMSIS is not set
850+
# CONFIG_PKG_USING_INFINEON_CORE_LIB is not set
851+
# CONFIG_PKG_USING_INFINEON_MTB_HAL_CAT1 is not set
852+
# CONFIG_PKG_USING_INFINEON_MTB_PDL_CAT1 is not set
853+
# CONFIG_PKG_USING_INFINEON_RETARGET_IO is not set
854+
# CONFIG_PKG_USING_INFINEON_CAPSENSE is not set
855+
# CONFIG_PKG_USING_INFINEON_CSDIDAC is not set
856+
# CONFIG_PKG_USING_INFINEON_SERIAL_FLASH is not set
857+
# CONFIG_PKG_USING_INFINEON_USBDEV is not set
858+
# end of Infineon HAL Packages
859+
805860
# CONFIG_PKG_USING_BLUETRUM_SDK is not set
806861
# CONFIG_PKG_USING_EMBARC_BSP is not set
807862
# CONFIG_PKG_USING_ESP_IDF is not set
@@ -974,6 +1029,7 @@ CONFIG_RT_USING_ADT_REF=y
9741029
# CONFIG_PKG_USING_SYSTEM_RUN_LED is not set
9751030
# CONFIG_PKG_USING_BT_MX01 is not set
9761031
# CONFIG_PKG_USING_RGPOWER is not set
1032+
# CONFIG_PKG_USING_BT_MX02 is not set
9771033
# CONFIG_PKG_USING_SPI_TOOLS is not set
9781034
# end of peripheral libraries and drivers
9791035

@@ -995,6 +1051,7 @@ CONFIG_RT_USING_ADT_REF=y
9951051
#
9961052
# Signal Processing and Control Algorithm Packages
9971053
#
1054+
# CONFIG_PKG_USING_APID is not set
9981055
# CONFIG_PKG_USING_FIRE_PID_CURVE is not set
9991056
# CONFIG_PKG_USING_QPID is not set
10001057
# CONFIG_PKG_USING_UKAL is not set
@@ -1322,15 +1379,11 @@ CONFIG_RT_USING_UART1=y
13221379
# CONFIG_RT_USING_UART2 is not set
13231380
# CONFIG_RT_USING_UART3 is not set
13241381
CONFIG_BSP_USING_SPI=y
1325-
# CONFIG_RT_USING_SPIM0 is not set
1382+
CONFIG_RT_USING_SPIM0=y
13261383
# CONFIG_RT_USING_SPIM1 is not set
1327-
CONFIG_RT_USING_SPIM2=y
1384+
# CONFIG_RT_USING_SPIM2 is not set
13281385
# CONFIG_RT_USING_SPIM3 is not set
1329-
CONFIG_BSP_USING_CAN=y
1330-
CONFIG_RT_USING_CANFD=y
1331-
# CONFIG_RT_USING_FILTER is not set
1332-
CONFIG_RT_USING_CAN0=y
1333-
CONFIG_RT_USING_CAN1=y
1386+
# CONFIG_BSP_USING_CAN is not set
13341387
CONFIG_BSP_USING_GPIO=y
13351388
CONFIG_BSP_USING_QSPI=y
13361389
CONFIG_RT_USING_QSPI0=y
@@ -1341,16 +1394,16 @@ CONFIG_RT_LWIP_PBUF_POOL_BUFSIZE=1700
13411394
CONFIG_BSP_USING_PWM=y
13421395
# CONFIG_RT_USING_PWM0 is not set
13431396
# CONFIG_RT_USING_PWM1 is not set
1344-
CONFIG_RT_USING_PWM2=y
1397+
# CONFIG_RT_USING_PWM2 is not set
13451398
# CONFIG_RT_USING_PWM3 is not set
13461399
# CONFIG_RT_USING_PWM4 is not set
13471400
# CONFIG_RT_USING_PWM5 is not set
13481401
# CONFIG_RT_USING_PWM6 is not set
13491402
# CONFIG_RT_USING_PWM7 is not set
13501403
CONFIG_BSP_USING_I2C=y
13511404
CONFIG_I2C_USE_MIO=y
1352-
# CONFIG_RT_USING_MIO0 is not set
1353-
# CONFIG_RT_USING_MIO1 is not set
1405+
CONFIG_RT_USING_MIO0=y
1406+
CONFIG_RT_USING_MIO1=y
13541407
# CONFIG_RT_USING_MIO2 is not set
13551408
# CONFIG_RT_USING_MIO3 is not set
13561409
# CONFIG_RT_USING_MIO4 is not set
@@ -1364,21 +1417,15 @@ CONFIG_I2C_USE_MIO=y
13641417
# CONFIG_RT_USING_MIO12 is not set
13651418
# CONFIG_RT_USING_MIO13 is not set
13661419
# CONFIG_RT_USING_MIO14 is not set
1367-
CONFIG_RT_USING_MIO15=y
1420+
# CONFIG_RT_USING_MIO15 is not set
13681421
# CONFIG_I2C_USE_CONTROLLER is not set
13691422
CONFIG_BSP_USING_SDIF=y
1370-
CONFIG_BSP_USING_SDCARD_FATFS=y
1371-
CONFIG_USING_SDIF0=y
1372-
# CONFIG_USE_SDIF0_TF is not set
1373-
CONFIG_USE_SDIF0_EMMC=y
1374-
CONFIG_USING_SDIF1=y
1375-
CONFIG_USE_SDIF1_TF=y
1376-
# CONFIG_USE_SDIF1_EMMC is not set
1423+
# CONFIG_BSP_USING_SDCARD_FATFS is not set
1424+
# CONFIG_USING_SDIF0 is not set
1425+
# CONFIG_USING_SDIF1 is not set
13771426
CONFIG_BSP_USING_DC=y
13781427
CONFIG_RT_USING_DC_CHANNEL0=y
13791428
CONFIG_RT_USING_DC_CHANNEL1=y
1380-
# CONFIG_BSP_USING_XHCI is not set
1381-
# CONFIG_BSP_USING_PUSB2 is not set
13821429
# end of On-chip Peripheral Drivers
13831430

13841431
#
@@ -1397,15 +1444,14 @@ CONFIG_USE_AARCH64_L1_TO_AARCH32=y
13971444
#
13981445
# Soc configuration
13991446
#
1400-
# CONFIG_TARGET_PHYTIUMPI is not set
1401-
CONFIG_TARGET_E2000Q=y
1447+
CONFIG_TARGET_PHYTIUMPI=y
1448+
# CONFIG_TARGET_E2000Q is not set
14021449
# CONFIG_TARGET_E2000D is not set
14031450
# CONFIG_TARGET_E2000S is not set
14041451
# CONFIG_TARGET_FT2004 is not set
14051452
# CONFIG_TARGET_D2000 is not set
14061453
# CONFIG_TARGET_PD2308 is not set
1407-
CONFIG_SOC_NAME="e2000"
1408-
CONFIG_TARGET_TYPE_NAME="q"
1454+
CONFIG_SOC_NAME="phytiumpi"
14091455
CONFIG_SOC_CORE_NUM=4
14101456
CONFIG_F32BIT_MEMORY_ADDRESS=0x80000000
14111457
CONFIG_F32BIT_MEMORY_LENGTH=0x80000000
@@ -1420,7 +1466,7 @@ CONFIG_DEFAULT_DEBUG_PRINT_UART1=y
14201466
#
14211467
# Board Configuration
14221468
#
1423-
CONFIG_BOARD_NAME="demo"
1469+
CONFIG_BOARD_NAME="firefly"
14241470
# CONFIG_USE_SPI_IOPAD is not set
14251471
# CONFIG_USE_GPIO_IOPAD is not set
14261472
# CONFIG_USE_CAN_IOPAD is not set
@@ -1430,7 +1476,7 @@ CONFIG_BOARD_NAME="demo"
14301476
# CONFIG_USE_TACHO_IOPAD is not set
14311477
# CONFIG_USE_UART_IOPAD is not set
14321478
# CONFIG_USE_THIRD_PARTY_IOPAD is not set
1433-
CONFIG_E2000Q_DEMO_BOARD=y
1479+
CONFIG_FIREFLY_DEMO_BOARD=y
14341480

14351481
#
14361482
# IO mux configuration when board start up

‎bsp/phytium/aarch32/configs/e2000d_demo_rtthread

+58-3
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,41 @@ CONFIG_RT_USING_QSPI=y
246246
CONFIG_RT_USING_PIN=y
247247
CONFIG_RT_USING_KTIME=y
248248
# CONFIG_RT_USING_HWTIMER is not set
249-
# CONFIG_RT_USING_CHERRYUSB is not set
249+
CONFIG_RT_USING_CHERRYUSB=y
250+
# CONFIG_RT_CHERRYUSB_DEVICE is not set
251+
CONFIG_RT_CHERRYUSB_HOST=y
252+
# CONFIG_RT_CHERRYUSB_HOST_CUSTOM is not set
253+
# CONFIG_RT_CHERRYUSB_HOST_EHCI_BL is not set
254+
# CONFIG_RT_CHERRYUSB_HOST_EHCI_HPM is not set
255+
# CONFIG_RT_CHERRYUSB_HOST_EHCI_AIC is not set
256+
# CONFIG_RT_CHERRYUSB_HOST_EHCI_NUVOTON_NUC980 is not set
257+
# CONFIG_RT_CHERRYUSB_HOST_EHCI_NUVOTON_MA35D0 is not set
258+
# CONFIG_RT_CHERRYUSB_HOST_EHCI_CUSTOM is not set
259+
# CONFIG_RT_CHERRYUSB_HOST_DWC2_ST is not set
260+
# CONFIG_RT_CHERRYUSB_HOST_DWC2_ESP is not set
261+
# CONFIG_RT_CHERRYUSB_HOST_DWC2_CUSTOM is not set
262+
# CONFIG_RT_CHERRYUSB_HOST_MUSB_ES is not set
263+
# CONFIG_RT_CHERRYUSB_HOST_MUSB_SUNXI is not set
264+
# CONFIG_RT_CHERRYUSB_HOST_MUSB_BK is not set
265+
# CONFIG_RT_CHERRYUSB_HOST_MUSB_CUSTOM is not set
266+
# CONFIG_RT_CHERRYUSB_HOST_PUSB2 is not set
267+
CONFIG_RT_CHERRYUSB_HOST_XHCI=y
268+
# CONFIG_RT_CHERRYUSB_HOST_CDC_ACM is not set
269+
CONFIG_RT_CHERRYUSB_HOST_HID=y
270+
CONFIG_RT_CHERRYUSB_HOST_MSC=y
271+
# CONFIG_RT_CHERRYUSB_HOST_CDC_ECM is not set
272+
# CONFIG_RT_CHERRYUSB_HOST_CDC_RNDIS is not set
273+
# CONFIG_RT_CHERRYUSB_HOST_CDC_NCM is not set
274+
# CONFIG_RT_CHERRYUSB_HOST_VIDEO is not set
275+
# CONFIG_RT_CHERRYUSB_HOST_AUDIO is not set
276+
# CONFIG_RT_CHERRYUSB_HOST_BLUETOOTH is not set
277+
# CONFIG_RT_CHERRYUSB_HOST_ASIX is not set
278+
# CONFIG_RT_CHERRYUSB_HOST_RTL8152 is not set
279+
# CONFIG_RT_CHERRYUSB_HOST_FTDI is not set
280+
# CONFIG_RT_CHERRYUSB_HOST_CH34X is not set
281+
# CONFIG_RT_CHERRYUSB_HOST_CP210X is not set
282+
# CONFIG_RT_CHERRYUSB_HOST_PL2303 is not set
283+
# CONFIG_CHERRYUSB_HOST_TEMPLATE is not set
250284
# end of Device Drivers
251285

252286
#
@@ -325,6 +359,7 @@ CONFIG_NETDEV_USING_IFCONFIG=y
325359
CONFIG_NETDEV_USING_PING=y
326360
CONFIG_NETDEV_USING_NETSTAT=y
327361
CONFIG_NETDEV_USING_AUTO_DEFAULT=y
362+
# CONFIG_NETDEV_USING_LINK_STATUS_CALLBACK is not set
328363
# CONFIG_NETDEV_USING_IPV6 is not set
329364
CONFIG_NETDEV_IPV4=1
330365
CONFIG_NETDEV_IPV6=0
@@ -587,6 +622,7 @@ CONFIG_RT_USING_ADT_REF=y
587622
# CONFIG_PKG_USING_JSMN is not set
588623
# CONFIG_PKG_USING_AGILE_JSMN is not set
589624
# CONFIG_PKG_USING_PARSON is not set
625+
# CONFIG_PKG_USING_RYAN_JSON is not set
590626
# end of JSON: JavaScript Object Notation, a lightweight data-interchange format
591627

592628
#
@@ -706,6 +742,8 @@ CONFIG_RT_USING_ADT_REF=y
706742
# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set
707743
# end of enhanced kernel services
708744

745+
# CONFIG_PKG_USING_AUNITY is not set
746+
709747
#
710748
# acceleration: Assembly language or algorithmic acceleration packages
711749
#
@@ -796,12 +834,29 @@ CONFIG_RT_USING_ADT_REF=y
796834
#
797835
# STM32 HAL & SDK Drivers
798836
#
837+
# CONFIG_PKG_USING_STM32F4_HAL_DRIVER is not set
838+
# CONFIG_PKG_USING_STM32F4_CMSIS_DRIVER is not set
799839
# CONFIG_PKG_USING_STM32L4_HAL_DRIVER is not set
800840
# CONFIG_PKG_USING_STM32L4_CMSIS_DRIVER is not set
801841
# CONFIG_PKG_USING_STM32WB55_SDK is not set
802842
# CONFIG_PKG_USING_STM32_SDIO is not set
803843
# end of STM32 HAL & SDK Drivers
804844

845+
#
846+
# Infineon HAL Packages
847+
#
848+
# CONFIG_PKG_USING_INFINEON_CAT1CM0P is not set
849+
# CONFIG_PKG_USING_INFINEON_CMSIS is not set
850+
# CONFIG_PKG_USING_INFINEON_CORE_LIB is not set
851+
# CONFIG_PKG_USING_INFINEON_MTB_HAL_CAT1 is not set
852+
# CONFIG_PKG_USING_INFINEON_MTB_PDL_CAT1 is not set
853+
# CONFIG_PKG_USING_INFINEON_RETARGET_IO is not set
854+
# CONFIG_PKG_USING_INFINEON_CAPSENSE is not set
855+
# CONFIG_PKG_USING_INFINEON_CSDIDAC is not set
856+
# CONFIG_PKG_USING_INFINEON_SERIAL_FLASH is not set
857+
# CONFIG_PKG_USING_INFINEON_USBDEV is not set
858+
# end of Infineon HAL Packages
859+
805860
# CONFIG_PKG_USING_BLUETRUM_SDK is not set
806861
# CONFIG_PKG_USING_EMBARC_BSP is not set
807862
# CONFIG_PKG_USING_ESP_IDF is not set
@@ -974,6 +1029,7 @@ CONFIG_RT_USING_ADT_REF=y
9741029
# CONFIG_PKG_USING_SYSTEM_RUN_LED is not set
9751030
# CONFIG_PKG_USING_BT_MX01 is not set
9761031
# CONFIG_PKG_USING_RGPOWER is not set
1032+
# CONFIG_PKG_USING_BT_MX02 is not set
9771033
# CONFIG_PKG_USING_SPI_TOOLS is not set
9781034
# end of peripheral libraries and drivers
9791035

@@ -995,6 +1051,7 @@ CONFIG_RT_USING_ADT_REF=y
9951051
#
9961052
# Signal Processing and Control Algorithm Packages
9971053
#
1054+
# CONFIG_PKG_USING_APID is not set
9981055
# CONFIG_PKG_USING_FIRE_PID_CURVE is not set
9991056
# CONFIG_PKG_USING_QPID is not set
10001057
# CONFIG_PKG_USING_UKAL is not set
@@ -1377,8 +1434,6 @@ CONFIG_USE_SDIF1_TF=y
13771434
CONFIG_BSP_USING_DC=y
13781435
CONFIG_RT_USING_DC_CHANNEL0=y
13791436
CONFIG_RT_USING_DC_CHANNEL1=y
1380-
# CONFIG_BSP_USING_XHCI is not set
1381-
# CONFIG_BSP_USING_PUSB2 is not set
13821437
# end of On-chip Peripheral Drivers
13831438

13841439
#

‎bsp/phytium/aarch32/configs/e2000d_demo_rtthread.h

+9
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,11 @@
153153
#define RT_USING_QSPI
154154
#define RT_USING_PIN
155155
#define RT_USING_KTIME
156+
#define RT_USING_CHERRYUSB
157+
#define RT_CHERRYUSB_HOST
158+
#define RT_CHERRYUSB_HOST_XHCI
159+
#define RT_CHERRYUSB_HOST_HID
160+
#define RT_CHERRYUSB_HOST_MSC
156161
/* end of Device Drivers */
157162

158163
/* C/C++ and POSIX layer */
@@ -373,6 +378,10 @@
373378

374379
/* end of STM32 HAL & SDK Drivers */
375380

381+
/* Infineon HAL Packages */
382+
383+
/* end of Infineon HAL Packages */
384+
376385
/* Kendryte SDK */
377386

378387
/* end of Kendryte SDK */

0 commit comments

Comments
 (0)