Browse Source

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 <unicorn_wang@outlook.com>
Chen Wang 7 months ago
parent
commit
1052f99537

+ 119 - 18
bsp/cvitek/cv18xx_risc-v/.config

@@ -2,10 +2,114 @@
 #
 # RT-Thread Kernel
 #
+
+#
+# klibc options
+#
+
+#
+# ------------rt_memset options------------
+#
+# CONFIG_RT_KLIBC_USING_USER_MEMSET is not set
+# CONFIG_RT_KLIBC_USING_LIBC_MEMSET is not set
+# CONFIG_RT_KLIBC_USING_TINY_MEMSET is not set
+
+#
+# ------------rt_memcpy options------------
+#
+# CONFIG_RT_KLIBC_USING_USER_MEMCPY is not set
+# CONFIG_RT_KLIBC_USING_LIBC_MEMCPY is not set
+# CONFIG_RT_KLIBC_USING_TINY_MEMCPY is not set
+
+#
+# ------------rt_memmove options------------
+#
+# CONFIG_RT_KLIBC_USING_USER_MEMMOVE is not set
+# CONFIG_RT_KLIBC_USING_LIBC_MEMMOVE is not set
+
+#
+# ------------rt_memcmp options------------
+#
+# CONFIG_RT_KLIBC_USING_USER_MEMCMP is not set
+# CONFIG_RT_KLIBC_USING_LIBC_MEMCMP is not set
+
+#
+# ------------rt_strstr options------------
+#
+# CONFIG_RT_KLIBC_USING_USER_STRSTR is not set
+# CONFIG_RT_KLIBC_USING_LIBC_STRSTR is not set
+
+#
+# ------------rt_strcasecmp options------------
+#
+# CONFIG_RT_KLIBC_USING_USER_STRCASECMP is not set
+
+#
+# ------------rt_strncpy options------------
+#
+# CONFIG_RT_KLIBC_USING_USER_STRNCPY is not set
+# CONFIG_RT_KLIBC_USING_LIBC_STRNCPY is not set
+
+#
+# ------------rt_strcpy options------------
+#
+# CONFIG_RT_KLIBC_USING_USER_STRCPY is not set
+# CONFIG_RT_KLIBC_USING_LIBC_STRCPY is not set
+
+#
+# ------------rt_strncmp options------------
+#
+# CONFIG_RT_KLIBC_USING_USER_STRNCMP is not set
+# CONFIG_RT_KLIBC_USING_LIBC_STRNCMP is not set
+
+#
+# ------------rt_strcmp options------------
+#
+# CONFIG_RT_KLIBC_USING_USER_STRCMP is not set
+# CONFIG_RT_KLIBC_USING_LIBC_STRCMP is not set
+
+#
+# ------------rt_strlen options------------
+#
+# CONFIG_RT_KLIBC_USING_USER_STRLEN is not set
+# CONFIG_RT_KLIBC_USING_LIBC_STRLEN is not set
+
+#
+# ------------rt_strlen options------------
+#
+
+#
+# ------------rt_strnlen options------------
+#
+# CONFIG_RT_KLIBC_USING_USER_STRNLEN is not set
+
+#
+# ------------rt_vsscanf options------------
+#
+# CONFIG_RT_KLIBC_USING_LIBC_VSSCANF is not set
+
+#
+# ------------rt_vsnprintf options------------
+#
+# CONFIG_RT_KLIBC_USING_LIBC_VSNPRINTF is not set
+CONFIG_RT_KLIBC_USING_VSNPRINTF_LONGLONG=y
+CONFIG_RT_KLIBC_USING_VSNPRINTF_STANDARD=y
+CONFIG_RT_KLIBC_USING_VSNPRINTF_DECIMAL_SPECIFIERS=y
+CONFIG_RT_KLIBC_USING_VSNPRINTF_EXPONENTIAL_SPECIFIERS=y
+CONFIG_RT_KLIBC_USING_VSNPRINTF_WRITEBACK_SPECIFIER=y
+CONFIG_RT_KLIBC_USING_VSNPRINTF_CHECK_NUL_IN_FORMAT_SPECIFIER=y
+# CONFIG_RT_KLIBC_USING_VSNPRINTF_MSVC_STYLE_INTEGER_SPECIFIERS is not set
+CONFIG_RT_KLIBC_USING_VSNPRINTF_INTEGER_BUFFER_SIZE=32
+CONFIG_RT_KLIBC_USING_VSNPRINTF_DECIMAL_BUFFER_SIZE=32
+CONFIG_RT_KLIBC_USING_VSNPRINTF_FLOAT_PRECISION=6
+CONFIG_RT_KLIBC_USING_VSNPRINTF_MAX_INTEGRAL_DIGITS_FOR_DECIMAL=9
+CONFIG_RT_KLIBC_USING_VSNPRINTF_LOG10_TAYLOR_TERMS=4
+# end of klibc options
+
 CONFIG_RT_NAME_MAX=8
 # CONFIG_RT_USING_ARCH_DATA_TYPE is not set
