Skip to content

Commit 603edbd

Browse files
author
黄锦
committed
增加xmac msg驱动，进行ping测试
1 parent c19712c commit 603edbd

File tree

10 files changed

+1968
-49
lines changed

10 files changed

+1968
-49
lines changed

‎bsp/phytium/aarch64/.config‎

Lines changed: 58 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ CONFIG_RT_NAME_MAX=16
124124
# CONFIG_RT_USING_SMART is not set
125125
# CONFIG_RT_USING_AMP is not set
126126
CONFIG_RT_USING_SMP=y
127-
CONFIG_RT_CPUS_NR=2
127+
CONFIG_RT_CPUS_NR=8
128128
CONFIG_RT_ALIGN_SIZE=4
129129
# CONFIG_RT_THREAD_PRIORITY_8 is not set
130130
CONFIG_RT_THREAD_PRIORITY_32=y
@@ -318,7 +318,9 @@ CONFIG_RT_USING_SERIAL_V1=y
318318
CONFIG_RT_SERIAL_USING_DMA=y
319319
CONFIG_RT_SERIAL_RB_BUFSZ=64
320320
# CONFIG_RT_USING_SERIAL_BYPASS is not set
321-
# CONFIG_RT_USING_CAN is not set
321+
CONFIG_RT_USING_CAN=y
322+
# CONFIG_RT_CAN_USING_HDR is not set
323+
# CONFIG_RT_CAN_USING_CANFD is not set
322324
# CONFIG_RT_USING_CPUTIME is not set
323325
CONFIG_RT_USING_I2C=y
324326
# CONFIG_RT_I2C_DEBUG is not set
@@ -332,7 +334,7 @@ CONFIG_RT_USING_I2C_BITOPS=y
332334
CONFIG_RT_USING_NULL=y
333335
CONFIG_RT_USING_ZERO=y
334336
CONFIG_RT_USING_RANDOM=y
335-
# CONFIG_RT_USING_PWM is not set
337+
CONFIG_RT_USING_PWM=y
336338
# CONFIG_RT_USING_PULSE_ENCODER is not set
337339
# CONFIG_RT_USING_INPUT_CAPTURE is not set
338340
# CONFIG_RT_USING_MTD_NOR is not set
@@ -341,21 +343,46 @@ CONFIG_RT_USING_RANDOM=y
341343
CONFIG_RT_USING_RTC=y
342344
# CONFIG_RT_USING_ALARM is not set
343345
# CONFIG_RT_USING_SOFT_RTC is not set
344-
# CONFIG_RT_USING_SDIO is not set
345-
# CONFIG_RT_USING_SPI is not set
346+
CONFIG_RT_USING_SDIO=y
347+
CONFIG_RT_SDIO_STACK_SIZE=4096
348+
CONFIG_RT_SDIO_THREAD_PRIORITY=15
349+
CONFIG_RT_MMCSD_STACK_SIZE=4096
350+
CONFIG_RT_MMCSD_THREAD_PRIORITY=22
351+
CONFIG_RT_MMCSD_MAX_PARTITION=16
352+
# CONFIG_RT_SDIO_DEBUG is not set
353+
# CONFIG_RT_USING_SDHCI is not set
354+
CONFIG_RT_USING_SPI=y
355+
# CONFIG_RT_USING_SOFT_SPI is not set
356+
CONFIG_RT_USING_QSPI=y
357+
# CONFIG_RT_USING_SPI_MSD is not set
358+
# CONFIG_RT_USING_SFUD is not set
359+
# CONFIG_RT_USING_ENC28J60 is not set
360+
# CONFIG_RT_USING_SPI_WIFI is not set
346361
# CONFIG_RT_USING_WDT is not set
347-
# CONFIG_RT_USING_AUDIO is not set
362+
CONFIG_RT_USING_AUDIO=y
363+
CONFIG_RT_AUDIO_REPLAY_MP_BLOCK_SIZE=4096
364+
CONFIG_RT_AUDIO_REPLAY_MP_BLOCK_COUNT=2
365+
CONFIG_RT_AUDIO_RECORD_PIPE_SIZE=2048
348366
# CONFIG_RT_USING_SENSOR is not set
349367
# CONFIG_RT_USING_TOUCH is not set
350368
# CONFIG_RT_USING_LCD is not set
351369
# CONFIG_RT_USING_HWCRYPTO is not set
352370
# CONFIG_RT_USING_WIFI is not set
353-
# CONFIG_RT_USING_BLK is not set
371+
CONFIG_RT_USING_BLK=y
372+
373+
#
374+
# Partition Types
375+
#
376+
CONFIG_RT_BLK_PARTITION_DFS=y
377+
CONFIG_RT_BLK_PARTITION_EFI=y
378+
# end of Partition Types
379+
354380
# CONFIG_RT_USING_VIRTIO is not set
355-
# CONFIG_RT_USING_PIN is not set
381+
CONFIG_RT_USING_PIN=y
356382
CONFIG_RT_USING_KTIME=y
357383
# CONFIG_RT_USING_HWTIMER is not set
358384
# CONFIG_RT_USING_CHERRYUSB is not set
385+
CONFIG_RT_LWIP_PBUF_POOL_BUFSIZE=1700
359386
# end of Device Drivers
360387

