Skip to content

Commit 2322f01

Browse files
unicornxmysterywolf
unicornx
authored and
mysterywolf
committed
bsp: cvitek: remove support for spinor/spinand
Confirmed with milkv, only the sd card version is sold by default for duo in the market. The spi pins are provided through stamp holes, so that users can solder the corresponding components on their baseboard during secondary development. In order to simplify maintenance work, the mainline will only support the sd-card version and no longer support spinor/spinand. Updated config files the same in this patch. Signed-off-by: Chen Wang <unicorn_wang@outlook.com>
1 parent 9e36a5b commit 2322f01

File tree

18 files changed

+330
-152
lines changed

18 files changed

+330
-152
lines changed

‎bsp/cvitek/README.md

-2
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,7 @@ $ scons --menuconfig
146146
```shell
147147
Board Type (milkv-duo) --->
148148
( ) milkv-duo
149-
( ) milkv-duo-spinor
150149
(X) milkv-duo256m
151-
( ) milkv-duo256m-spinor
152150
( ) milkv-duos
153151
```
154152

‎bsp/cvitek/board_env.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
function get_board_type()
44
{
5-
BOARD_CONFIG=("CONFIG_BOARD_TYPE_MILKV_DUO" "CONFIG_BOARD_TYPE_MILKV_DUO_SPINOR" "CONFIG_BOARD_TYPE_MILKV_DUO_SPINAND" "CONFIG_BOARD_TYPE_MILKV_DUO256M" "CONFIG_BOARD_TYPE_MILKV_DUO256M_SPINOR" "CONFIG_BOARD_TYPE_MILKV_DUO256M_SPINAND" "CONFIG_BOARD_TYPE_MILKV_DUOS")
6-
BOARD_VALUE=("milkv-duo" "milkv-duo-spinor" "milkv-duo-spinand" "milkv-duo256m" "milkv-duo256m-spinor" "milkv-duo256m-spinand" "milkv-duos-sd")
7-
STORAGE_VAUE=("sd" "spinor" "spinand" "sd" "spinor" "spinand" "sd")
5+
BOARD_CONFIG=("CONFIG_BOARD_TYPE_MILKV_DUO" "CONFIG_BOARD_TYPE_MILKV_DUO256M" "CONFIG_BOARD_TYPE_MILKV_DUOS")
6+
BOARD_VALUE=("milkv-duo" "milkv-duo256m" "milkv-duos-sd")
7+
STORAGE_VAUE=("sd" "sd" "sd")
88

99
for ((i=0;i<${#BOARD_CONFIG[@]};i++))
1010
do

‎bsp/cvitek/c906_little/.config

+135-16
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,126 @@
22
#
33
# RT-Thread Kernel
44
#
5+
6+
#
7+
# klibc options
8+
#
9+
10+
#
11+
# rt_vsnprintf options
12+
#
13+
# CONFIG_RT_KLIBC_USING_LIBC_VSNPRINTF is not set
14+
CONFIG_RT_KLIBC_USING_VSNPRINTF_LONGLONG=y
15+
CONFIG_RT_KLIBC_USING_VSNPRINTF_STANDARD=y
16+
CONFIG_RT_KLIBC_USING_VSNPRINTF_DECIMAL_SPECIFIERS=y
17+
CONFIG_RT_KLIBC_USING_VSNPRINTF_EXPONENTIAL_SPECIFIERS=y
18+
CONFIG_RT_KLIBC_USING_VSNPRINTF_WRITEBACK_SPECIFIER=y
19+
CONFIG_RT_KLIBC_USING_VSNPRINTF_CHECK_NUL_IN_FORMAT_SPECIFIER=y
20+
# CONFIG_RT_KLIBC_USING_VSNPRINTF_MSVC_STYLE_INTEGER_SPECIFIERS is not set
21+
CONFIG_RT_KLIBC_USING_VSNPRINTF_INTEGER_BUFFER_SIZE=32
22+
CONFIG_RT_KLIBC_USING_VSNPRINTF_DECIMAL_BUFFER_SIZE=32
23+
CONFIG_RT_KLIBC_USING_VSNPRINTF_FLOAT_PRECISION=6
24+
CONFIG_RT_KLIBC_USING_VSNPRINTF_MAX_INTEGRAL_DIGITS_FOR_DECIMAL=9
25+
CONFIG_RT_KLIBC_USING_VSNPRINTF_LOG10_TAYLOR_TERMS=4
26+
# end of rt_vsnprintf options
27+
28+
#
29+
# rt_vsscanf options
30+
#
31+
# CONFIG_RT_KLIBC_USING_LIBC_VSSCANF is not set
32+
# end of rt_vsscanf options
33+
34+
#
35+
# rt_memset options
36+
#
37+
# CONFIG_RT_KLIBC_USING_USER_MEMSET is not set
38+
# CONFIG_RT_KLIBC_USING_LIBC_MEMSET is not set
39+
# CONFIG_RT_KLIBC_USING_TINY_MEMSET is not set
40+
# end of rt_memset options
41+
42+
#
43+
# rt_memcpy options
44+
#
45+
# CONFIG_RT_KLIBC_USING_USER_MEMCPY is not set
46+
# CONFIG_RT_KLIBC_USING_LIBC_MEMCPY is not set
47+
# CONFIG_RT_KLIBC_USING_TINY_MEMCPY is not set
48+
# end of rt_memcpy options
49+
50+
#
51+
# rt_memmove options
52+
#
53+
# CONFIG_RT_KLIBC_USING_USER_MEMMOVE is not set
54+
# CONFIG_RT_KLIBC_USING_LIBC_MEMMOVE is not set
55+
# end of rt_memmove options
56+
57+
#
58+
# rt_memcmp options
59+
#
60+
# CONFIG_RT_KLIBC_USING_USER_MEMCMP is not set
61+
# CONFIG_RT_KLIBC_USING_LIBC_MEMCMP is not set
62+
# end of rt_memcmp options
63+
64+
#
65+
# rt_strstr options
66+
#
67+
# CONFIG_RT_KLIBC_USING_USER_STRSTR is not set
68+
# CONFIG_RT_KLIBC_USING_LIBC_STRSTR is not set
69+
# end of rt_strstr options
70+
71+
#
72+
# rt_strcasecmp options
73+
#
74+
# CONFIG_RT_KLIBC_USING_USER_STRCASECMP is not set
75+
# end of rt_strcasecmp options
76+
77+
#
78+
# rt_strncpy options
79+
#
80+
# CONFIG_RT_KLIBC_USING_USER_STRNCPY is not set
81+
# CONFIG_RT_KLIBC_USING_LIBC_STRNCPY is not set
82+
# end of rt_strncpy options
83+
84+
#
85+
# rt_strcpy options
86+
#
87+
# CONFIG_RT_KLIBC_USING_USER_STRCPY is not set
88+
# CONFIG_RT_KLIBC_USING_LIBC_STRCPY is not set
89+
# end of rt_strcpy options
90+
91+
#
92+
# rt_strncmp options
93+
#
94+
# CONFIG_RT_KLIBC_USING_USER_STRNCMP is not set
95+
# CONFIG_RT_KLIBC_USING_LIBC_STRNCMP is not set
96+
# end of rt_strncmp options
97+
98+
#
99+
# rt_strcmp options
100+
#
101+
# CONFIG_RT_KLIBC_USING_USER_STRCMP is not set
102+
# CONFIG_RT_KLIBC_USING_LIBC_STRCMP is not set
103+
# end of rt_strcmp options
104+
105+
#
106+
# rt_strlen options
107+
#
108+
# CONFIG_RT_KLIBC_USING_USER_STRLEN is not set
109+
# CONFIG_RT_KLIBC_USING_LIBC_STRLEN is not set
110+
# end of rt_strlen options
111+
112+
#
113+
# rt_strnlen options
114+
#
115+
# CONFIG_RT_KLIBC_USING_USER_STRNLEN is not set
116+
# end of rt_strnlen options
117+
118+
# CONFIG_RT_UTEST_TC_USING_KLIBC is not set
119+
# end of klibc options
120+
5121
CONFIG_RT_NAME_MAX=32
6122
# CONFIG_RT_USING_ARCH_DATA_TYPE is not set
7-
# CONFIG_RT_USING_SMART is not set
8123
# CONFIG_RT_USING_NANO is not set
124+
# CONFIG_RT_USING_SMART is not set
9125
# CONFIG_RT_USING_AMP is not set
10126
# CONFIG_RT_USING_SMP is not set
11127
CONFIG_RT_CPUS_NR=1
@@ -15,6 +131,7 @@ CONFIG_RT_THREAD_PRIORITY_32=y
15131
# CONFIG_RT_THREAD_PRIORITY_256 is not set
16132
CONFIG_RT_THREAD_PRIORITY_MAX=32
17133
CONFIG_RT_TICK_PER_SECOND=1000
134+
CONFIG_RT_USING_OVERFLOW_CHECK=y
18135
CONFIG_RT_USING_HOOK=y
19136
CONFIG_RT_HOOK_USING_FUNC_PTR=y
20137
# CONFIG_RT_USING_HOOKLIST is not set
@@ -28,25 +145,17 @@ CONFIG_RT_TIMER_THREAD_STACK_SIZE=2048
28145
# CONFIG_RT_USING_CPU_USAGE_TRACER is not set
29146

30147
#
31-
# kservice optimization
148+
# kservice options
32149
#
33150
# 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
151+
# end of kservice options
43152

44153
CONFIG_RT_USING_DEBUG=y
45154
CONFIG_RT_DEBUGING_ASSERT=y
46155
CONFIG_RT_DEBUGING_COLOR=y
47156
CONFIG_RT_DEBUGING_CONTEXT=y
48157
# CONFIG_RT_DEBUGING_AUTO_INIT is not set
49-
CONFIG_RT_USING_OVERFLOW_CHECK=y
158+
# CONFIG_RT_USING_CI_ACTION is not set
50159

51160
#
52161
# Inter-Thread communication
@@ -81,7 +190,6 @@ CONFIG_RT_USING_DEVICE=y
81190
# CONFIG_RT_USING_DEVICE_OPS is not set
82191
# CONFIG_RT_USING_INTERRUPT_INFO is not set
83192
# CONFIG_RT_USING_THREADSAFE_PRINTF is not set
84-
# CONFIG_RT_USING_SCHED_THREAD_CTX is not set
85193
CONFIG_RT_USING_CONSOLE=y
86194
CONFIG_RT_CONSOLEBUF_SIZE=512
87195
CONFIG_RT_CONSOLE_DEVICE_NAME="uart1"
@@ -95,6 +203,7 @@ CONFIG_ARCH_RISCV=y
95203
CONFIG_ARCH_RISCV_FPU=y
96204
CONFIG_ARCH_RISCV_FPU_D=y
97205
CONFIG_ARCH_RISCV64=y
206+
CONFIG_ARCH_USING_NEW_CTX_SWITCH=y
98207

99208
#
100209
# RT-Thread Components
@@ -142,10 +251,12 @@ CONFIG_RT_USING_SERIAL_V1=y
142251
# CONFIG_RT_USING_SERIAL_V2 is not set
143252
CONFIG_RT_SERIAL_USING_DMA=y
144253
CONFIG_RT_SERIAL_RB_BUFSZ=64
254+
# CONFIG_RT_USING_SERIAL_BYPASS is not set
145255
# CONFIG_RT_USING_CAN is not set
146256
# CONFIG_RT_USING_CPUTIME is not set
147257
# CONFIG_RT_USING_I2C is not set
148258
# CONFIG_RT_USING_PHY is not set
259+
# CONFIG_RT_USING_PHY_V2 is not set
149260
# CONFIG_RT_USING_ADC is not set
150261
# CONFIG_RT_USING_DAC is not set
151262
# CONFIG_RT_USING_NULL is not set
@@ -167,6 +278,7 @@ CONFIG_RT_SERIAL_RB_BUFSZ=64
167278
# CONFIG_RT_USING_LCD is not set
168279
# CONFIG_RT_USING_HWCRYPTO is not set
169280
# CONFIG_RT_USING_WIFI is not set
281+
# CONFIG_RT_USING_BLK is not set
170282
# CONFIG_RT_USING_VIRTIO is not set
171283
CONFIG_RT_USING_PIN=y
172284
# CONFIG_RT_USING_KTIME is not set
@@ -390,6 +502,7 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0
390502
# CONFIG_PKG_USING_MATTER_ADAPTATION_LAYER is not set
391503
# CONFIG_PKG_USING_LHC_MODBUS is not set
392504
# CONFIG_PKG_USING_QMODBUS is not set
505+
# CONFIG_PKG_USING_PNET is not set
393506
# end of IoT - internet of things
394507

395508
#
@@ -522,6 +635,7 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0
522635
# CONFIG_PKG_USING_ARMV7M_DWT_TOOL is not set
523636
# CONFIG_PKG_USING_VOFA_PLUS is not set
524637
# CONFIG_PKG_USING_ZDEBUG is not set
638+
# CONFIG_PKG_USING_RVBACKTRACE is not set
525639
# end of tools packages
526640

527641
#
@@ -533,7 +647,6 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0
533647
#
534648
# CONFIG_PKG_USING_RT_MEMCPY_CM is not set
535649
# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set
536-
# CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set
537650
# end of enhanced kernel services
538651

539652
# CONFIG_PKG_USING_AUNITY is not set
@@ -611,10 +724,12 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0
611724
# CONFIG_PKG_USING_FLASH_BLOB is not set
612725
# CONFIG_PKG_USING_MLIBC is not set
613726
# CONFIG_PKG_USING_TASK_MSG_BUS is not set
727+
# CONFIG_PKG_USING_UART_FRAMEWORK is not set
614728
# CONFIG_PKG_USING_SFDB is not set
615729
# CONFIG_PKG_USING_RTP is not set
616730
# CONFIG_PKG_USING_REB is not set
617731
# CONFIG_PKG_USING_R_RHEALSTONE is not set
732+
# CONFIG_PKG_USING_HEARTBEAT is not set
618733
# end of system packages
619734

620735
#
@@ -711,6 +826,7 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0
711826
# CONFIG_PKG_USING_MLX90632 is not set
712827
# CONFIG_PKG_USING_MLX90393 is not set
713828
# CONFIG_PKG_USING_MLX90392 is not set
829+
# CONFIG_PKG_USING_MLX90394 is not set
714830
# CONFIG_PKG_USING_MLX90397 is not set
715831
# CONFIG_PKG_USING_MS5611 is not set
716832
# CONFIG_PKG_USING_MAX31865 is not set
@@ -825,6 +941,8 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0
825941
# CONFIG_PKG_USING_BT_MX01 is not set
826942
# CONFIG_PKG_USING_RGPOWER is not set
827943
# CONFIG_PKG_USING_BT_MX02 is not set
944+
# CONFIG_PKG_USING_GC9A01 is not set
945+
# CONFIG_PKG_USING_IK485 is not set
828946
# CONFIG_PKG_USING_SPI_TOOLS is not set
829947
# end of peripheral libraries and drivers
830948

@@ -934,6 +1052,7 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0
9341052
# CONFIG_PKG_USING_ARDUINO_MSGQ_C_CPP_DEMO is not set
9351053
# CONFIG_PKG_USING_ARDUINO_SKETCH_LOADER_DEMO is not set
9361054
# CONFIG_PKG_USING_ARDUINO_ULTRASOUND_RADAR is not set
1055+
# CONFIG_PKG_USING_ARDUINO_RTDUINO_SENSORFUSION_SHIELD is not set
9371056
# CONFIG_PKG_USING_ARDUINO_NINEINONE_SENSOR_SHIELD is not set
9381057
# CONFIG_PKG_USING_ARDUINO_SENSOR_KIT is not set
9391058
# CONFIG_PKG_USING_ARDUINO_MATLAB_SUPPORT is not set
@@ -1175,6 +1294,7 @@ CONFIG_BSP_UART_IRQ_BASE=30
11751294
# CONFIG_BSP_USING_ADC is not set
11761295
# CONFIG_BSP_USING_SPI is not set
11771296
# CONFIG_BSP_USING_WDT is not set
1297+
# CONFIG_BSP_USING_TIMER is not set
11781298
# CONFIG_BSP_USING_PWM is not set
11791299
# CONFIG_BSP_USING_RTC is not set
11801300
# end of General Drivers Configuration
@@ -1187,6 +1307,5 @@ CONFIG_BSP_GPIO_IRQ_BASE=41
11871307
CONFIG_BSP_SYS_GPIO_IRQ_BASE=47
11881308
CONFIG_SOC_TYPE_SG2002=y
11891309
# CONFIG_BOARD_TYPE_MILKV_DUO is not set
1190-
# CONFIG_BOARD_TYPE_MILKV_DUO_SPINOR is not set
11911310
CONFIG_BOARD_TYPE_MILKV_DUO256M=y
1192-
# CONFIG_BOARD_TYPE_MILKV_DUO256M_SPINOR is not set
1311+
# CONFIG_BOARD_TYPE_MILKV_DUOS is not set

‎bsp/cvitek/c906_little/Kconfig

-8
Original file line numberDiff line numberDiff line change
@@ -58,18 +58,10 @@ choice
5858
select SOC_TYPE_CV180X
5959
bool "milkv-duo"
6060

61-
config BOARD_TYPE_MILKV_DUO_SPINOR
62-
select SOC_TYPE_CV180X
63-
bool "milkv-duo-spinor"
64-
6561
config BOARD_TYPE_MILKV_DUO256M
6662
select SOC_TYPE_SG2002
6763
bool "milkv-duo256m"
6864

69-
config BOARD_TYPE_MILKV_DUO256M_SPINOR
70-
select SOC_TYPE_SG2002
71-
bool "milkv-duo256m-spinor"
72-
7365
config BOARD_TYPE_MILKV_DUOS
7466
select SOC_TYPE_SG2000
7567
bool "milkv-duos"

0 commit comments

Comments
 (0)