Skip to content

Commit 1052f99

Browse files
unicornxmysterywolf
authored andcommitted
bsp: cvitek: 906b: romfs -> diskfs
ROMFS is Read-Only Memory Filesystem. But ext4/fat are not read-only. So renamed: - mnt_romfs.c -> mnt_diskfs.c - BSP_ROOTFS_TYPE_ROMFS -> BSP_ROOTFS_TYPE_DISKFS Signed-off-by: Chen Wang <[email protected]>
1 parent c4ba5ee commit 1052f99

File tree

5 files changed

+192
-32
lines changed

5 files changed

+192
-32
lines changed

bsp/cvitek/cv18xx_risc-v/.config

Lines changed: 119 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,114 @@
22
#
33
# RT-Thread Kernel
44
#
5+
6+
#
7+
# klibc options
8+
#
9+
10+
#
11+
# ------------rt_memset options------------
12+
#
13+
# CONFIG_RT_KLIBC_USING_USER_MEMSET is not set
14+
# CONFIG_RT_KLIBC_USING_LIBC_MEMSET is not set
15+
# CONFIG_RT_KLIBC_USING_TINY_MEMSET is not set
16+
17+
#
18+
# ------------rt_memcpy options------------
19+
#
20+
# CONFIG_RT_KLIBC_USING_USER_MEMCPY is not set
21+
# CONFIG_RT_KLIBC_USING_LIBC_MEMCPY is not set
22+
# CONFIG_RT_KLIBC_USING_TINY_MEMCPY is not set
23+
24+
#
25+
# ------------rt_memmove options------------
26+
#
27+
# CONFIG_RT_KLIBC_USING_USER_MEMMOVE is not set
28+
# CONFIG_RT_KLIBC_USING_LIBC_MEMMOVE is not set
29+
30+
#
31+
# ------------rt_memcmp options------------
32+
#
33+
# CONFIG_RT_KLIBC_USING_USER_MEMCMP is not set
34+
# CONFIG_RT_KLIBC_USING_LIBC_MEMCMP is not set
35+
36+
#
37+
# ------------rt_strstr options------------
38+
#
39+
# CONFIG_RT_KLIBC_USING_USER_STRSTR is not set
40+
# CONFIG_RT_KLIBC_USING_LIBC_STRSTR is not set
41+
42+
#
43+
# ------------rt_strcasecmp options------------
44+
#
45+
# CONFIG_RT_KLIBC_USING_USER_STRCASECMP is not set
46+
47+
#
48+
# ------------rt_strncpy options------------
49+
#
50+
# CONFIG_RT_KLIBC_USING_USER_STRNCPY is not set
51+
# CONFIG_RT_KLIBC_USING_LIBC_STRNCPY is not set
52+
53+
#
54+
# ------------rt_strcpy options------------
55+
#
56+
# CONFIG_RT_KLIBC_USING_USER_STRCPY is not set
57+
# CONFIG_RT_KLIBC_USING_LIBC_STRCPY is not set
58+
59+
#
60+
# ------------rt_strncmp options------------
61+
#
62+
# CONFIG_RT_KLIBC_USING_USER_STRNCMP is not set
63+
# CONFIG_RT_KLIBC_USING_LIBC_STRNCMP is not set
64+
65+
#
66+
# ------------rt_strcmp options------------
67+
#
68+
# CONFIG_RT_KLIBC_USING_USER_STRCMP is not set
69+
# CONFIG_RT_KLIBC_USING_LIBC_STRCMP is not set
70+
71+
#
72+
# ------------rt_strlen options------------
73+
#
74+
# CONFIG_RT_KLIBC_USING_USER_STRLEN is not set
75+
# CONFIG_RT_KLIBC_USING_LIBC_STRLEN is not set
76+
77+
#
78+
# ------------rt_strlen options------------
79+
#
80+
81+
#
82+
# ------------rt_strnlen options------------
83+
#
84+
# CONFIG_RT_KLIBC_USING_USER_STRNLEN is not set
85+
86+
#
87+
# ------------rt_vsscanf options------------
88+
#
89+
# CONFIG_RT_KLIBC_USING_LIBC_VSSCANF is not set
90+
91+
#
92+
# ------------rt_vsnprintf options------------
93+
#
94+
# CONFIG_RT_KLIBC_USING_LIBC_VSNPRINTF is not set
95+
CONFIG_RT_KLIBC_USING_VSNPRINTF_LONGLONG=y
96+
CONFIG_RT_KLIBC_USING_VSNPRINTF_STANDARD=y
97+
CONFIG_RT_KLIBC_USING_VSNPRINTF_DECIMAL_SPECIFIERS=y
98+
CONFIG_RT_KLIBC_USING_VSNPRINTF_EXPONENTIAL_SPECIFIERS=y
99+
CONFIG_RT_KLIBC_USING_VSNPRINTF_WRITEBACK_SPECIFIER=y
100+
CONFIG_RT_KLIBC_USING_VSNPRINTF_CHECK_NUL_IN_FORMAT_SPECIFIER=y
101+
# CONFIG_RT_KLIBC_USING_VSNPRINTF_MSVC_STYLE_INTEGER_SPECIFIERS is not set
102+
CONFIG_RT_KLIBC_USING_VSNPRINTF_INTEGER_BUFFER_SIZE=32
103+
CONFIG_RT_KLIBC_USING_VSNPRINTF_DECIMAL_BUFFER_SIZE=32
104+
CONFIG_RT_KLIBC_USING_VSNPRINTF_FLOAT_PRECISION=6
105+
CONFIG_RT_KLIBC_USING_VSNPRINTF_MAX_INTEGRAL_DIGITS_FOR_DECIMAL=9
106+
CONFIG_RT_KLIBC_USING_VSNPRINTF_LOG10_TAYLOR_TERMS=4
107+
# end of klibc options
108+
5109
CONFIG_RT_NAME_MAX=8
6110
# CONFIG_RT_USING_ARCH_DATA_TYPE is not set
7-
CONFIG_RT_USING_SMART=y
8111
# CONFIG_RT_USING_NANO is not set
112+
CONFIG_RT_USING_SMART=y
9113
# CONFIG_RT_USING_AMP is not set
10114
# CONFIG_RT_USING_SMP is not set
11115
CONFIG_RT_CPUS_NR=1
@@ -15,6 +119,7 @@ CONFIG_RT_THREAD_PRIORITY_32=y
15119
# CONFIG_RT_THREAD_PRIORITY_256 is not set
16120
CONFIG_RT_THREAD_PRIORITY_MAX=32
17121
CONFIG_RT_TICK_PER_SECOND=1000
122+
CONFIG_RT_USING_OVERFLOW_CHECK=y
18123
CONFIG_RT_USING_HOOK=y
19124
CONFIG_RT_HOOK_USING_FUNC_PTR=y
20125
# CONFIG_RT_USING_HOOKLIST is not set
@@ -28,26 +133,17 @@ CONFIG_RT_TIMER_THREAD_STACK_SIZE=16384
28133
CONFIG_RT_USING_CPU_USAGE_TRACER=y
29134