361388
#
@@ -446,7 +473,7 @@ CONFIG_RT_USING_LWIP212=y
446473
CONFIG_RT_USING_LWIP_VER_NUM=0x20102
447474
# CONFIG_RT_USING_LWIP_IPV6 is not set
448475
CONFIG_RT_LWIP_MEM_ALIGNMENT=64
449-
CONFIG_RT_LWIP_IGMP=y
476+
# CONFIG_RT_LWIP_IGMP is not set
450477
CONFIG_RT_LWIP_ICMP=y
451478
# CONFIG_RT_LWIP_SNMP is not set
452479
CONFIG_RT_LWIP_DNS=y
@@ -472,14 +499,14 @@ CONFIG_RT_LWIP_TCP_PCB_NUM=4
472499
CONFIG_RT_LWIP_TCP_SEG_NUM=40
473500
CONFIG_RT_LWIP_TCP_SND_BUF=8196
474501
CONFIG_RT_LWIP_TCP_WND=8196
475-
CONFIG_RT_LWIP_TCPTHREAD_PRIORITY=16
476-
CONFIG_RT_LWIP_TCPTHREAD_MBOX_SIZE=8
502+
CONFIG_RT_LWIP_TCPTHREAD_PRIORITY=12
503+
CONFIG_RT_LWIP_TCPTHREAD_MBOX_SIZE=256
477504
CONFIG_RT_LWIP_TCPTHREAD_STACKSIZE=16184
478505
# CONFIG_LWIP_NO_RX_THREAD is not set
479506
# CONFIG_LWIP_NO_TX_THREAD is not set
480-
CONFIG_RT_LWIP_ETHTHREAD_PRIORITY=12
507+
CONFIG_RT_LWIP_ETHTHREAD_PRIORITY=16
481508
CONFIG_RT_LWIP_ETHTHREAD_STACKSIZE=8192
482-
CONFIG_RT_LWIP_ETHTHREAD_MBOX_SIZE=8
509+
CONFIG_RT_LWIP_ETHTHREAD_MBOX_SIZE=256
483510
CONFIG_RT_LWIP_REASSEMBLY_FRAG=y
484511
CONFIG_LWIP_NETIF_STATUS_CALLBACK=1
485512
CONFIG_LWIP_NETIF_LINK_CALLBACK=1
@@ -1045,6 +1072,9 @@ CONFIG_RT_PAGE_MAX_ORDER=16
10451072
# CONFIG_PKG_USING_NXP_MCX_SERIES_DRIVER is not set
10461073
# CONFIG_PKG_USING_NXP_LPC_DRIVER is not set
10471074
# CONFIG_PKG_USING_NXP_LPC55S_DRIVER is not set
1075+
# CONFIG_PKG_USING_NXP_IMX6SX_DRIVER is not set
1076+
# CONFIG_PKG_USING_NXP_IMX6UL_DRIVER is not set
1077+
# CONFIG_PKG_USING_NXP_IMXRT_DRIVER is not set
10481078
# end of NXP HAL & SDK Drivers
10491079
# end of HAL & SDK Drivers
10501080