-CONFIG_RT_USING_SMART=y
 # CONFIG_RT_USING_NANO is not set
+CONFIG_RT_USING_SMART=y
 # CONFIG_RT_USING_AMP is not set
 # CONFIG_RT_USING_SMP is not set
 CONFIG_RT_CPUS_NR=1
@@ -15,6 +119,7 @@ CONFIG_RT_THREAD_PRIORITY_32=y
 # CONFIG_RT_THREAD_PRIORITY_256 is not set
 CONFIG_RT_THREAD_PRIORITY_MAX=32
 CONFIG_RT_TICK_PER_SECOND=1000
+CONFIG_RT_USING_OVERFLOW_CHECK=y
 CONFIG_RT_USING_HOOK=y
 CONFIG_RT_HOOK_USING_FUNC_PTR=y
 # CONFIG_RT_USING_HOOKLIST is not set
@@ -28,18 +133,10 @@ CONFIG_RT_TIMER_THREAD_STACK_SIZE=16384
 CONFIG_RT_USING_CPU_USAGE_TRACER=y
 
 #
-# kservice optimization
+# kservice options
 #
 # CONFIG_RT_USING_TINY_FFS is not set
-# end of kservice optimization
-
-#
-# klibc optimization
-#
-# CONFIG_RT_KLIBC_USING_STDLIB is not set
-# CONFIG_RT_KLIBC_USING_TINY_SIZE is not set
-CONFIG_RT_KLIBC_USING_PRINTF_LONGLONG=y
-# end of klibc optimization
+# end of kservice options
 
 CONFIG_RT_USING_DEBUG=y
 CONFIG_RT_DEBUGING_ASSERT=y
@@ -47,7 +144,6 @@ CONFIG_RT_DEBUGING_COLOR=y
 CONFIG_RT_DEBUGING_CONTEXT=y
 # CONFIG_RT_DEBUGING_AUTO_INIT is not set
 # CONFIG_RT_DEBUGING_PAGE_LEAK is not set
-CONFIG_RT_USING_OVERFLOW_CHECK=y
 
 #
 # Inter-Thread communication
@@ -206,6 +302,7 @@ CONFIG_RT_USING_CPUTIME_RISCV=y
 CONFIG_CPUTIME_TIMER_FREQ=25000000
 # CONFIG_RT_USING_I2C is not set
 # CONFIG_RT_USING_PHY is not set
+# CONFIG_RT_USING_PHY_V2 is not set
 # CONFIG_RT_USING_ADC is not set
 # CONFIG_RT_USING_DAC is not set
 CONFIG_RT_USING_NULL=y
@@ -235,6 +332,15 @@ CONFIG_RT_USING_WDT=y
 # CONFIG_RT_USING_LCD is not set
 # CONFIG_RT_USING_HWCRYPTO is not set
 # CONFIG_RT_USING_WIFI is not set
+CONFIG_RT_USING_BLK=y
+
+#
+# Partition Types
+#
+CONFIG_RT_BLK_PARTITION_DFS=y
+CONFIG_RT_BLK_PARTITION_EFI=y
+# end of Partition Types
+
 # CONFIG_RT_USING_VIRTIO is not set
 CONFIG_RT_USING_PIN=y
 CONFIG_RT_USING_KTIME=y
@@ -601,7 +707,6 @@ CONFIG_LWP_PTY_MAX_PARIS_LIMIT=64
 # CONFIG_PKG_USING_JSMN is not set
 # CONFIG_PKG_USING_AGILE_JSMN is not set
 # CONFIG_PKG_USING_PARSON is not set