30135
#
31-
# kservice optimization
136+
# kservice options
32137
#
33138
# CONFIG_RT_USING_TINY_FFS is not set
34-
# end of kservice optimization
35-
36-
#
37-
# klibc optimization
38-
#
39-
# CONFIG_RT_KLIBC_USING_STDLIB is not set
40-
# CONFIG_RT_KLIBC_USING_TINY_SIZE is not set
41-
CONFIG_RT_KLIBC_USING_PRINTF_LONGLONG=y
42-
# end of klibc optimization
139+
# end of kservice options
43140

44141
CONFIG_RT_USING_DEBUG=y
45142
CONFIG_RT_DEBUGING_ASSERT=y
46143
CONFIG_RT_DEBUGING_COLOR=y
47144
CONFIG_RT_DEBUGING_CONTEXT=y
48145
# CONFIG_RT_DEBUGING_AUTO_INIT is not set
49146
# CONFIG_RT_DEBUGING_PAGE_LEAK is not set
50-
CONFIG_RT_USING_OVERFLOW_CHECK=y
51147

52148
#
53149
# Inter-Thread communication
@@ -206,6 +302,7 @@ CONFIG_RT_USING_CPUTIME_RISCV=y
206302
CONFIG_CPUTIME_TIMER_FREQ=25000000
207303
# CONFIG_RT_USING_I2C is not set
208304
# CONFIG_RT_USING_PHY is not set
305+
# CONFIG_RT_USING_PHY_V2 is not set
209306
# CONFIG_RT_USING_ADC is not set
210307
# CONFIG_RT_USING_DAC is not set
211308
CONFIG_RT_USING_NULL=y
@@ -235,6 +332,15 @@ CONFIG_RT_USING_WDT=y
235332
# CONFIG_RT_USING_LCD is not set
236333
# CONFIG_RT_USING_HWCRYPTO is not set
237334
# CONFIG_RT_USING_WIFI is not set
335+
CONFIG_RT_USING_BLK=y
336+
337+
#
338+
# Partition Types
339+
#
340+
CONFIG_RT_BLK_PARTITION_DFS=y
341+
CONFIG_RT_BLK_PARTITION_EFI=y
342+
# end of Partition Types
343+
238344
# CONFIG_RT_USING_VIRTIO is not set
239345
CONFIG_RT_USING_PIN=y
240346
CONFIG_RT_USING_KTIME=y
@@ -601,7 +707,6 @@ CONFIG_LWP_PTY_MAX_PARIS_LIMIT=64
601707
# CONFIG_PKG_USING_JSMN is not set
602708
# CONFIG_PKG_USING_AGILE_JSMN is not set
603709
# CONFIG_PKG_USING_PARSON is not set
604-
# CONFIG_PKG_USING_RYAN_JSON is not set
605710
# end of JSON: JavaScript Object Notation, a lightweight data-interchange format
606711