@@ -1213,6 +1243,8 @@ CONFIG_RT_PAGE_MAX_ORDER=16
12131243
# CONFIG_PKG_USING_GC9A01 is not set
12141244
# CONFIG_PKG_USING_IK485 is not set
12151245
# CONFIG_PKG_USING_SERVO is not set
1246+
# CONFIG_PKG_USING_SEAN_WS2812B is not set
1247+
# CONFIG_PKG_USING_IC74HC165 is not set
12161248
# CONFIG_PKG_USING_SPI_TOOLS is not set
12171249
# end of peripheral libraries and drivers
12181250

@@ -1574,7 +1606,13 @@ CONFIG_RT_USING_UART1=y
15741606
# CONFIG_BSP_USING_CAN is not set
15751607
# CONFIG_BSP_USING_GPIO is not set
15761608
# CONFIG_BSP_USING_QSPI is not set
1609+
CONFIG_BSP_USING_ETH_LAYER=y
15771610
# CONFIG_BSP_USING_ETH is not set
1611+
CONFIG_BSP_USING_ETH_MSG=y
1612+
CONFIG_RT_USING_XMAC0_MSG=y
1613+
# CONFIG_RT_USING_XMAC1_MSG is not set
1614+
# CONFIG_RT_USING_XMAC2_MSG is not set
1615+
# CONFIG_RT_USING_XMAC3_MSG is not set
15781616
# CONFIG_BSP_USING_PWM is not set
15791617
# CONFIG_BSP_USING_SDIF is not set
15801618
# CONFIG_BSP_USING_DC is not set
@@ -1598,12 +1636,11 @@ CONFIG_TARGET_ARMV8_AARCH64=y
15981636
#
15991637
# Soc configuration
16001638
#
1601-
# CONFIG_TARGET_PHYTIUMPI is not set
1602-
# CONFIG_TARGET_E2000Q is not set
1603-
# CONFIG_TARGET_E2000D is not set
1604-
# CONFIG_TARGET_E2000S is not set
1605-
# CONFIG_TARGET_FT2004 is not set
1606-
# CONFIG_TARGET_D2000 is not set
1639+
# CONFIG_TARGET_PE2204 is not set
1640+
# CONFIG_TARGET_PE2202 is not set
1641+
# CONFIG_TARGET_PE2201 is not set
1642+
# CONFIG_TARGET_PD1904 is not set
1643+
# CONFIG_TARGET_PD2008 is not set
16071644
# CONFIG_TARGET_PD2308 is not set
16081645
# CONFIG_TARGET_PS2316 is not set
16091646
CONFIG_TARGET_PD2408=y
@@ -1654,6 +1691,8 @@ CONFIG_LOG_DEBUG=y
16541691
# CONFIG_LOG_EXTRA_INFO is not set
16551692
# CONFIG_LOG_DISPALY_CORE_NUM is not set
16561693
# CONFIG_BOOTUP_DEBUG_PRINTS is not set
1694+
CONFIG_USE_NS_GTIMER=y
1695+
# CONFIG_USE_VIRTUAL_GTIMER is not set
16571696
# CONFIG_USE_DEFAULT_INTERRUPT_CONFIG is not set
16581697
# end of Sdk common configuration
16591698
# end of Standalone Setting

‎bsp/phytium/aarch64/rtconfig.h‎

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
/* end of klibc options */
7575
#define RT_NAME_MAX 16
7676
#define RT_USING_SMP
77-
#define RT_CPUS_NR 2
77+
#define RT_CPUS_NR 8
7878
#define RT_ALIGN_SIZE 4
7979
#define RT_THREAD_PRIORITY_32
8080
#define RT_THREAD_PRIORITY_MAX 32
@@ -207,13 +207,36 @@
207207
#define RT_USING_SERIAL_V1
208208
#define RT_SERIAL_USING_DMA
209209
#define RT_SERIAL_RB_BUFSZ 64
210+
#define RT_USING_CAN
210211
#define RT_USING_I2C
211212
#define RT_USING_I2C_BITOPS
212213
#define RT_USING_NULL
213214
#define RT_USING_ZERO
214215
#define RT_USING_RANDOM
216+
#define RT_USING_PWM
215217
#define RT_USING_RTC
218+
#define RT_USING_SDIO
219+
#define RT_SDIO_STACK_SIZE 4096
220+
#define RT_SDIO_THREAD_PRIORITY 15
221+
#define RT_MMCSD_STACK_SIZE 4096
222+
#define RT_MMCSD_THREAD_PRIORITY 22
223+
#define RT_MMCSD_MAX_PARTITION 16
224+
#define RT_USING_SPI
225+
#define RT_USING_QSPI
226+
#define RT_USING_AUDIO
227+
#define RT_AUDIO_REPLAY_MP_BLOCK_SIZE 4096
228+
#define RT_AUDIO_REPLAY_MP_BLOCK_COUNT 2
229+
#define RT_AUDIO_RECORD_PIPE_SIZE 2048
230+
#define RT_USING_BLK
231+
232+
/* Partition Types */
233+
234+
#define RT_BLK_PARTITION_DFS
235+
#define RT_BLK_PARTITION_EFI
236+
/* end of Partition Types */
237+
#define RT_USING_PIN
216238
#define RT_USING_KTIME
239+
#define RT_LWIP_PBUF_POOL_BUFSIZE 1700
217240
/* end of Device Drivers */
218241