-# CONFIG_PKG_USING_RYAN_JSON is not set
 # end of JSON: JavaScript Object Notation, a lightweight data-interchange format
 
 #
@@ -812,8 +917,6 @@ CONFIG_LWP_PTY_MAX_PARIS_LIMIT=64
 #
 # STM32 HAL & SDK Drivers
 #
-# CONFIG_PKG_USING_STM32F4_HAL_DRIVER is not set
-# CONFIG_PKG_USING_STM32F4_CMSIS_DRIVER is not set
 # CONFIG_PKG_USING_STM32L4_HAL_DRIVER is not set
 # CONFIG_PKG_USING_STM32L4_CMSIS_DRIVER is not set
 # CONFIG_PKG_USING_STM32WB55_SDK is not set
@@ -1008,7 +1111,6 @@ CONFIG_LWP_PTY_MAX_PARIS_LIMIT=64
 # CONFIG_PKG_USING_SYSTEM_RUN_LED is not set
 # CONFIG_PKG_USING_BT_MX01 is not set
 # CONFIG_PKG_USING_RGPOWER is not set
-# CONFIG_PKG_USING_BT_MX02 is not set
 # CONFIG_PKG_USING_SPI_TOOLS is not set
 # end of peripheral libraries and drivers
 
@@ -1124,7 +1226,6 @@ CONFIG_PKG_ZLIB_VER="latest"
 # CONFIG_PKG_USING_ARDUINO_MSGQ_C_CPP_DEMO is not set
 # CONFIG_PKG_USING_ARDUINO_SKETCH_LOADER_DEMO is not set
 # CONFIG_PKG_USING_ARDUINO_ULTRASOUND_RADAR is not set
-# CONFIG_PKG_USING_ARDUINO_RTDUINO_SENSORFUSION_SHIELD is not set
 # CONFIG_PKG_USING_ARDUINO_NINEINONE_SENSOR_SHIELD is not set
 # CONFIG_PKG_USING_ARDUINO_SENSOR_KIT is not set
 # CONFIG_PKG_USING_ARDUINO_MATLAB_SUPPORT is not set
@@ -1385,5 +1486,5 @@ CONFIG_SOC_TYPE_SG2002=y
 CONFIG_BOARD_TYPE_MILKV_DUO256M=y
 # CONFIG_BOARD_TYPE_MILKV_DUO256M_SPINOR is not set
 # CONFIG_BOARD_TYPE_MILKV_DUOS is not set
-CONFIG_BSP_ROOTFS_TYPE_ROMFS=y
+CONFIG_BSP_ROOTFS_TYPE_DISKFS=y
 # CONFIG_BSP_ROOTFS_TYPE_CROMFS is not set

+ 3 - 3
bsp/cvitek/cv18xx_risc-v/Kconfig

@@ -84,10 +84,10 @@ endchoice
 
 choice BSP_ROOTFS_TYPE
     prompt "rootfs type"
-    default BSP_ROOTFS_TYPE_ROMFS
+    default BSP_ROOTFS_TYPE_DISKFS
 
-    config BSP_ROOTFS_TYPE_ROMFS
-        bool "ROMFS"
+    config BSP_ROOTFS_TYPE_DISKFS
+        bool "Disk FileSystems, e.g. ext4, fat ..."
         select RT_USING_DFS_ROMFS
 
     config BSP_ROOTFS_TYPE_CROMFS

+ 68 - 9
bsp/cvitek/cv18xx_risc-v/rtconfig.h

@@ -3,6 +3,63 @@
 
 /* RT-Thread Kernel */
 
