Skip to content

Commit 87cfd58

Browse files
messigogogozhugengyu
authored andcommitted
[bsp/phytium]部分设备驱动修改 (#8794)
* update * 修改 SDIF 驱动,支持同时使用 TF 卡和 eMMC,更换飞腾派自启动镜像 * drivers debug * update * update * update config * update * modify format --------- Co-authored-by: 朱耿宇 <[email protected]>
1 parent 2d18f03 commit 87cfd58

Some content is hidden

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

46 files changed

+1475
-875
lines changed

bsp/phytium/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
2. 启动 RT-Thread env 应用程序,在交互界面可以使用`cd`指令进入`aarch32``aarch64`目录
5959
3. 按照指导安装 [aarch32](./aarch32/README.md)[aarch64](./aarch64/README.md)编译链,并进行相关配置
6060
4. 按照指导[启动镜像程序](./doc/how_to_flashed_binary.md)
61+
5. 参考[使用文件系统](./doc/how_to_use_file_system.md)制作和使用文件系统
6162

6263
### RT-Thread Studio 环境
6364

bsp/phytium/aarch32/.config

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1219,9 +1219,16 @@ CONFIG_RT_USING_SPIM0=y
12191219
# CONFIG_RT_USING_SPIM1 is not set
12201220
# CONFIG_RT_USING_SPIM2 is not set
12211221
# CONFIG_RT_USING_SPIM3 is not set
1222-
# CONFIG_BSP_USING_CAN is not set
1222+
CONFIG_BSP_USING_CAN=y
1223+
# CONFIG_RT_USING_CANFD is not set
1224+
# CONFIG_RT_USING_FILTER is not set
1225+
# CONFIG_RT_USING_CAN0 is not set
1226+
# CONFIG_RT_USING_CAN1 is not set
12231227
CONFIG_BSP_USING_GPIO=y
1224-
# CONFIG_BSP_USING_QSPI is not set
1228+
CONFIG_BSP_USING_QSPI=y
1229+
CONFIG_RT_USING_QSPI0=y
1230+
CONFIG_USING_QSPI_CHANNEL0=y
1231+
# CONFIG_USING_QSPI_CHANNEL1 is not set
12251232
CONFIG_BSP_USING_ETH=y
12261233
CONFIG_RT_LWIP_PBUF_POOL_BUFSIZE=1700
12271234
CONFIG_BSP_USING_PWM=y
@@ -1252,10 +1259,15 @@ CONFIG_RT_USING_MIO1=y
12521259
# CONFIG_RT_USING_MIO14 is not set
12531260
# CONFIG_RT_USING_MIO15 is not set
12541261
# CONFIG_I2C_USE_CONTROLLER is not set
1255-
# CONFIG_BSP_USING_SDIF is not set
1262+
CONFIG_BSP_USING_SDIF=y
1263+
CONFIG_BSP_USING_SDCARD_FATFS=y
1264+
# CONFIG_USING_SDIF0 is not set
1265+
CONFIG_USING_SDIF1=y
1266+
CONFIG_USE_SDIF1_TF=y
1267+
# CONFIG_USE_SDIF1_EMMC is not set
12561268
CONFIG_BSP_USING_DC=y
12571269
CONFIG_RT_USING_DC_CHANNEL0=y
1258-
# CONFIG_RT_USING_DC_CHANNEL1 is not set
1270+
CONFIG_RT_USING_DC_CHANNEL1=y
12591271
# CONFIG_BSP_USING_XHCI is not set
12601272
# CONFIG_BSP_USING_PUSB2 is not set
12611273

@@ -1279,14 +1291,14 @@ CONFIG_TARGET_PHYTIUMPI=y
12791291
# CONFIG_TARGET_E2000S is not set
12801292
# CONFIG_TARGET_FT2004 is not set
12811293
# CONFIG_TARGET_D2000 is not set
1294+
# CONFIG_TARGET_PD2308 is not set
12821295
CONFIG_SOC_NAME="phytiumpi"
12831296
CONFIG_SOC_CORE_NUM=4
12841297
CONFIG_F32BIT_MEMORY_ADDRESS=0x80000000
12851298
CONFIG_F32BIT_MEMORY_LENGTH=0x80000000
12861299
CONFIG_F64BIT_MEMORY_ADDRESS=0x2000000000
12871300
CONFIG_F64BIT_MEMORY_LENGTH=0x800000000
12881301
CONFIG_TARGET_E2000=y
1289-
# CONFIG_USE_SPINLOCK is not set
12901302
CONFIG_DEFAULT_DEBUG_PRINT_UART1=y
12911303
# CONFIG_DEFAULT_DEBUG_PRINT_UART0 is not set
12921304
# CONFIG_DEFAULT_DEBUG_PRINT_UART2 is not set

bsp/phytium/aarch32/applications/mnt.c

Lines changed: 0 additions & 140 deletions
This file was deleted.

bsp/phytium/aarch32/configs/e2000d_demo_rtsmart

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ CONFIG_RT_USING_HEAP=y
7878
CONFIG_RT_USING_DEVICE=y
7979
CONFIG_RT_USING_DEVICE_OPS=y
8080
# CONFIG_RT_USING_INTERRUPT_INFO is not set
81-
# CONFIG_RT_USING_THREADSAFE_PRINTF is not set
81+
CONFIG_RT_USING_THREADSAFE_PRINTF=y
8282
CONFIG_RT_USING_SCHED_THREAD_CTX=y
8383
CONFIG_RT_USING_CONSOLE=y
8484
CONFIG_RT_CONSOLEBUF_SIZE=256
@@ -135,7 +135,6 @@ CONFIG_RT_USING_DFS=y
135135
CONFIG_DFS_USING_POSIX=y
136136
CONFIG_DFS_USING_WORKDIR=y
137137
CONFIG_DFS_FD_MAX=16
138-
# CONFIG_RT_USING_DFS_V1 is not set
139138
CONFIG_RT_USING_DFS_V2=y
140139
CONFIG_RT_USING_DFS_ELMFAT=y
141140

@@ -163,6 +162,7 @@ CONFIG_RT_DFS_ELM_MUTEX_TIMEOUT=3000
163162
# CONFIG_RT_DFS_ELM_USE_EXFAT is not set
164163
CONFIG_RT_USING_DFS_DEVFS=y
165164
# CONFIG_RT_USING_DFS_ROMFS is not set
165+
CONFIG_RT_USING_DFS_PTYFS=y
166166
# CONFIG_RT_USING_DFS_CROMFS is not set
167167
# CONFIG_RT_USING_DFS_TMPFS is not set
168168
CONFIG_RT_USING_DFS_MQUEUE=y
@@ -193,10 +193,8 @@ CONFIG_RT_USING_SERIAL_V1=y
193193
# CONFIG_RT_USING_SERIAL_V2 is not set
194194
CONFIG_RT_SERIAL_USING_DMA=y
195195
CONFIG_RT_SERIAL_RB_BUFSZ=1024
196-
CONFIG_RT_USING_TTY=y
197-
# CONFIG_RT_TTY_DEBUG is not set
198196
CONFIG_RT_USING_CAN=y
199-
CONFIG_RT_CAN_USING_HDR=y
197+
# CONFIG_RT_CAN_USING_HDR is not set
200198
CONFIG_RT_CAN_USING_CANFD=y
201199
# CONFIG_RT_USING_CPUTIME is not set
202200
CONFIG_RT_USING_I2C=y
@@ -421,10 +419,11 @@ CONFIG_LWP_CONSOLE_INPUT_BUFFER_SIZE=1024
421419
CONFIG_LWP_TID_MAX_NR=64
422420
CONFIG_LWP_ENABLE_ASID=y
423421
CONFIG_RT_LWP_SHM_MAX_NR=64
424-
# CONFIG_LWP_UNIX98_PTY is not set
425422
CONFIG_RT_USING_LDSO=y
426423
# CONFIG_ELF_DEBUG_ENABLE is not set
427424
# CONFIG_ELF_LOAD_RANDOMIZE is not set
425+
CONFIG_LWP_USING_TERMINAL=y
426+
CONFIG_LWP_PTY_MAX_PARIS_LIMIT=64
428427

429428
#
430429
# Memory management
@@ -1246,13 +1245,13 @@ CONFIG_RT_USING_UART1=y
12461245
# CONFIG_RT_USING_UART2 is not set
12471246
# CONFIG_RT_USING_UART3 is not set
12481247
CONFIG_BSP_USING_SPI=y
1249-
# CONFIG_RT_USING_SPIM0 is not set
1248+
CONFIG_RT_USING_SPIM0=y
12501249
# CONFIG_RT_USING_SPIM1 is not set
1251-
CONFIG_RT_USING_SPIM2=y
1250+
# CONFIG_RT_USING_SPIM2 is not set
12521251
# CONFIG_RT_USING_SPIM3 is not set
12531252
CONFIG_BSP_USING_CAN=y
1254-
CONFIG_RT_USING_CANFD=y
1255-
CONFIG_RT_USING_FILTER=y
1253+
# CONFIG_RT_USING_CANFD is not set
1254+
# CONFIG_RT_USING_FILTER is not set
12561255
CONFIG_RT_USING_CAN0=y
12571256
CONFIG_RT_USING_CAN1=y
12581257
CONFIG_BSP_USING_GPIO=y
@@ -1265,16 +1264,16 @@ CONFIG_RT_LWIP_PBUF_POOL_BUFSIZE=1700
12651264
CONFIG_BSP_USING_PWM=y
12661265
# CONFIG_RT_USING_PWM0 is not set
12671266
# CONFIG_RT_USING_PWM1 is not set
1268-
# CONFIG_RT_USING_PWM2 is not set
1267+
CONFIG_RT_USING_PWM2=y
12691268
# CONFIG_RT_USING_PWM3 is not set
12701269
# CONFIG_RT_USING_PWM4 is not set
12711270
# CONFIG_RT_USING_PWM5 is not set
1272-
CONFIG_RT_USING_PWM6=y
1271+
# CONFIG_RT_USING_PWM6 is not set
12731272
# CONFIG_RT_USING_PWM7 is not set
12741273
CONFIG_BSP_USING_I2C=y
12751274
CONFIG_I2C_USE_MIO=y
1276-
# CONFIG_RT_USING_MIO0 is not set
1277-
# CONFIG_RT_USING_MIO1 is not set
1275+
CONFIG_RT_USING_MIO0=y
1276+
CONFIG_RT_USING_MIO1=y
12781277
# CONFIG_RT_USING_MIO2 is not set
12791278
# CONFIG_RT_USING_MIO3 is not set
12801279
# CONFIG_RT_USING_MIO4 is not set
@@ -1288,21 +1287,19 @@ CONFIG_I2C_USE_MIO=y
12881287
# CONFIG_RT_USING_MIO12 is not set
12891288
# CONFIG_RT_USING_MIO13 is not set
12901289
# CONFIG_RT_USING_MIO14 is not set
1291-
CONFIG_RT_USING_MIO15=y
1292-
CONFIG_I2C_USE_CONTROLLER=y
1293-
CONFIG_RT_USING_I2C0=y
1294-
# CONFIG_RT_USING_I2C1 is not set
1295-
# CONFIG_RT_USING_I2C2 is not set
1296-
# CONFIG_RT_USING_I2C3 is not set
1290+
# CONFIG_RT_USING_MIO15 is not set
1291+
# CONFIG_I2C_USE_CONTROLLER is not set
12971292
CONFIG_BSP_USING_SDIF=y
12981293
CONFIG_BSP_USING_SDCARD_FATFS=y
1299-
CONFIG_BSP_USING_SDCARD_PARTITION="sd0"
1300-
# CONFIG_USING_SDIF0 is not set
1294+
CONFIG_USING_SDIF0=y
1295+
# CONFIG_USE_SDIF0_TF is not set
1296+
CONFIG_USE_SDIF0_EMMC=y
13011297
CONFIG_USING_SDIF1=y
1302-
# CONFIG_USING_EMMC is not set
1298+
CONFIG_USE_SDIF1_TF=y
1299+
# CONFIG_USE_SDIF1_EMMC is not set
13031300
CONFIG_BSP_USING_DC=y
1304-
# CONFIG_RT_USING_DC_CHANNEL0 is not set
1305-
CONFIG_RT_USING_DC_CHANNEL1=y
1301+
CONFIG_RT_USING_DC_CHANNEL0=y
1302+
# CONFIG_RT_USING_DC_CHANNEL1 is not set
13061303
# CONFIG_BSP_USING_XHCI is not set
13071304
# CONFIG_BSP_USING_PUSB2 is not set
13081305

@@ -1326,6 +1323,7 @@ CONFIG_TARGET_E2000D=y
13261323
# CONFIG_TARGET_E2000S is not set
13271324
# CONFIG_TARGET_FT2004 is not set
13281325
# CONFIG_TARGET_D2000 is not set
1326+
# CONFIG_TARGET_PD2308 is not set
13291327
CONFIG_SOC_NAME="e2000"
13301328
CONFIG_TARGET_TYPE_NAME="d"
13311329
CONFIG_SOC_CORE_NUM=2
@@ -1334,7 +1332,6 @@ CONFIG_F32BIT_MEMORY_LENGTH=0x80000000
13341332
CONFIG_F64BIT_MEMORY_ADDRESS=0x2000000000
13351333
CONFIG_F64BIT_MEMORY_LENGTH=0x800000000
13361334
CONFIG_TARGET_E2000=y
1337-
# CONFIG_USE_SPINLOCK is not set
13381335
CONFIG_DEFAULT_DEBUG_PRINT_UART1=y
13391336
# CONFIG_DEFAULT_DEBUG_PRINT_UART0 is not set
13401337
# CONFIG_DEFAULT_DEBUG_PRINT_UART2 is not set
@@ -1358,6 +1355,7 @@ CONFIG_BOARD_NAME="demo"
13581355
# CONFIG_USE_TACHO_IOPAD is not set
13591356
# CONFIG_USE_UART_IOPAD is not set
13601357
# CONFIG_USE_THIRD_PARTY_IOPAD is not set
1358+
# CONFIG_FIREFLY_DEMO_BOARD is not set
13611359
# CONFIG_CUS_DEMO_BOARD is not set
13621360

13631361
#

0 commit comments

Comments
 (0)