Skip to content

Commit 45f9f38

Browse files
BernardXiongBernardXiong
authored
Merge pull request #5026 from BernardXiong/master
[BSP] Enable romfs in x86 BSP
2 parents 5595df0 + bfc1c61 commit 45f9f38

File tree

3 files changed

+73
-39
lines changed

3 files changed

+73
-39
lines changed

‎bsp/x86/.config‎

Lines changed: 40 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -97,28 +97,28 @@ CONFIG_RT_MAIN_THREAD_PRIORITY=10
9797
# Command shell
9898
#
9999
CONFIG_RT_USING_FINSH=y
100+
CONFIG_RT_USING_MSH=y
101+
CONFIG_FINSH_USING_MSH=y
100102
CONFIG_FINSH_THREAD_NAME="tshell"
103+
CONFIG_FINSH_THREAD_PRIORITY=20
104+
CONFIG_FINSH_THREAD_STACK_SIZE=4096
101105
CONFIG_FINSH_USING_HISTORY=y
102106
CONFIG_FINSH_HISTORY_LINES=5
103107
CONFIG_FINSH_USING_SYMTAB=y
108+
CONFIG_FINSH_CMD_SIZE=80
109+
CONFIG_MSH_USING_BUILT_IN_COMMANDS=y
104110
CONFIG_FINSH_USING_DESCRIPTION=y
105111
# CONFIG_FINSH_ECHO_DISABLE_DEFAULT is not set
106-
CONFIG_FINSH_THREAD_PRIORITY=20
107-
CONFIG_FINSH_THREAD_STACK_SIZE=4096
108-
CONFIG_FINSH_CMD_SIZE=80
109112
# CONFIG_FINSH_USING_AUTH is not set
110-
CONFIG_FINSH_USING_MSH=y
111-
CONFIG_FINSH_USING_MSH_DEFAULT=y
112-
CONFIG_FINSH_USING_MSH_ONLY=y
113113
CONFIG_FINSH_ARG_MAX=10
114114

115115
#
116116
# Device virtual file system
117117
#
118118
CONFIG_RT_USING_DFS=y
119119
CONFIG_DFS_USING_WORKDIR=y
120-
CONFIG_DFS_FILESYSTEMS_MAX=2
121-
CONFIG_DFS_FILESYSTEM_TYPES_MAX=2
120+
CONFIG_DFS_FILESYSTEMS_MAX=4
121+
CONFIG_DFS_FILESYSTEM_TYPES_MAX=4
122122
CONFIG_DFS_FD_MAX=16
123123
# CONFIG_RT_USING_DFS_MNTTABLE is not set
124124
CONFIG_RT_USING_DFS_ELMFAT=y
@@ -144,7 +144,7 @@ CONFIG_RT_DFS_ELM_MAX_SECTOR_SIZE=512
144144
# CONFIG_RT_DFS_ELM_USE_ERASE is not set
145145
CONFIG_RT_DFS_ELM_REENTRANT=y
146146
CONFIG_RT_USING_DFS_DEVFS=y
147-
# CONFIG_RT_USING_DFS_ROMFS is not set
147+
CONFIG_RT_USING_DFS_ROMFS=y
148148
# CONFIG_RT_USING_DFS_RAMFS is not set
149149

150150
#
@@ -288,6 +288,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
288288
# CONFIG_PKG_USING_AT_DEVICE is not set
289289
# CONFIG_PKG_USING_ATSRV_SOCKET is not set
290290
# CONFIG_PKG_USING_WIZNET is not set
291+
# CONFIG_PKG_USING_ZB_COORDINATOR is not set
291292

292293
#
293294
# IoT Cloud
@@ -328,6 +329,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
328329
# CONFIG_PKG_USING_AGILE_MODBUS is not set
329330
# CONFIG_PKG_USING_AGILE_FTP is not set
330331
# CONFIG_PKG_USING_EMBEDDEDPROTO is not set
332+
# CONFIG_PKG_USING_RT_LINK_HW is not set
331333

332334
#
333335
# security packages
@@ -344,6 +346,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
344346
# CONFIG_PKG_USING_LUA is not set
345347
# CONFIG_PKG_USING_JERRYSCRIPT is not set
346348
# CONFIG_PKG_USING_MICROPYTHON is not set
349+
# CONFIG_PKG_USING_PIKASCRIPT is not set
347350

