Skip to content

Commit 83a06b0

Browse files
messigogogomessigogogo
committed
update
1 parent fff758e commit 83a06b0

File tree

4 files changed

+26
-70
lines changed

4 files changed

+26
-70
lines changed

‎bsp/phytium/aarch64/.config

+14-48
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ CONFIG_RT_NAME_MAX=16
1111
# CONFIG_RT_USING_SMART is not set
1212
# CONFIG_RT_USING_NANO is not set
1313
# CONFIG_RT_USING_AMP is not set
14-
# CONFIG_RT_USING_SMP is not set
15-
CONFIG_RT_CPUS_NR=1
14+
CONFIG_RT_USING_SMP=y
15+
CONFIG_RT_CPUS_NR=4
1616
CONFIG_RT_ALIGN_SIZE=4
1717
# CONFIG_RT_THREAD_PRIORITY_8 is not set
1818
CONFIG_RT_THREAD_PRIORITY_32=y
@@ -26,6 +26,7 @@ CONFIG_RT_HOOK_USING_FUNC_PTR=y
2626
CONFIG_RT_USING_IDLE_HOOK=y
2727
CONFIG_RT_IDLE_HOOK_LIST_SIZE=4
2828
CONFIG_IDLE_THREAD_STACK_SIZE=8192
29+
CONFIG_SYSTEM_THREAD_STACK_SIZE=8192
2930
CONFIG_RT_USING_TIMER_SOFT=y
3031
CONFIG_RT_TIMER_THREAD_PRIO=4
3132
CONFIG_RT_TIMER_THREAD_STACK_SIZE=8192
@@ -43,6 +44,7 @@ CONFIG_RT_DEBUGING_COLOR=y
4344
CONFIG_RT_DEBUGING_CONTEXT=y
4445
# CONFIG_RT_DEBUGING_AUTO_INIT is not set
4546
# CONFIG_RT_DEBUGING_PAGE_LEAK is not set
47+
# CONFIG_RT_DEBUGING_SPINLOCK is not set
4648

4749
#
4850
# Inter-Thread communication
@@ -77,7 +79,7 @@ CONFIG_RT_USING_DEVICE=y
7779
# CONFIG_RT_USING_DEVICE_OPS is not set
7880
# CONFIG_RT_USING_INTERRUPT_INFO is not set
7981
# CONFIG_RT_USING_THREADSAFE_PRINTF is not set
80-
# CONFIG_RT_USING_SCHED_THREAD_CTX is not set
82+
CONFIG_RT_USING_SCHED_THREAD_CTX=y
8183
CONFIG_RT_USING_CONSOLE=y
8284
CONFIG_RT_CONSOLEBUF_SIZE=128
8385
CONFIG_RT_CONSOLE_DEVICE_NAME="uart1"
@@ -188,7 +190,7 @@ CONFIG_RT_USING_SERIAL_V1=y
188190
CONFIG_RT_SERIAL_USING_DMA=y
189191
CONFIG_RT_SERIAL_RB_BUFSZ=64
190192
CONFIG_RT_USING_CAN=y
191-
# CONFIG_RT_CAN_USING_HDR is not set
193+
CONFIG_RT_CAN_USING_HDR=y
192194
CONFIG_RT_CAN_USING_CANFD=y
193195
# CONFIG_RT_USING_HWTIMER is not set
194196
# CONFIG_RT_USING_CPUTIME is not set
@@ -1225,7 +1227,7 @@ CONFIG_PKG_USING_KERNEL_SAMPLES_EN=y
12251227
#
12261228
# Hardware Drivers
12271229
#
1228-
# CONFIG_DRV_DEBUG is not set
1230+
CONFIG_DRV_DEBUG=y
12291231

