Skip to content

Commit

Permalink
[bsp/phytium]部分设备驱动修改 (RT-Thread#8794)
Browse files Browse the repository at this point in the history
* update

* 修改 SDIF 驱动,支持同时使用 TF 卡和 eMMC,更换飞腾派自启动镜像

* drivers debug

* update

* update

* update config

* update

* modify format

---------

Co-authored-by: 朱耿宇 <[email protected]>
  • Loading branch information
messigogogo and zhugengyu authored Apr 19, 2024
1 parent 6311bca commit de32f35
Show file tree
Hide file tree
Showing 46 changed files with 1,475 additions and 875 deletions.
1 change: 1 addition & 0 deletions bsp/phytium/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
2. 启动 RT-Thread env 应用程序,在交互界面可以使用`cd`指令进入`aarch32``aarch64`目录
3. 按照指导安装 [aarch32](./aarch32/README.md)[aarch64](./aarch64/README.md)编译链,并进行相关配置
4. 按照指导[启动镜像程序](./doc/how_to_flashed_binary.md)
5. 参考[使用文件系统](./doc/how_to_use_file_system.md)制作和使用文件系统

### RT-Thread Studio 环境

Expand Down
22 changes: 17 additions & 5 deletions bsp/phytium/aarch32/.config
Original file line number Diff line number Diff line change
Expand Up @@ -1219,9 +1219,16 @@ CONFIG_RT_USING_SPIM0=y
# CONFIG_RT_USING_SPIM1 is not set
# CONFIG_RT_USING_SPIM2 is not set
# CONFIG_RT_USING_SPIM3 is not set
# CONFIG_BSP_USING_CAN is not set
CONFIG_BSP_USING_CAN=y
# CONFIG_RT_USING_CANFD is not set
# CONFIG_RT_USING_FILTER is not set
# CONFIG_RT_USING_CAN0 is not set
# CONFIG_RT_USING_CAN1 is not set
CONFIG_BSP_USING_GPIO=y
# CONFIG_BSP_USING_QSPI is not set
CONFIG_BSP_USING_QSPI=y
CONFIG_RT_USING_QSPI0=y
CONFIG_USING_QSPI_CHANNEL0=y
# CONFIG_USING_QSPI_CHANNEL1 is not set
CONFIG_BSP_USING_ETH=y
CONFIG_RT_LWIP_PBUF_POOL_BUFSIZE=1700
CONFIG_BSP_USING_PWM=y
Expand Down Expand Up @@ -1252,10 +1259,15 @@ CONFIG_RT_USING_MIO1=y
# CONFIG_RT_USING_MIO14 is not set
# CONFIG_RT_USING_MIO15 is not set
# CONFIG_I2C_USE_CONTROLLER is not set
# CONFIG_BSP_USING_SDIF is not set
CONFIG_BSP_USING_SDIF=y
CONFIG_BSP_USING_SDCARD_FATFS=y
# CONFIG_USING_SDIF0 is not set
CONFIG_USING_SDIF1=y
CONFIG_USE_SDIF1_TF=y
# CONFIG_USE_SDIF1_EMMC is not set
CONFIG_BSP_USING_DC=y
CONFIG_RT_USING_DC_CHANNEL0=y
# CONFIG_RT_USING_DC_CHANNEL1 is not set
CONFIG_RT_USING_DC_CHANNEL1=y
# CONFIG_BSP_USING_XHCI is not set
# CONFIG_BSP_USING_PUSB2 is not set

Expand All @@ -1279,14 +1291,14 @@ CONFIG_TARGET_PHYTIUMPI=y
# CONFIG_TARGET_E2000S is not set
# CONFIG_TARGET_FT2004 is not set
# CONFIG_TARGET_D2000 is not set
# CONFIG_TARGET_PD2308 is not set
CONFIG_SOC_NAME="phytiumpi"
CONFIG_SOC_CORE_NUM=4
CONFIG_F32BIT_MEMORY_ADDRESS=0x80000000
CONFIG_F32BIT_MEMORY_LENGTH=0x80000000
CONFIG_F64BIT_MEMORY_ADDRESS=0x2000000000
CONFIG_F64BIT_MEMORY_LENGTH=0x800000000
CONFIG_TARGET_E2000=y
# CONFIG_USE_SPINLOCK is not set
CONFIG_DEFAULT_DEBUG_PRINT_UART1=y
# CONFIG_DEFAULT_DEBUG_PRINT_UART0 is not set
# CONFIG_DEFAULT_DEBUG_PRINT_UART2 is not set
Expand Down
140 changes: 0 additions & 140 deletions bsp/phytium/aarch32/applications/mnt.c

This file was deleted.

50 changes: 24 additions & 26 deletions bsp/phytium/aarch32/configs/e2000d_demo_rtsmart
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ CONFIG_RT_USING_HEAP=y
CONFIG_RT_USING_DEVICE=y
CONFIG_RT_USING_DEVICE_OPS=y
# CONFIG_RT_USING_INTERRUPT_INFO is not set
# CONFIG_RT_USING_THREADSAFE_PRINTF is not set
CONFIG_RT_USING_THREADSAFE_PRINTF=y
CONFIG_RT_USING_SCHED_THREAD_CTX=y
CONFIG_RT_USING_CONSOLE=y
CONFIG_RT_CONSOLEBUF_SIZE=256
Expand Down Expand Up @@ -135,7 +135,6 @@ CONFIG_RT_USING_DFS=y
CONFIG_DFS_USING_POSIX=y
CONFIG_DFS_USING_WORKDIR=y
CONFIG_DFS_FD_MAX=16
# CONFIG_RT_USING_DFS_V1 is not set
CONFIG_RT_USING_DFS_V2=y
CONFIG_RT_USING_DFS_ELMFAT=y

Expand Down Expand Up @@ -163,6 +162,7 @@ CONFIG_RT_DFS_ELM_MUTEX_TIMEOUT=3000
# CONFIG_RT_DFS_ELM_USE_EXFAT is not set
CONFIG_RT_USING_DFS_DEVFS=y
# CONFIG_RT_USING_DFS_ROMFS is not set
CONFIG_RT_USING_DFS_PTYFS=y
# CONFIG_RT_USING_DFS_CROMFS is not set
# CONFIG_RT_USING_DFS_TMPFS is not set
CONFIG_RT_USING_DFS_MQUEUE=y
Expand Down Expand Up @@ -193,10 +193,8 @@ CONFIG_RT_USING_SERIAL_V1=y
# CONFIG_RT_USING_SERIAL_V2 is not set
CONFIG_RT_SERIAL_USING_DMA=y
CONFIG_RT_SERIAL_RB_BUFSZ=1024
CONFIG_RT_USING_TTY=y
# CONFIG_RT_TTY_DEBUG is not set
CONFIG_RT_USING_CAN=y
CONFIG_RT_CAN_USING_HDR=y
# CONFIG_RT_CAN_USING_HDR is not set
CONFIG_RT_CAN_USING_CANFD=y
# CONFIG_RT_USING_CPUTIME is not set
CONFIG_RT_USING_I2C=y
Expand Down Expand Up @@ -421,10 +419,11 @@ CONFIG_LWP_CONSOLE_INPUT_BUFFER_SIZE=1024
CONFIG_LWP_TID_MAX_NR=64
CONFIG_LWP_ENABLE_ASID=y
CONFIG_RT_LWP_SHM_MAX_NR=64
# CONFIG_LWP_UNIX98_PTY is not set
CONFIG_RT_USING_LDSO=y
# CONFIG_ELF_DEBUG_ENABLE is not set
# CONFIG_ELF_LOAD_RANDOMIZE is not set
CONFIG_LWP_USING_TERMINAL=y
CONFIG_LWP_PTY_MAX_PARIS_LIMIT=64

#
# Memory management
Expand Down Expand Up @@ -1246,13 +1245,13 @@ CONFIG_RT_USING_UART1=y
# CONFIG_RT_USING_UART2 is not set
# CONFIG_RT_USING_UART3 is not set
CONFIG_BSP_USING_SPI=y
# CONFIG_RT_USING_SPIM0 is not set
CONFIG_RT_USING_SPIM0=y
# CONFIG_RT_USING_SPIM1 is not set
CONFIG_RT_USING_SPIM2=y
# CONFIG_RT_USING_SPIM2 is not set
# CONFIG_RT_USING_SPIM3 is not set
CONFIG_BSP_USING_CAN=y
CONFIG_RT_USING_CANFD=y
CONFIG_RT_USING_FILTER=y
# CONFIG_RT_USING_CANFD is not set
# CONFIG_RT_USING_FILTER is not set
CONFIG_RT_USING_CAN0=y
CONFIG_RT_USING_CAN1=y
CONFIG_BSP_USING_GPIO=y
Expand All @@ -1265,16 +1264,16 @@ CONFIG_RT_LWIP_PBUF_POOL_BUFSIZE=1700
CONFIG_BSP_USING_PWM=y
# CONFIG_RT_USING_PWM0 is not set
# CONFIG_RT_USING_PWM1 is not set
# CONFIG_RT_USING_PWM2 is not set
CONFIG_RT_USING_PWM2=y
# CONFIG_RT_USING_PWM3 is not set
# CONFIG_RT_USING_PWM4 is not set
# CONFIG_RT_USING_PWM5 is not set
CONFIG_RT_USING_PWM6=y
# CONFIG_RT_USING_PWM6 is not set
# CONFIG_RT_USING_PWM7 is not set
CONFIG_BSP_USING_I2C=y
CONFIG_I2C_USE_MIO=y
# CONFIG_RT_USING_MIO0 is not set
# CONFIG_RT_USING_MIO1 is not set
CONFIG_RT_USING_MIO0=y
CONFIG_RT_USING_MIO1=y
# CONFIG_RT_USING_MIO2 is not set
# CONFIG_RT_USING_MIO3 is not set
# CONFIG_RT_USING_MIO4 is not set
Expand All @@ -1288,21 +1287,19 @@ CONFIG_I2C_USE_MIO=y
# CONFIG_RT_USING_MIO12 is not set
# CONFIG_RT_USING_MIO13 is not set
# CONFIG_RT_USING_MIO14 is not set
CONFIG_RT_USING_MIO15=y
CONFIG_I2C_USE_CONTROLLER=y
CONFIG_RT_USING_I2C0=y
# CONFIG_RT_USING_I2C1 is not set
# CONFIG_RT_USING_I2C2 is not set
# CONFIG_RT_USING_I2C3 is not set
# CONFIG_RT_USING_MIO15 is not set
# CONFIG_I2C_USE_CONTROLLER is not set
CONFIG_BSP_USING_SDIF=y
CONFIG_BSP_USING_SDCARD_FATFS=y
CONFIG_BSP_USING_SDCARD_PARTITION="sd0"
# CONFIG_USING_SDIF0 is not set
CONFIG_USING_SDIF0=y
# CONFIG_USE_SDIF0_TF is not set
CONFIG_USE_SDIF0_EMMC=y
CONFIG_USING_SDIF1=y
# CONFIG_USING_EMMC is not set
CONFIG_USE_SDIF1_TF=y
# CONFIG_USE_SDIF1_EMMC is not set
CONFIG_BSP_USING_DC=y
# CONFIG_RT_USING_DC_CHANNEL0 is not set
CONFIG_RT_USING_DC_CHANNEL1=y
CONFIG_RT_USING_DC_CHANNEL0=y
# CONFIG_RT_USING_DC_CHANNEL1 is not set
# CONFIG_BSP_USING_XHCI is not set
# CONFIG_BSP_USING_PUSB2 is not set

Expand All @@ -1326,6 +1323,7 @@ CONFIG_TARGET_E2000D=y
# CONFIG_TARGET_E2000S is not set
# CONFIG_TARGET_FT2004 is not set
# CONFIG_TARGET_D2000 is not set
# CONFIG_TARGET_PD2308 is not set
CONFIG_SOC_NAME="e2000"
CONFIG_TARGET_TYPE_NAME="d"
CONFIG_SOC_CORE_NUM=2
Expand All @@ -1334,7 +1332,6 @@ CONFIG_F32BIT_MEMORY_LENGTH=0x80000000
CONFIG_F64BIT_MEMORY_ADDRESS=0x2000000000
CONFIG_F64BIT_MEMORY_LENGTH=0x800000000
CONFIG_TARGET_E2000=y
# CONFIG_USE_SPINLOCK is not set
CONFIG_DEFAULT_DEBUG_PRINT_UART1=y
# CONFIG_DEFAULT_DEBUG_PRINT_UART0 is not set
# CONFIG_DEFAULT_DEBUG_PRINT_UART2 is not set
Expand All @@ -1358,6 +1355,7 @@ CONFIG_BOARD_NAME="demo"
# CONFIG_USE_TACHO_IOPAD is not set
# CONFIG_USE_UART_IOPAD is not set
# CONFIG_USE_THIRD_PARTY_IOPAD is not set
# CONFIG_FIREFLY_DEMO_BOARD is not set
# CONFIG_CUS_DEMO_BOARD is not set

#
Expand Down
Loading

0 comments on commit de32f35

Please sign in to comment.