+/* klibc options */
+
+/* ------------rt_memset options------------ */
+
+
+/* ------------rt_memcpy options------------ */
+
+
+/* ------------rt_memmove options------------ */
+
+
+/* ------------rt_memcmp options------------ */
+
+
+/* ------------rt_strstr options------------ */
+
+
+/* ------------rt_strcasecmp options------------ */
+
+
+/* ------------rt_strncpy options------------ */
+
+
+/* ------------rt_strcpy options------------ */
+
+
+/* ------------rt_strncmp options------------ */
+
+
+/* ------------rt_strcmp options------------ */
+
+
+/* ------------rt_strlen options------------ */
+
+
+/* ------------rt_strlen options------------ */
+
+/* ------------rt_strnlen options------------ */
+
+
+/* ------------rt_vsscanf options------------ */
+
+
+/* ------------rt_vsnprintf options------------ */
+
+#define RT_KLIBC_USING_VSNPRINTF_LONGLONG
+#define RT_KLIBC_USING_VSNPRINTF_STANDARD
+#define RT_KLIBC_USING_VSNPRINTF_DECIMAL_SPECIFIERS
+#define RT_KLIBC_USING_VSNPRINTF_EXPONENTIAL_SPECIFIERS
+#define RT_KLIBC_USING_VSNPRINTF_WRITEBACK_SPECIFIER
+#define RT_KLIBC_USING_VSNPRINTF_CHECK_NUL_IN_FORMAT_SPECIFIER
+#define RT_KLIBC_USING_VSNPRINTF_INTEGER_BUFFER_SIZE 32
+#define RT_KLIBC_USING_VSNPRINTF_DECIMAL_BUFFER_SIZE 32
+#define RT_KLIBC_USING_VSNPRINTF_FLOAT_PRECISION 6
+#define RT_KLIBC_USING_VSNPRINTF_MAX_INTEGRAL_DIGITS_FOR_DECIMAL 9
+#define RT_KLIBC_USING_VSNPRINTF_LOG10_TAYLOR_TERMS 4
+/* end of klibc options */
 #define RT_NAME_MAX 8
 #define RT_USING_SMART
 #define RT_CPUS_NR 1
@@ -10,6 +67,7 @@
 #define RT_THREAD_PRIORITY_32
 #define RT_THREAD_PRIORITY_MAX 32
 #define RT_TICK_PER_SECOND 1000
+#define RT_USING_OVERFLOW_CHECK
 #define RT_USING_HOOK
 #define RT_HOOK_USING_FUNC_PTR
 #define RT_USING_IDLE_HOOK
@@ -20,19 +78,13 @@
 #define RT_TIMER_THREAD_STACK_SIZE 16384
 #define RT_USING_CPU_USAGE_TRACER
 
-/* kservice optimization */
-
-/* end of kservice optimization */
-
-/* klibc optimization */
+/* kservice options */
 
-#define RT_KLIBC_USING_VSNPRINTF_LONGLONG
-/* end of klibc optimization */
+/* end of kservice options */
 #define RT_USING_DEBUG
 #define RT_DEBUGING_ASSERT
 #define RT_DEBUGING_COLOR
 #define RT_DEBUGING_CONTEXT
-#define RT_USING_OVERFLOW_CHECK
 
 /* Inter-Thread communication */
 
@@ -157,6 +209,13 @@
 #define RT_MMCSD_THREAD_PREORITY 22
 #define RT_MMCSD_MAX_PARTITION 16
 #define RT_USING_WDT
+#define RT_USING_BLK
+
+/* Partition Types */
+
+#define RT_BLK_PARTITION_DFS
+#define RT_BLK_PARTITION_EFI
+/* end of Partition Types */
 #define RT_USING_PIN
 #define RT_USING_KTIME
 #define RT_USING_HWTIMER
@@ -495,6 +554,6 @@
 #define __STACKSIZE__ 8192
 #define SOC_TYPE_SG2002
 #define BOARD_TYPE_MILKV_DUO256M
-#define BSP_ROOTFS_TYPE_ROMFS
+#define BSP_ROOTFS_TYPE_DISKFS
 
 #endif

+ 2 - 2
bsp/cvitek/drivers/SConscript

@@ -40,8 +40,8 @@ if GetDepend('BSP_USING_PWM'):
 
 if GetDepend('BSP_ROOTFS_TYPE_CROMFS'):
     src += ['port/mnt_cromfs.c']
-elif GetDepend('BSP_ROOTFS_TYPE_ROMFS'):
-    src += ['port/mnt_romfs.c']
+elif GetDepend('BSP_ROOTFS_TYPE_DISKFS'):
+    src += ['port/mnt_diskfs.c']
 
 if GetDepend('BSP_USING_SDH'):
     src += ['drv_sdhci.c']

+ 0 - 0
bsp/cvitek/drivers/port/mnt_romfs.c → bsp/cvitek/drivers/port/mnt_diskfs.c