12301232
#
12311233
# On-chip Peripheral Drivers
@@ -1236,51 +1238,15 @@ CONFIG_RT_USING_UART0=y
12361238
CONFIG_RT_USING_UART1=y
12371239
# CONFIG_RT_USING_UART2 is not set
12381240
# CONFIG_RT_USING_UART3 is not set
1239-
CONFIG_BSP_USING_SPI=y
1240-
CONFIG_RT_USING_SPIM0=y
1241-
CONFIG_RT_USING_SPIM1=y
1242-
CONFIG_RT_USING_SPIM2=y
1243-
CONFIG_RT_USING_SPIM3=y
1241+
# CONFIG_BSP_USING_SPI is not set
12441242
# CONFIG_BSP_USING_CAN is not set
1245-
CONFIG_BSP_USING_GPIO=y
1246-
CONFIG_BSP_USING_QSPI=y
1247-
CONFIG_RT_USING_QSPI0=y
1248-
CONFIG_USING_QSPI_CHANNEL0=y
1249-
# CONFIG_USING_QSPI_CHANNEL1 is not set
1250-
CONFIG_BSP_USING_ETH=y
1251-
CONFIG_RT_LWIP_PBUF_POOL_BUFSIZE=1700
1252-
CONFIG_BSP_USING_PWM=y
1253-
# CONFIG_RT_USING_PWM0 is not set
1254-
# CONFIG_RT_USING_PWM1 is not set
1255-
CONFIG_RT_USING_PWM2=y
1256-
# CONFIG_RT_USING_PWM3 is not set
1257-
# CONFIG_RT_USING_PWM4 is not set
1258-
# CONFIG_RT_USING_PWM5 is not set
1259-
# CONFIG_RT_USING_PWM6 is not set
1260-
# CONFIG_RT_USING_PWM7 is not set
1261-
CONFIG_BSP_USING_I2C=y
1262-
CONFIG_I2C_USE_MIO=y
1263-
CONFIG_RT_USING_MIO0=y
1264-
CONFIG_RT_USING_MIO1=y
1265-
CONFIG_RT_USING_MIO2=y
1266-
# CONFIG_RT_USING_MIO3 is not set
1267-
# CONFIG_RT_USING_MIO4 is not set
1268-
# CONFIG_RT_USING_MIO5 is not set
1269-
# CONFIG_RT_USING_MIO6 is not set
1270-
# CONFIG_RT_USING_MIO7 is not set
1271-
# CONFIG_RT_USING_MIO8 is not set
1272-
# CONFIG_RT_USING_MIO9 is not set
1273-
CONFIG_RT_USING_MIO10=y
1274-
# CONFIG_RT_USING_MIO11 is not set
1275-
# CONFIG_RT_USING_MIO12 is not set
1276-
# CONFIG_RT_USING_MIO13 is not set
1277-
# CONFIG_RT_USING_MIO14 is not set
1278-
# CONFIG_RT_USING_MIO15 is not set
1279-
# CONFIG_I2C_USE_CONTROLLER is not set
1243+
# CONFIG_BSP_USING_GPIO is not set
1244+
# CONFIG_BSP_USING_QSPI is not set
1245+
# CONFIG_BSP_USING_ETH is not set
1246+
# CONFIG_BSP_USING_PWM is not set
1247+
# CONFIG_BSP_USING_I2C is not set
12801248
# CONFIG_BSP_USING_SDIF is not set
1281-
CONFIG_BSP_USING_DC=y
1282-
# CONFIG_RT_USING_DC_CHANNEL0 is not set
1283-
# CONFIG_RT_USING_DC_CHANNEL1 is not set
1249+
# CONFIG_BSP_USING_DC is not set
12841250
# CONFIG_BSP_USING_XHCI is not set
12851251
# CONFIG_BSP_USING_PUSB2 is not set
12861252

‎bsp/phytium/aarch64/rtconfig.h

+6-21
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
/* RT-Thread Kernel */
88

