Skip to content

Commit 045dd73

Browse files
committed
修正部分定义
1 parent d317bc5 commit 045dd73

File tree

22 files changed

+37
-21
lines changed

22 files changed

+37
-21
lines changed

bsp/xuantie/smartl/e902/.config

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
CONFIG_XUANTIAN_XIAOHUI_E902=y
12

23
#
34
# RT-Thread Kernel
@@ -187,6 +188,9 @@ CONFIG_RT_VER_NUM=0x50201
187188
CONFIG_RT_BACKTRACE_LEVEL_MAX_NR=32
188189
# end of RT-Thread Kernel
189190

191+
CONFIG_ARCH_RISCV=y
192+
CONFIG_ARCH_RISCV32=y
193+
190194
#
191195
# RT-Thread Components
192196
#
@@ -805,6 +809,7 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0
805809

806810
# CONFIG_PKG_USING_NRF5X_SDK is not set
807811
# CONFIG_PKG_USING_NRFX is not set
812+
# CONFIG_PKG_USING_NUCLEI_SDK is not set
808813
# CONFIG_PKG_USING_RASPBERRYPI_PICO_SDK is not set
809814
# CONFIG_PKG_USING_MM32 is not set
810815

bsp/xuantie/smartl/e902/Kconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@ RTT_DIR := ../../../..
66

77
PKGS_DIR := packages
88

9+
config XUANTIAN_XIAOHUI_E902
10+
bool
11+
select ARCH_RISCV32
12+
select RT_USING_COMPONENTS_INIT
13+
select RT_USING_USER_MAIN
14+
default y
15+
916
source "$(RTT_DIR)/Kconfig"
1017
osource "$PKGS_DIR/Kconfig"
1118
rsource "board/Kconfig"

bsp/xuantie/smartl/e902/rtconfig.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#ifndef RT_CONFIG_H__
22
#define RT_CONFIG_H__
33

4+
#define XUANTIAN_XIAOHUI_E902
5+
46
/* RT-Thread Kernel */
57

68
/* klibc options */
@@ -108,6 +110,8 @@
108110
#define RT_VER_NUM 0x50201
109111
#define RT_BACKTRACE_LEVEL_MAX_NR 32
110112
/* end of RT-Thread Kernel */
113+
#define ARCH_RISCV
114+
#define ARCH_RISCV32
111115

112116
/* RT-Thread Components */
113117

bsp/xuantie/smartl/e902/rtconfig.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
MCPU_DEFINE = ' -DCONFIG_CPU_XUANTIE_E902=1 ' # Modify here based on CPU architecture.
4545
DEVICE = MCPU + MCPU_DEFINE + ' -Wno-main -mcmodel=medlow'
4646

47-
# 提取全局宏定义
4847
GLOBAL_DEFINES = (
4948
'-DCONFIG_KERNEL_RTTHREAD=1 '
5049
'-D__RT_KERNEL_SOURCE__=1 '

bsp/xuantie/smartl/e907/rtconfig.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
MCPU_DEFINE = ' -DCONFIG_CPU_XUANTIE_E907FD=1 ' # Modify here based on CPU architecture.
4545
DEVICE = MCPU + MCPU_DEFINE + ' -Wno-main -mcmodel=medlow'
4646

47-
# 提取全局宏定义
4847
GLOBAL_DEFINES = (
4948
'-DCONFIG_KERNEL_RTTHREAD=1 '
5049
'-D__RT_KERNEL_SOURCE__=1 '

bsp/xuantie/xiaohui/c906/.config

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CONFIG_XUANTIAN_XIAOHUI_R920=y
1+
CONFIG_XUANTIAN_XIAOHUI_C906=y
22

33
#
44
# RT-Thread Kernel
@@ -191,6 +191,9 @@ CONFIG_RT_BACKTRACE_LEVEL_MAX_NR=32
191191

192192
CONFIG_ARCH_CPU_64BIT=y
193193
CONFIG_ARCH_RISCV=y
194+
CONFIG_ARCH_RISCV_FPU=y
195+
# CONFIG_ARCH_RISCV_FPU_S is not set
196+
CONFIG_ARCH_RISCV_FPU_D=y
194197
CONFIG_ARCH_RISCV64=y
195198
CONFIG_ARCH_USING_NEW_CTX_SWITCH=y
196199

@@ -1350,6 +1353,6 @@ CONFIG_SOC_XUANTIE=y
13501353
#
13511354
CONFIG_BSP_USING_UART=y
13521355
CONFIG_BSP_USING_UART0=y
1353-
# CONFIG_ENABLE_FPU is not set
1356+
CONFIG_ENABLE_FPU=y
13541357
# end of On-chip Peripheral Drivers
13551358
# end of Hardware Drivers Config

bsp/xuantie/xiaohui/c906/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ RTT_DIR := ../../../..
66

77
PKGS_DIR := packages
88

9-
config XUANTIAN_XIAOHUI_R920
9+
config XUANTIAN_XIAOHUI_C906
1010
bool
1111
select ARCH_RISCV64
1212
select RT_USING_COMPONENTS_INIT

bsp/xuantie/xiaohui/c906/qemu.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ if exist "!CONFIG_FILE!" (
3131
:: Load CPU parameter from config file or set default
3232
if exist "!CPU_CONFIG_FILE!" (
3333
set /p CPU_PARAM=<"!CPU_CONFIG_FILE!"
34-
if not defined CPU_PARAM set "CPU_PARAM=c906"
34+
if not defined CPU_PARAM set "CPU_PARAM=c906fd"
3535
) else (
36-
set "CPU_PARAM=c906"
36+
set "CPU_PARAM=c906fd"
3737
)
3838

3939
:: Prompt for new QEMU directory

bsp/xuantie/xiaohui/c906/rtconfig.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef RT_CONFIG_H__
22
#define RT_CONFIG_H__
33

4-
#define XUANTIAN_XIAOHUI_R920
4+
#define XUANTIAN_XIAOHUI_C906
55

66
/* RT-Thread Kernel */
77

@@ -112,6 +112,8 @@
112112
/* end of RT-Thread Kernel */
113113
#define ARCH_CPU_64BIT
114114
#define ARCH_RISCV
115+
#define ARCH_RISCV_FPU
116+
#define ARCH_RISCV_FPU_D
115117
#define ARCH_RISCV64
116118
#define ARCH_USING_NEW_CTX_SWITCH
117119

@@ -389,6 +391,7 @@
389391

390392
#define BSP_USING_UART
391393
#define BSP_USING_UART0
394+
#define ENABLE_FPU
392395
/* end of On-chip Peripheral Drivers */
393396
/* end of Hardware Drivers Config */
394397

bsp/xuantie/xiaohui/c906/rtconfig.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
MCPU_DEFINE = ' -DCONFIG_CPU_XUANTIE_C906FD=1 ' # Modify here based on CPU architecture.
4545
DEVICE = MCPU + MCPU_DEFINE + ' -Wno-main -mcmodel=medany -MP -MMD '
4646

47-
# 提取全局宏定义
4847
GLOBAL_DEFINES = (
4948
' -DCONFIG_KERNEL_RTTHREAD=1 '
5049
' -D__RT_KERNEL_SOURCE__=1 '

0 commit comments

Comments
 (0)