Skip to content

Commit 606ffc5

Browse files
bigmagic123zhaofujin123
authored andcommitted
add ls2k lwext4 pkgs support
1 parent 68689c7 commit 606ffc5

File tree

5 files changed

+33
-12
lines changed

5 files changed

+33
-12
lines changed

bsp/ls2kdev/.config

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -448,12 +448,9 @@ CONFIG_RT_LWIP_USING_PING=y
448448
# CONFIG_PKG_USING_GUIENGINE is not set
449449
# CONFIG_PKG_USING_CAIRO is not set
450450
# CONFIG_PKG_USING_PIXMAN is not set
451-
CONFIG_PKG_USING_LWEXT4=y
452-
CONFIG_PKG_LWEXT4_PATH="/packages/system/lwext4"
453-
CONFIG_RT_USING_DFS_LWEXT4=y
454-
CONFIG_PKG_USING_LWEXT4_LATEST_VERSION=y
451+
# CONFIG_PKG_USING_LWEXT4 is not set
452+
# CONFIG_PKG_USING_LWEXT4_LATEST_VERSION is not set
455453
# CONFIG_PKG_USING_LWEXT4_V100 is not set
456-
CONFIG_PKG_LWEXT4_VER="latest"
457454
# CONFIG_PKG_USING_PARTITION is not set
458455
# CONFIG_PKG_USING_FAL is not set
459456
# CONFIG_PKG_USING_FLASHDB is not set

bsp/ls2kdev/README.md

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,25 @@ title TFTPBOOT
110110

111111
以上三步完成之后,重启系统,就可以省略每次都需要进入pmon的输入命令的麻烦,板子上电后,可以自动从系统TFTP服务器中获取固件,然后启动,大大提高调试代码效率。
112112

113-
## 5. 支持情况
113+
## 5.SATA接口的SSD文件系统支持
114+
115+
当前已经支持SATA接口的SSD文件系统驱动,需要通过menuconfig
116+
117+
```
118+
RT-Thread online packages --->
119+
system packages --->
120+
lwext4: an excellent choice of ext2/3/4 filesystem for microcontrollers
121+
```
122+
123+
然后输入下面的命令更新软件包
124+
125+
```
126+
pkgs --update
127+
```
128+
129+
输入`scons`编译代码即可使用SATA接口的SSD文件系统。
130+
131+
## 6. 支持情况
114132

115133
| 驱动 | 支持情况 | 备注 |
116134
| ------ | ---- | :------: |
@@ -120,8 +138,9 @@ title TFTPBOOT
120138
| GMAC | 支持 | 网卡驱动 |
121139
| RTC | 支持 | - |
122140
| SPI | 支持 | - |
141+
| SATA SSD | 支持 | 需要打开lwext4软件包 |
123142

124-
## 6. 联系人信息
143+
## 7. 联系人信息
125144

126145
维护人:[bernard][4]
127146

bsp/ls2kdev/applications/mnt.c

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
*/
1010
#include <rthw.h>
1111
#include <rtthread.h>
12+
13+
#ifdef PKG_USING_LWEXT4
14+
1215
#include <dfs.h>
1316
#include <dfs_fs.h>
1417
#include <dfs_file.h>
@@ -18,6 +21,9 @@
1821
#include <stdint.h>
1922
#include <pci.h>
2023

24+
#define EXT4_DEBUG_ALL (0xFFFFFFFF)
25+
#define EXT4_DEBUG_NO (0)
26+
2127
int mount_ssd(void)
2228
{
2329
struct blk_device *blkdev = (struct blk_device *)rt_device_find("dwc_ahsata_blk");
@@ -28,7 +34,7 @@ int mount_ssd(void)
2834
return;
2935
}
3036

31-
//ext4_dmask_set(0xFFFFFFFF);
37+
ext4_dmask_set(EXT4_DEBUG_NO);
3238
blk_device_init(blkdev);
3339
dfs_mount("dwc_ahsata_blk","/","ext",0,(void *)1);
3440
dfs_mount("dwc_ahsata_blk","/boot","ext",0,(void *)0);
@@ -37,3 +43,5 @@ int mount_ssd(void)
3743
}
3844

3945
INIT_ENV_EXPORT(mount_ssd);
46+
47+
#endif

bsp/ls2kdev/drivers/ata/SConscript

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ if GetDepend('RT_USING_DFS_ELMFAT') == False:
99
SrcRemove(src, 'dwc_ahsata.c')
1010
SrcRemove(src, 'libata.c')
1111

12-
group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH)
12+
group = DefineGroup('Drivers', src, depend = ['PKG_USING_LWEXT4'], CPPPATH = CPPPATH)
1313

1414
Return('group')

bsp/ls2kdev/rtconfig.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,9 +219,6 @@
219219

220220
/* system packages */
221221

222-
#define PKG_USING_LWEXT4
223-
#define RT_USING_DFS_LWEXT4
224-
#define PKG_USING_LWEXT4_LATEST_VERSION
225222

226223
/* Micrium: Micrium software products porting for RT-Thread */
227224

0 commit comments

Comments
 (0)