348351
#
349352
# multimedia packages
@@ -359,6 +362,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
359362
# CONFIG_PKG_USING_TOUCHGFX2RTT is not set
360363
# CONFIG_PKG_USING_NUEMWIN is not set
361364
# CONFIG_PKG_USING_MP3PLAYER is not set
365+
# CONFIG_PKG_USING_TINYJPEG is not set
362366

363367
#
364368
# tools packages
@@ -390,6 +394,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
390394
# CONFIG_PKG_USING_VCONSOLE is not set
391395
# CONFIG_PKG_USING_KDB is not set
392396
# CONFIG_PKG_USING_WAMR is not set
397+
# CONFIG_PKG_USING_WAMR_LATEST_VERSION is not set
393398
# CONFIG_PKG_USING_MICRO_XRCE_DDS_CLIENT is not set
394399
# CONFIG_PKG_USING_LWLOG is not set
395400
# CONFIG_PKG_USING_ANV_TRACE is not set
@@ -453,6 +458,8 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
453458
# CONFIG_PKG_USING_LPM is not set
454459
# CONFIG_PKG_USING_TLSF is not set
455460
# CONFIG_PKG_USING_EVENT_RECORDER is not set
461+
# CONFIG_PKG_USING_ARM_2D is not set
462+
# CONFIG_PKG_USING_WCWIDTH is not set
456463

457464
#
458465
# peripheral libraries and drivers
@@ -523,6 +530,8 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
523530
# CONFIG_PKG_USING_KOBUKI is not set
524531
# CONFIG_PKG_USING_ROSSERIAL is not set
525532
# CONFIG_PKG_USING_MICRO_ROS is not set
533+
# CONFIG_PKG_USING_MCP23008 is not set
534+
# CONFIG_PKG_USING_BLUETRUM_SDK is not set
526535

527536
#
528537
# AI packages
@@ -540,6 +549,27 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
540549
#
541550
# miscellaneous packages
542551
#
552+
553+
#
554+
# samples: kernel and components samples
555+
#
556+
# CONFIG_PKG_USING_KERNEL_SAMPLES is not set
557+
# CONFIG_PKG_USING_FILESYSTEM_SAMPLES is not set
558+
# CONFIG_PKG_USING_NETWORK_SAMPLES is not set
559+
# CONFIG_PKG_USING_PERIPHERAL_SAMPLES is not set
560+
561+
#
562+
# entertainment: terminal games and other interesting software packages
563+
#
564+
# CONFIG_PKG_USING_CMATRIX is not set
565+
# CONFIG_PKG_USING_SL is not set
566+
# CONFIG_PKG_USING_CAL is not set
567+
# CONFIG_PKG_USING_ACLOCK is not set
568+
# CONFIG_PKG_USING_THREES is not set
569+
# CONFIG_PKG_USING_2048 is not set
570+
# CONFIG_PKG_USING_SNAKE is not set
571+
# CONFIG_PKG_USING_TETRIS is not set
572+
# CONFIG_PKG_USING_DONUT is not set
543573
# CONFIG_PKG_USING_LIBCSV is not set
544574
# CONFIG_PKG_USING_OPTPARSE is not set
545575
# CONFIG_PKG_USING_FASTLZ is not set
@@ -557,33 +587,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
557587
# CONFIG_PKG_USING_DIGITALCTRL is not set
558588
# CONFIG_PKG_USING_UPACKER is not set
559589
# CONFIG_PKG_USING_UPARAM is not set
560-
561-
#
562-
# samples: kernel and components samples
563-
#
564-
# CONFIG_PKG_USING_KERNEL_SAMPLES is not set
565-
# CONFIG_PKG_USING_FILESYSTEM_SAMPLES is not set
566-
# CONFIG_PKG_USING_NETWORK_SAMPLES is not set
567-
# CONFIG_PKG_USING_PERIPHERAL_SAMPLES is not set
568590
# CONFIG_PKG_USING_HELLO is not set
569591
# CONFIG_PKG_USING_VI is not set
570592
# CONFIG_PKG_USING_KI is not set
571593
# CONFIG_PKG_USING_ARMv7M_DWT is not set
572594
# CONFIG_PKG_USING_VT100 is not set
573595
# CONFIG_PKG_USING_UKAL is not set
574596
# CONFIG_PKG_USING_CRCLIB is not set
575-
576-
#
577-
# entertainment: terminal games and other interesting software packages
578-
#
579-
# CONFIG_PKG_USING_THREES is not set
580-
# CONFIG_PKG_USING_2048 is not set
581-
# CONFIG_PKG_USING_SNAKE is not set
582-
# CONFIG_PKG_USING_TETRIS is not set
583-
# CONFIG_PKG_USING_DONUT is not set
584-
# CONFIG_PKG_USING_ACLOCK is not set
585597
# CONFIG_PKG_USING_LWGPS is not set
586598
# CONFIG_PKG_USING_STATE_MACHINE is not set
587599
# CONFIG_PKG_USING_MCURSES is not set
588600
# CONFIG_PKG_USING_COWSAY is not set
601+
# CONFIG_PKG_USING_TERMBOX is not set
589602
CONFIG_IA32=y