99
#define RT_NAME_MAX 16
10-
#define RT_CPUS_NR 1
10+
#define RT_USING_SMP
11+
#define RT_CPUS_NR 4
1112
#define RT_ALIGN_SIZE 4
1213
#define RT_THREAD_PRIORITY_32
1314
#define RT_THREAD_PRIORITY_MAX 32
@@ -18,6 +19,7 @@
1819
#define RT_USING_IDLE_HOOK
1920
#define RT_IDLE_HOOK_LIST_SIZE 4
2021
#define IDLE_THREAD_STACK_SIZE 8192
22+
#define SYSTEM_THREAD_STACK_SIZE 8192
2123
#define RT_USING_TIMER_SOFT
2224
#define RT_TIMER_THREAD_PRIO 4
2325
#define RT_TIMER_THREAD_STACK_SIZE 8192
@@ -48,6 +50,7 @@
4850
#define RT_USING_HEAP_ISR
4951
#define RT_USING_HEAP
5052
#define RT_USING_DEVICE
53+
#define RT_USING_SCHED_THREAD_CTX
5154
#define RT_USING_CONSOLE
5255
#define RT_CONSOLEBUF_SIZE 128
5356
#define RT_CONSOLE_DEVICE_NAME "uart1"
@@ -130,6 +133,7 @@
130133
#define RT_SERIAL_USING_DMA
131134
#define RT_SERIAL_RB_BUFSZ 64
132135
#define RT_USING_CAN
136+
#define RT_CAN_USING_HDR
133137
#define RT_CAN_USING_CANFD
134138
#define RT_USING_I2C
135139
#define RT_USING_I2C_BITOPS
@@ -381,33 +385,14 @@
381385

382386
/* Hardware Drivers */
383387

388+
#define DRV_DEBUG
384389

385390
/* On-chip Peripheral Drivers */
386391

387392
#define BSP_USING_IOPAD
388393
#define BSP_USING_UART
389394
#define RT_USING_UART0
390395
#define RT_USING_UART1
391-
#define BSP_USING_SPI
392-
#define RT_USING_SPIM0
393-
#define RT_USING_SPIM1
394-
#define RT_USING_SPIM2
395-
#define RT_USING_SPIM3
396-
#define BSP_USING_GPIO
397-
#define BSP_USING_QSPI
398-
#define RT_USING_QSPI0
399-
#define USING_QSPI_CHANNEL0
400-
#define BSP_USING_ETH
401-
#define RT_LWIP_PBUF_POOL_BUFSIZE 1700
402-
#define BSP_USING_PWM
403-
#define RT_USING_PWM2
404-
#define BSP_USING_I2C
405-
#define I2C_USE_MIO
406-
#define RT_USING_MIO0
407-
#define RT_USING_MIO1
408-
#define RT_USING_MIO2
409-
#define RT_USING_MIO10
410-
#define BSP_USING_DC
411396

412397
/* Board extended module Drivers */
413398

‎bsp/phytium/board/phytium_cpu.h

+5-1
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,17 @@ rt_inline rt_uint32_t FGicRedistrubutiorIterate_rt(void)
6262
#else
6363
rt_uint64_t temp= redis_base;
6464
#endif
65-
gicr_typer_aff = FtIn32(temp+12);
65+
gicr_typer_aff = FtIn32(temp + 12);
6666
#ifdef RT_USING_SMART
6767
rt_iounmap((void*)temp);
6868
#endif
6969
if (mpidr_aff_32 == gicr_typer_aff)
7070
{
71+
#if RT_CPUS_NR <= 2
7172
return redis_base;
73+
#else
74+
return GICV3_RD_BASE_ADDR;
75+
#endif
7276
}
7377
}
7478

‎libcpu/aarch64/common/interrupt.c

+1
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ void rt_hw_interrupt_init(void)
116116
gic_cpu_base = platform_get_gic_cpu_base();
117117
#ifdef BSP_USING_GICV3
118118
gic_rdist_base = platform_get_gic_redist_base();
119+
rt_kprintf("gic_rdist_base == %x\n", gic_rdist_base);
119120
#endif
120121
#endif
121122

0 commit comments

Comments
 (0)