607712
#
@@ -812,8 +917,6 @@ CONFIG_LWP_PTY_MAX_PARIS_LIMIT=64
812917
#
813918
# STM32 HAL & SDK Drivers
814919
#
815-
# CONFIG_PKG_USING_STM32F4_HAL_DRIVER is not set
816-
# CONFIG_PKG_USING_STM32F4_CMSIS_DRIVER is not set
817920
# CONFIG_PKG_USING_STM32L4_HAL_DRIVER is not set
818921
# CONFIG_PKG_USING_STM32L4_CMSIS_DRIVER is not set
819922
# CONFIG_PKG_USING_STM32WB55_SDK is not set
@@ -1008,7 +1111,6 @@ CONFIG_LWP_PTY_MAX_PARIS_LIMIT=64
10081111
# CONFIG_PKG_USING_SYSTEM_RUN_LED is not set
10091112
# CONFIG_PKG_USING_BT_MX01 is not set
10101113
# CONFIG_PKG_USING_RGPOWER is not set
1011-
# CONFIG_PKG_USING_BT_MX02 is not set
10121114
# CONFIG_PKG_USING_SPI_TOOLS is not set
10131115
# end of peripheral libraries and drivers
10141116

@@ -1124,7 +1226,6 @@ CONFIG_PKG_ZLIB_VER="latest"
11241226
# CONFIG_PKG_USING_ARDUINO_MSGQ_C_CPP_DEMO is not set
11251227
# CONFIG_PKG_USING_ARDUINO_SKETCH_LOADER_DEMO is not set
11261228
# CONFIG_PKG_USING_ARDUINO_ULTRASOUND_RADAR is not set
1127-
# CONFIG_PKG_USING_ARDUINO_RTDUINO_SENSORFUSION_SHIELD is not set
11281229
# CONFIG_PKG_USING_ARDUINO_NINEINONE_SENSOR_SHIELD is not set
11291230
# CONFIG_PKG_USING_ARDUINO_SENSOR_KIT is not set
11301231
# CONFIG_PKG_USING_ARDUINO_MATLAB_SUPPORT is not set
@@ -1385,5 +1486,5 @@ CONFIG_SOC_TYPE_SG2002=y
13851486
CONFIG_BOARD_TYPE_MILKV_DUO256M=y
13861487
# CONFIG_BOARD_TYPE_MILKV_DUO256M_SPINOR is not set
13871488
# CONFIG_BOARD_TYPE_MILKV_DUOS is not set
1388-
CONFIG_BSP_ROOTFS_TYPE_ROMFS=y
1489+
CONFIG_BSP_ROOTFS_TYPE_DISKFS=y
13891490
# CONFIG_BSP_ROOTFS_TYPE_CROMFS is not set

bsp/cvitek/cv18xx_risc-v/Kconfig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,10 @@ endchoice
8484

8585
choice BSP_ROOTFS_TYPE
8686
prompt "rootfs type"
87-
default BSP_ROOTFS_TYPE_ROMFS
87+
default BSP_ROOTFS_TYPE_DISKFS
8888

89-
config BSP_ROOTFS_TYPE_ROMFS
90-
bool "ROMFS"
89+
config BSP_ROOTFS_TYPE_DISKFS
90+
bool "Disk FileSystems, e.g. ext4, fat ..."
9191
select RT_USING_DFS_ROMFS
9292

9393
config BSP_ROOTFS_TYPE_CROMFS

bsp/cvitek/cv18xx_risc-v/rtconfig.h

Lines changed: 68 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,71 @@
33

44
/* RT-Thread Kernel */
55