‎bsp/x86/applications/mnt.c‎

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,32 @@
77
*/
88
#include <rtthread.h>
99

10-
extern int rt_floppy_init(void);
10+
#define DBG_LEVEL DBG_INFO
11+
#include <rtdbg.h>
1112

12-
int mnt_init(void)
13+
#ifdef RT_USING_DFS
14+
#include <dfs.h>
15+
16+
int flopyy_system_init(void)
1317
{
18+
extern int rt_floppy_init(void);
1419
return rt_floppy_init();
1520
}
16-
INIT_ENV_EXPORT(mnt_init);
21+
INIT_ENV_EXPORT(flopyy_system_init);
1722

23+
#if defined(RT_USING_DFS_ROMFS)
24+
#include <dfs_fs.h>
25+
#include <dfs_romfs.h>
26+
27+
int mnt_init(void)
28+
{
29+
if (dfs_mount(RT_NULL, "/", "rom", 0, &(romfs_root)) == 0)
30+
{
31+
LOG_I("root filesystem mounted.");
32+
}
33+
34+
return 0;
35+
}
36+
INIT_APP_EXPORT(mnt_init);
37+
#endif /* end of RT_USING_DFS_ROMFS */
38+
#endif /* end of RT_USING_DFS */

‎bsp/x86/rtconfig.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,25 +62,25 @@
6262
/* Command shell */
6363

6464
#define RT_USING_FINSH
65+
#define RT_USING_MSH
66+
#define FINSH_USING_MSH
6567
#define FINSH_THREAD_NAME "tshell"
68+
#define FINSH_THREAD_PRIORITY 20
69+
#define FINSH_THREAD_STACK_SIZE 4096
6670
#define FINSH_USING_HISTORY
6771
#define FINSH_HISTORY_LINES 5
6872
#define FINSH_USING_SYMTAB
69-
#define FINSH_USING_DESCRIPTION
70-
#define FINSH_THREAD_PRIORITY 20
71-
#define FINSH_THREAD_STACK_SIZE 4096
7273
#define FINSH_CMD_SIZE 80
73-
#define FINSH_USING_MSH
74-
#define FINSH_USING_MSH_DEFAULT
75-
#define FINSH_USING_MSH_ONLY
74+
#define MSH_USING_BUILT_IN_COMMANDS
75+
#define FINSH_USING_DESCRIPTION
7676
#define FINSH_ARG_MAX 10
7777

7878
/* Device virtual file system */
7979

8080
#define RT_USING_DFS
8181
#define DFS_USING_WORKDIR
82-
#define DFS_FILESYSTEMS_MAX 2
83-
#define DFS_FILESYSTEM_TYPES_MAX 2
82+
#define DFS_FILESYSTEMS_MAX 4
83+
#define DFS_FILESYSTEM_TYPES_MAX 4
8484
#define DFS_FD_MAX 16
8585
#define RT_USING_DFS_ELMFAT
8686

@@ -97,6 +97,7 @@
9797
#define RT_DFS_ELM_MAX_SECTOR_SIZE 512
9898
#define RT_DFS_ELM_REENTRANT
9999
#define RT_USING_DFS_DEVFS
100+
#define RT_USING_DFS_ROMFS
100101

101102
/* Device Drivers */
102103

@@ -186,7 +187,6 @@
186187

187188
/* miscellaneous packages */
188189

189-
190190
/* samples: kernel and components samples */
191191

192192

0 commit comments

Comments
 (0)