219242
/* C/C++ and POSIX layer */
@@ -269,7 +292,6 @@
269292
#define RT_USING_LWIP212
270293
#define RT_USING_LWIP_VER_NUM 0x20102
271294
#define RT_LWIP_MEM_ALIGNMENT 64
272-
#define RT_LWIP_IGMP
273295
#define RT_LWIP_ICMP
274296
#define RT_LWIP_DNS
275297

@@ -290,12 +312,12 @@
290312
#define RT_LWIP_TCP_SEG_NUM 40
291313
#define RT_LWIP_TCP_SND_BUF 8196
292314
#define RT_LWIP_TCP_WND 8196
293-
#define RT_LWIP_TCPTHREAD_PRIORITY 16
294-
#define RT_LWIP_TCPTHREAD_MBOX_SIZE 8
315+
#define RT_LWIP_TCPTHREAD_PRIORITY 12
316+
#define RT_LWIP_TCPTHREAD_MBOX_SIZE 256
295317
#define RT_LWIP_TCPTHREAD_STACKSIZE 16184
296-
#define RT_LWIP_ETHTHREAD_PRIORITY 12
318+
#define RT_LWIP_ETHTHREAD_PRIORITY 16
297319
#define RT_LWIP_ETHTHREAD_STACKSIZE 8192
298-
#define RT_LWIP_ETHTHREAD_MBOX_SIZE 8
320+
#define RT_LWIP_ETHTHREAD_MBOX_SIZE 256
299321
#define RT_LWIP_REASSEMBLY_FRAG
300322
#define LWIP_NETIF_STATUS_CALLBACK 1
301323
#define LWIP_NETIF_LINK_CALLBACK 1
@@ -547,6 +569,9 @@
547569
#define BSP_USING_UART_LAYER
548570
#define BSP_USING_UART
549571
#define RT_USING_UART1
572+
#define BSP_USING_ETH_LAYER
573+
#define BSP_USING_ETH_MSG
574+
#define RT_USING_XMAC0_MSG
550575
/* end of On-chip Peripheral Drivers */
551576

552577
/* Board extended module Drivers */
@@ -586,6 +611,7 @@
586611

587612
#define ELOG_LINE_BUF_SIZE 0x100
588613
#define LOG_DEBUG
614+
#define USE_NS_GTIMER
589615
/* end of Sdk common configuration */
590616
/* end of Standalone Setting */
591617

‎bsp/phytium/libraries/SConscript‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,13 @@ if GetDepend(['BSP_USING_ETH']):
121121
src += Glob(PHYTIUM_SDK_DIR+'/drivers/eth/fxmac/*.c') + Glob(PORT_DRV_DIR+'/drv_xmac.c')
122122
path += [PHYTIUM_SDK_DIR + '/drivers/eth/fxmac/'] + [PHYTIUM_SDK_DIR + '/drivers/eth/fxmac/phy/']
123123