6+
/* klibc options */
7+
8+
/* ------------rt_memset options------------ */
9+
10+
11+
/* ------------rt_memcpy options------------ */
12+
13+
14+
/* ------------rt_memmove options------------ */
15+
16+
17+
/* ------------rt_memcmp options------------ */
18+
19+
20+
/* ------------rt_strstr options------------ */
21+
22+
23+
/* ------------rt_strcasecmp options------------ */
24+
25+
26+
/* ------------rt_strncpy options------------ */
27+
28+
29+
/* ------------rt_strcpy options------------ */
30+
31+
32+
/* ------------rt_strncmp options------------ */
33+
34+
35+
/* ------------rt_strcmp options------------ */
36+
37+
38+
/* ------------rt_strlen options------------ */
39+
40+
41+
/* ------------rt_strlen options------------ */
42+
43+
/* ------------rt_strnlen options------------ */
44+
45+
46+
/* ------------rt_vsscanf options------------ */
47+
48+
49+
/* ------------rt_vsnprintf options------------ */
50+
51+
#define RT_KLIBC_USING_VSNPRINTF_LONGLONG
52+
#define RT_KLIBC_USING_VSNPRINTF_STANDARD
53+
#define RT_KLIBC_USING_VSNPRINTF_DECIMAL_SPECIFIERS
54+
#define RT_KLIBC_USING_VSNPRINTF_EXPONENTIAL_SPECIFIERS
55+
#define RT_KLIBC_USING_VSNPRINTF_WRITEBACK_SPECIFIER
56+
#define RT_KLIBC_USING_VSNPRINTF_CHECK_NUL_IN_FORMAT_SPECIFIER
57+
#define RT_KLIBC_USING_VSNPRINTF_INTEGER_BUFFER_SIZE 32
58+
#define RT_KLIBC_USING_VSNPRINTF_DECIMAL_BUFFER_SIZE 32
59+
#define RT_KLIBC_USING_VSNPRINTF_FLOAT_PRECISION 6
60+
#define RT_KLIBC_USING_VSNPRINTF_MAX_INTEGRAL_DIGITS_FOR_DECIMAL 9
61+
#define RT_KLIBC_USING_VSNPRINTF_LOG10_TAYLOR_TERMS 4
62+
/* end of klibc options */
663
#define RT_NAME_MAX 8
764
#define RT_USING_SMART
865
#define RT_CPUS_NR 1
966
#define RT_ALIGN_SIZE 8
1067
#define RT_THREAD_PRIORITY_32
1168
#define RT_THREAD_PRIORITY_MAX 32
1269
#define RT_TICK_PER_SECOND 1000
70+
#define RT_USING_OVERFLOW_CHECK
1371
#define RT_USING_HOOK
1472
#define RT_HOOK_USING_FUNC_PTR
1573
#define RT_USING_IDLE_HOOK
@@ -20,19 +78,13 @@
2078
#define RT_TIMER_THREAD_STACK_SIZE 16384
2179
#define RT_USING_CPU_USAGE_TRACER
2280

23-
/* kservice optimization */
24-
25-
/* end of kservice optimization */
26-
27-
/* klibc optimization */
81+
/* kservice options */
2882

29-
#define RT_KLIBC_USING_VSNPRINTF_LONGLONG
30-
/* end of klibc optimization */
83+
/* end of kservice options */
3184
#define RT_USING_DEBUG
3285
#define RT_DEBUGING_ASSERT
3386
#define RT_DEBUGING_COLOR
3487
#define RT_DEBUGING_CONTEXT
35-
#define RT_USING_OVERFLOW_CHECK
3688

3789
/* Inter-Thread communication */
3890

@@ -157,6 +209,13 @@
157209
#define RT_MMCSD_THREAD_PREORITY 22
158210
#define RT_MMCSD_MAX_PARTITION 16
159211
#define RT_USING_WDT
212+
#define RT_USING_BLK
213+
214+
/* Partition Types */
215+
216+
#define RT_BLK_PARTITION_DFS
217+
#define RT_BLK_PARTITION_EFI
218+
/* end of Partition Types */
160219
#define RT_USING_PIN
161220
#define RT_USING_KTIME
162221
#define RT_USING_HWTIMER
@@ -495,6 +554,6 @@
495554
#define __STACKSIZE__ 8192
496555
#define SOC_TYPE_SG2002
497556
#define BOARD_TYPE_MILKV_DUO256M
498-
#define BSP_ROOTFS_TYPE_ROMFS
557+
#define BSP_ROOTFS_TYPE_DISKFS
499558

500559
#endif

bsp/cvitek/drivers/SConscript

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ if GetDepend('BSP_USING_PWM'):
4040

4141
if GetDepend('BSP_ROOTFS_TYPE_CROMFS'):
4242
src += ['port/mnt_cromfs.c']
43-
elif GetDepend('BSP_ROOTFS_TYPE_ROMFS'):
44-
src += ['port/mnt_romfs.c']
43+
elif GetDepend('BSP_ROOTFS_TYPE_DISKFS'):
44+
src += ['port/mnt_diskfs.c']
4545

4646
if GetDepend('BSP_USING_SDH'):
4747
src += ['drv_sdhci.c']

0 commit comments

Comments
 (0)