124+
125+
## eth_v2
126+
if GetDepend(['BSP_USING_ETH_MSG']):
127+
src += Glob(PHYTIUM_SDK_DIR+'/drivers/eth/fxmac_v2_0/*.c') + Glob(PORT_DRV_DIR+'/drv_xmac_msg.c')
128+
path += [PHYTIUM_SDK_DIR + '/drivers/eth/fxmac_v2_0/'] + [PHYTIUM_SDK_DIR + '/drivers/msg']
129+
130+
124131
## sdif
125132
if GetDepend(['BSP_USING_SDIF']):
126133
src += Glob(PHYTIUM_SDK_DIR+'/drivers/mmc/fsdif/*.c') + Glob(PORT_DRV_DIR+'/drv_sdif.c')
@@ -225,21 +232,6 @@ if GetDepend(['FIREFLY_DEMO_BOARD']):
225232
if GetDepend(['BSP_USING_SDIF_LAYER']):
226233
src += Glob(PHYTIUM_SDK_DIR+'/board/firefly/fsdif_timing.c')
227234

228-
if GetDepend(['PD2408_TEST_A_BOARD']):
229-
src += Glob(PHYTIUM_SDK_DIR+'/board/pd2408_test_a/fio_mux.c')
230-
path += [PHYTIUM_SDK_DIR + '/board/pd2408_test_a/']
231-
232-
if GetDepend(['BSP_USING_SDIF_LAYER']):
233-
src += Glob(PHYTIUM_SDK_DIR+'/board/pd2408_test_a/fsdif_timing.c')
234-
235-
if GetDepend(['PD2408_TEST_B_BOARD']):
236-
src += Glob(PHYTIUM_SDK_DIR+'/board/pd2408_test_b/fio_mux.c')
237-
path += [PHYTIUM_SDK_DIR + '/board/pd2408_test_b/']
238-
239-
if GetDepend(['BSP_USING_SDIF_LAYER']):
240-
src += Glob(PHYTIUM_SDK_DIR+'/board/pd2408_test_b/fsdif_timing.c')
241-
242-
243235
LIBS = []
244236
LIBPATH = []
245237

‎bsp/phytium/libraries/common/fearly_uart.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ void FEarlyUartProbe(void)
8585
#ifdef RT_USING_SMART
8686
config.base_address = (uintptr)rt_ioremap((void *)config.base_address, 0x2000);
8787
#endif
88-
FPl011CfgGeneralInitialize(&early_uart, &config);
88+
FPl011CfgInitialize(&early_uart, &config);
8989
return;
9090
}
9191
/************************** Constant Definitions *****************************/

‎bsp/phytium/libraries/drivers/Kconfig‎

Lines changed: 46 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -265,14 +265,57 @@ menu "On-chip Peripheral Drivers"
265265
endif
266266
endif
267267

268-
menuconfig BSP_USING_ETH
269-
bool "Enable ETH"
268+
menuconfig BSP_USING_ETH_LAYER
269+
bool "Enable ETH Layer"
270270
default n
271-
if BSP_USING_ETH
271+
if BSP_USING_ETH_LAYER
272272
config RT_LWIP_PBUF_POOL_BUFSIZE
273273
int "The size of each pbuf in the pbuf pool"
274274
range 1500 2000
275275
default 1700
276+
277+
choice
278+
prompt "Select ETH Mode"
279+
config BSP_USING_ETH
280+
bool "Standard ETH"
281+
help
282+
Use standard ETH communication mode
283+
config BSP_USING_ETH_MSG
284+
bool "IOP message-based ETH"
285+
help
286+
Use IOP message-based ETH communication
287+
endchoice
288+
289+
290+
if BSP_USING_ETH
291+
config RT_USING_XMAC0
292+
bool "Enable XMAC0"
293+
default n
294+
config RT_USING_XMAC1
295+
bool "Enable XMAC1"
296+
default n
297+
config RT_USING_XMAC2
298+
bool "Enable XMAC2"
299+
default n
300+
config RT_USING_XMAC3
301+
bool "Enable XMAC3"
302+
default n
303+
endif
304+
305+
if BSP_USING_ETH_MSG
306+
config RT_USING_XMAC0_MSG
307+
bool "Enable XMAC0_MSG"
308+
default n
309+
config RT_USING_XMAC1_MSG
310+
bool "Enable XMAC1_MSG"
311+
default n
312+
config RT_USING_XMAC2_MSG
313+
bool "Enable XMAC2_MSG"
314+
default n
315+
config RT_USING_XMAC3_MSG
316+
bool "Enable XMAC3_MSG"
317+
default n
318+
endif
276319
endif
277320

278321
menuconfig BSP_USING_PWM

0 commit comments

Comments
 (0)