Skip to content

Commit 8708808

Browse files
chenyingchun0312chenyingchun0312
committed
[bsp/nrf5x] remove drivers/drv_fs.c to application/mnt.c
1 parent b72bd90 commit 8708808

File tree

6 files changed

+175
-41
lines changed

6 files changed

+175
-41
lines changed

‎bsp/nrf5x/libraries/drivers/SConscript‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,6 @@ if GetDepend(['BSP_USING_WDT']):
4040
if GetDepend(['BSP_USING_ONCHIP_RTC']):
4141
src += ['drv_rtc.c']
4242

43-
if GetDepend(['BSP_USING_ON_CHIP_FS']):
44-
src += ['drv_fs.c']
45-
4643
path = [cwd]
4744

4845
group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path)

‎bsp/nrf5x/nrf52832/.config‎

Lines changed: 157 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,16 @@ CONFIG_FINSH_ARG_MAX=10
112112
#
113113
# Device virtual file system
114114
#
115-
# CONFIG_RT_USING_DFS is not set
115+
CONFIG_RT_USING_DFS=y
116+
CONFIG_DFS_USING_WORKDIR=y
117+
CONFIG_DFS_FILESYSTEMS_MAX=4
118+
CONFIG_DFS_FILESYSTEM_TYPES_MAX=4
119+
CONFIG_DFS_FD_MAX=16
120+
# CONFIG_RT_USING_DFS_MNTTABLE is not set
121+
# CONFIG_RT_USING_DFS_ELMFAT is not set
122+
CONFIG_RT_USING_DFS_DEVFS=y
123+
# CONFIG_RT_USING_DFS_ROMFS is not set
124+
# CONFIG_RT_USING_DFS_RAMFS is not set
116125

117126
#
118127
# Device Drivers
@@ -134,7 +143,7 @@ CONFIG_RT_USING_PIN=y
134143
# CONFIG_RT_USING_ADC is not set
135144
# CONFIG_RT_USING_DAC is not set
136145
# CONFIG_RT_USING_PWM is not set
137-
# CONFIG_RT_USING_MTD_NOR is not set
146+
CONFIG_RT_USING_MTD_NOR=y
138147
# CONFIG_RT_USING_MTD_NAND is not set
139148
# CONFIG_RT_USING_PM is not set
140149
# CONFIG_RT_USING_RTC is not set
@@ -160,6 +169,11 @@ CONFIG_RT_USING_PIN=y
160169
#
161170
CONFIG_RT_USING_LIBC=y
162171
# CONFIG_RT_USING_PTHREADS is not set
172+
CONFIG_RT_USING_POSIX=y
173+
# CONFIG_RT_USING_POSIX_MMAP is not set
174+
# CONFIG_RT_USING_POSIX_TERMIOS is not set
175+
# CONFIG_RT_USING_POSIX_GETLINE is not set
176+
# CONFIG_RT_USING_POSIX_AIO is not set
163177
# CONFIG_RT_USING_MODULE is not set
164178
CONFIG_RT_LIBC_FIXED_TIMEZONE=8
165179

@@ -272,8 +286,6 @@ CONFIG_RT_LIBC_FIXED_TIMEZONE=8
272286
# CONFIG_PKG_USING_LIBRWS is not set
273287
# CONFIG_PKG_USING_TCPSERVER is not set
274288
# CONFIG_PKG_USING_PROTOBUF_C is not set
275-
# CONFIG_PKG_USING_ONNX_PARSER is not set
276-
# CONFIG_PKG_USING_ONNX_BACKEND is not set
277289
# CONFIG_PKG_USING_DLT645 is not set
278290
# CONFIG_PKG_USING_QXWZ is not set
279291
# CONFIG_PKG_USING_SMTP_CLIENT is not set
@@ -287,6 +299,13 @@ CONFIG_RT_LIBC_FIXED_TIMEZONE=8
287299
# CONFIG_PKG_USING_PDULIB is not set
288300
# CONFIG_PKG_USING_BTSTACK is not set
289301
# CONFIG_PKG_USING_LORAWAN_ED_STACK is not set
302+
# CONFIG_PKG_USING_WAYZ_IOTKIT is not set
303+
# CONFIG_PKG_USING_MAVLINK is not set
304+
# CONFIG_PKG_USING_RAPIDJSON is not set
305+
# CONFIG_PKG_USING_BSAL is not set
306+
# CONFIG_PKG_USING_AGILE_MODBUS is not set
307+
# CONFIG_PKG_USING_AGILE_FTP is not set
308+
# CONFIG_PKG_USING_EMBEDDEDPROTO is not set
290309

291310
#
292311
# security packages
@@ -312,7 +331,13 @@ CONFIG_RT_LIBC_FIXED_TIMEZONE=8
312331
# CONFIG_PKG_USING_STEMWIN is not set
313332
# CONFIG_PKG_USING_WAVPLAYER is not set
314333
# CONFIG_PKG_USING_TJPGD is not set
334+
# CONFIG_PKG_USING_PDFGEN is not set
315335
# CONFIG_PKG_USING_HELIX is not set
336+
# CONFIG_PKG_USING_AZUREGUIX is not set
337+
# CONFIG_PKG_USING_TOUCHGFX2RTT is not set
338+
# CONFIG_PKG_USING_NUEMWIN is not set
339+
# CONFIG_PKG_USING_MP3PLAYER is not set
340+
# CONFIG_PKG_USING_TINYJPEG is not set
316341

317342
#
318343
# tools packages
@@ -321,36 +346,110 @@ CONFIG_RT_LIBC_FIXED_TIMEZONE=8
321346
# CONFIG_PKG_USING_EASYFLASH is not set
322347
# CONFIG_PKG_USING_EASYLOGGER is not set
323348
# CONFIG_PKG_USING_SYSTEMVIEW is not set
349+
# CONFIG_PKG_USING_SEGGER_RTT is not set
324350
# CONFIG_PKG_USING_RDB is not set
325351
# CONFIG_PKG_USING_QRCODE is not set
326352
# CONFIG_PKG_USING_ULOG_EASYFLASH is not set
353+
# CONFIG_PKG_USING_ULOG_FILE is not set
354+
# CONFIG_PKG_USING_LOGMGR is not set
327355
# CONFIG_PKG_USING_ADBD is not set
328356
# CONFIG_PKG_USING_COREMARK is not set
329357
# CONFIG_PKG_USING_DHRYSTONE is not set
358+
# CONFIG_PKG_USING_MEMORYPERF is not set
330359
# CONFIG_PKG_USING_NR_MICRO_SHELL is not set
331360
# CONFIG_PKG_USING_CHINESE_FONT_LIBRARY is not set
332361
# CONFIG_PKG_USING_LUNAR_CALENDAR is not set
333362
# CONFIG_PKG_USING_BS8116A is not set
334363
# CONFIG_PKG_USING_GPS_RMC is not set
335364
# CONFIG_PKG_USING_URLENCODE is not set
336365
# CONFIG_PKG_USING_UMCN is not set
366+
# CONFIG_PKG_USING_LWRB2RTT is not set
367+
# CONFIG_PKG_USING_CPU_USAGE is not set
368+
# CONFIG_PKG_USING_GBK2UTF8 is not set
369+
# CONFIG_PKG_USING_VCONSOLE is not set
370+
# CONFIG_PKG_USING_KDB is not set
371+
# CONFIG_PKG_USING_WAMR is not set
372+
# CONFIG_PKG_USING_MICRO_XRCE_DDS_CLIENT is not set
373+
# CONFIG_PKG_USING_LWLOG is not set
374+
# CONFIG_PKG_USING_ANV_TRACE is not set
375+
# CONFIG_PKG_USING_ANV_MEMLEAK is not set
376+
# CONFIG_PKG_USING_ANV_TESTSUIT is not set
377+
# CONFIG_PKG_USING_ANV_BENCH is not set
378+
# CONFIG_PKG_USING_DEVMEM is not set
379+
# CONFIG_PKG_USING_REGEX is not set
380+
# CONFIG_PKG_USING_MEM_SANDBOX is not set
381+
# CONFIG_PKG_USING_SOLAR_TERMS is not set
382+
# CONFIG_PKG_USING_GAN_ZHI is not set
337383

338384
#
339385
# system packages
340386
#
387+
388+
#
389+
# acceleration: Assembly language or algorithmic acceleration packages
390+
#
391+
# CONFIG_PKG_USING_RT_MEMCPY_CM is not set
392+
# CONFIG_PKG_USING_QFPLIB_M0_FULL is not set
393+
# CONFIG_PKG_USING_QFPLIB_M0_TINY is not set
394+
# CONFIG_PKG_USING_QFPLIB_M3 is not set
395+
396+
#
397+
# Micrium: Micrium software products porting for RT-Thread
398+
#
399+
# CONFIG_PKG_USING_UCOSIII_WRAPPER is not set
400+
# CONFIG_PKG_USING_UCOSII_WRAPPER is not set
401+
# CONFIG_PKG_USING_UC_CRC is not set
402+
# CONFIG_PKG_USING_UC_CLK is not set
403+
# CONFIG_PKG_USING_UC_COMMON is not set
404+
# CONFIG_PKG_USING_UC_MODBUS is not set
341405
# CONFIG_PKG_USING_GUIENGINE is not set
342406
# CONFIG_PKG_USING_CAIRO is not set
343407
# CONFIG_PKG_USING_PIXMAN is not set
344-
# CONFIG_PKG_USING_LWEXT4 is not set
345408
# CONFIG_PKG_USING_PARTITION is not set
346-
# CONFIG_PKG_USING_FAL is not set
409+
CONFIG_PKG_USING_FAL=y
410+
CONFIG_PKG_FAL_PATH="/packages/system/fal"
411+
CONFIG_FAL_DEBUG_CONFIG=y
412+
CONFIG_FAL_DEBUG=1
413+
CONFIG_FAL_PART_HAS_TABLE_CFG=y
414+
# CONFIG_FAL_USING_SFUD_PORT is not set
415+
CONFIG_PKG_USING_FAL_V00500=y
416+
# CONFIG_PKG_USING_FAL_V00400 is not set
417+
# CONFIG_PKG_USING_FAL_V00300 is not set
418+
# CONFIG_PKG_USING_FAL_V00200 is not set
419+
# CONFIG_PKG_USING_FAL_V00100 is not set
420+
# CONFIG_PKG_USING_FAL_LATEST_VERSION is not set
421+
CONFIG_PKG_FAL_VER="v0.5.0"
422+
CONFIG_PKG_FAL_VER_NUM=0x00500
347423
# CONFIG_PKG_USING_FLASHDB is not set
348424
# CONFIG_PKG_USING_SQLITE is not set
349425
# CONFIG_PKG_USING_RTI is not set
350426
# CONFIG_PKG_USING_LITTLEVGL2RTT is not set
351427
# CONFIG_PKG_USING_CMSIS is not set
352428
# CONFIG_PKG_USING_DFS_YAFFS is not set
353-
# CONFIG_PKG_USING_LITTLEFS is not set
429+
CONFIG_PKG_USING_LITTLEFS=y
430+
CONFIG_PKG_LITTLEFS_PATH="/packages/system/littlefs"
431+
# CONFIG_PKG_USING_LITTLEFS_V090 is not set
432+
# CONFIG_PKG_USING_LITTLEFS_V170 is not set
433+
# CONFIG_PKG_USING_LITTLEFS_V172 is not set
434+
# CONFIG_PKG_USING_LITTLEFS_V201 is not set
435+
# CONFIG_PKG_USING_LITTLEFS_V205 is not set
436+
# CONFIG_PKG_USING_LITTLEFS_V214 is not set
437+
# CONFIG_PKG_USING_LITTLEFS_V220 is not set
438+
# CONFIG_PKG_USING_LITTLEFS_V221 is not set
439+
# CONFIG_PKG_USING_LITTLEFS_V230 is not set
440+
CONFIG_PKG_USING_LITTLEFS_LATEST_VERSION=y
441+
CONFIG_LFS_READ_SIZE=256
442+
CONFIG_LFS_PROG_SIZE=256
443+
CONFIG_LFS_BLOCK_SIZE=4096
444+
CONFIG_LFS_CACHE_SIZE=256
445+
CONFIG_LFS_BLOCK_CYCLES=-1
446+
# CONFIG_DFS_LFS_READONLY is not set
447+
CONFIG_LFS_THREADSAFE=y
448+
CONFIG_LFS_LOOKAHEAD_MAX=128
449+
CONFIG_PKG_LITTLEFS_VER="latest"
450+
# CONFIG_PKG_USING_DFS_JFFS2 is not set
451+
# CONFIG_PKG_USING_DFS_UFFS is not set
452+
# CONFIG_PKG_USING_LWEXT4 is not set
354453
# CONFIG_PKG_USING_THREAD_POOL is not set
355454
# CONFIG_PKG_USING_ROBOTS is not set
356455
# CONFIG_PKG_USING_EV is not set
@@ -360,8 +459,12 @@ CONFIG_RT_LIBC_FIXED_TIMEZONE=8
360459
# CONFIG_PKG_USING_RAMDISK is not set
361460
# CONFIG_PKG_USING_MININI is not set
362461
# CONFIG_PKG_USING_QBOOT is not set
363-
# CONFIG_PKG_USING_UCOSIII_WRAPPER is not set
364462
# CONFIG_PKG_USING_PPOOL is not set
463+
# CONFIG_PKG_USING_OPENAMP is not set
464+
# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set
465+
# CONFIG_PKG_USING_LPM is not set
466+
# CONFIG_PKG_USING_TLSF is not set
467+
# CONFIG_PKG_USING_EVENT_RECORDER is not set
365468

366469
#
367470
# peripheral libraries and drivers
@@ -370,6 +473,7 @@ CONFIG_RT_LIBC_FIXED_TIMEZONE=8
370473
# CONFIG_PKG_USING_REALTEK_AMEBA is not set
371474
# CONFIG_PKG_USING_SHT2X is not set
372475
# CONFIG_PKG_USING_SHT3X is not set
476+
# CONFIG_PKG_USING_AS7341 is not set
373477
# CONFIG_PKG_USING_STM32_SDIO is not set
374478
# CONFIG_PKG_USING_ICM20608 is not set
375479
# CONFIG_PKG_USING_U8G2 is not set
@@ -389,7 +493,6 @@ CONFIG_PKG_NRFX_VER="latest"
389493
# CONFIG_PKG_USING_WM_LIBRARIES is not set
390494
# CONFIG_PKG_USING_KENDRYTE_SDK is not set
391495
# CONFIG_PKG_USING_INFRARED is not set
392-
# CONFIG_PKG_USING_ROSSERIAL is not set
393496
# CONFIG_PKG_USING_AGILE_BUTTON is not set
394497
# CONFIG_PKG_USING_AGILE_LED is not set
395498
# CONFIG_PKG_USING_AT24CXX is not set
@@ -420,6 +523,35 @@ CONFIG_PKG_NRFX_VER="latest"
420523
# CONFIG_PKG_USING_WK2124 is not set
421524
# CONFIG_PKG_USING_LY68L6400 is not set
422525
# CONFIG_PKG_USING_DM9051 is not set
526+
# CONFIG_PKG_USING_SSD1306 is not set
527+
# CONFIG_PKG_USING_QKEY is not set
528+
# CONFIG_PKG_USING_RS485 is not set
529+
# CONFIG_PKG_USING_NES is not set
530+
# CONFIG_PKG_USING_VIRTUAL_SENSOR is not set
531+
# CONFIG_PKG_USING_VDEVICE is not set
532+
# CONFIG_PKG_USING_SGM706 is not set
533+
# CONFIG_PKG_USING_STM32WB55_SDK is not set
534+
# CONFIG_PKG_USING_RDA58XX is not set
535+
# CONFIG_PKG_USING_LIBNFC is not set
536+
# CONFIG_PKG_USING_MFOC is not set
537+
# CONFIG_PKG_USING_TMC51XX is not set
538+
# CONFIG_PKG_USING_TCA9534 is not set
539+
# CONFIG_PKG_USING_KOBUKI is not set
540+
# CONFIG_PKG_USING_ROSSERIAL is not set
541+
# CONFIG_PKG_USING_MICRO_ROS is not set
542+
543+
#
544+
# AI packages
545+
#
546+
# CONFIG_PKG_USING_LIBANN is not set
547+
# CONFIG_PKG_USING_NNOM is not set
548+
# CONFIG_PKG_USING_ONNX_BACKEND is not set
549+
# CONFIG_PKG_USING_ONNX_PARSER is not set
550+
# CONFIG_PKG_USING_TENSORFLOWLITEMICRO is not set
551+
# CONFIG_PKG_USING_ELAPACK is not set
552+
# CONFIG_PKG_USING_ULAPACK is not set
553+
# CONFIG_PKG_USING_QUEST is not set
554+
# CONFIG_PKG_USING_NAXOS is not set
423555

424556
#
425557
# miscellaneous packages
@@ -429,10 +561,12 @@ CONFIG_PKG_NRFX_VER="latest"
429561
# CONFIG_PKG_USING_FASTLZ is not set
430562
# CONFIG_PKG_USING_MINILZO is not set
431563
# CONFIG_PKG_USING_QUICKLZ is not set
564+
# CONFIG_PKG_USING_LZMA is not set
432565
# CONFIG_PKG_USING_MULTIBUTTON is not set
433566
# CONFIG_PKG_USING_FLEXIBLE_BUTTON is not set
434567
# CONFIG_PKG_USING_CANFESTIVAL is not set
435568
# CONFIG_PKG_USING_ZLIB is not set
569+
# CONFIG_PKG_USING_MINIZIP is not set
436570
# CONFIG_PKG_USING_DSTR is not set
437571
# CONFIG_PKG_USING_TINYFRAME is not set
438572
# CONFIG_PKG_USING_KENDRYTE_DEMO is not set
@@ -449,18 +583,25 @@ CONFIG_PKG_NRFX_VER="latest"
449583
# CONFIG_PKG_USING_PERIPHERAL_SAMPLES is not set
450584
# CONFIG_PKG_USING_HELLO is not set
451585
# CONFIG_PKG_USING_VI is not set
452-
# CONFIG_PKG_USING_NNOM is not set
453-
# CONFIG_PKG_USING_LIBANN is not set
454-
# CONFIG_PKG_USING_ELAPACK is not set
586+
# CONFIG_PKG_USING_KI is not set
455587
# CONFIG_PKG_USING_ARMv7M_DWT is not set
456588
# CONFIG_PKG_USING_VT100 is not set
457-
# CONFIG_PKG_USING_ULAPACK is not set
458589
# CONFIG_PKG_USING_UKAL is not set
459590
# CONFIG_PKG_USING_CRCLIB is not set
591+
592+
#
593+
# entertainment: terminal games and other interesting software packages
594+
#
460595
# CONFIG_PKG_USING_THREES is not set
461596
# CONFIG_PKG_USING_2048 is not set
597+
# CONFIG_PKG_USING_SNAKE is not set
598+
# CONFIG_PKG_USING_TETRIS is not set
599+
# CONFIG_PKG_USING_DONUT is not set
600+
# CONFIG_PKG_USING_ACLOCK is not set
462601
# CONFIG_PKG_USING_LWGPS is not set
463-
# CONFIG_PKG_USING_TENSORFLOWLITEMICRO is not set
602+
# CONFIG_PKG_USING_STATE_MACHINE is not set
603+
# CONFIG_PKG_USING_MCURSES is not set
604+
# CONFIG_PKG_USING_COWSAY is not set
464605

465606
#
466607
# Hardware Drivers Config
@@ -493,8 +634,8 @@ CONFIG_BSP_UART0_RX_PIN=8
493634
CONFIG_BSP_UART0_TX_PIN=6
494635
# CONFIG_BSP_USING_I2C is not set
495636
# CONFIG_BSP_USING_SPI is not set
496-
# CONFIG_BSP_USING_ON_CHIP_FLASH is not set
497-
# CONFIG_BSP_USING_ON_CHIP_FS is not set
637+
CONFIG_BSP_USING_ON_CHIP_FLASH=y
638+
CONFIG_BSP_USING_ON_CHIP_FS=y
498639

499640
#
500641
# On-chip flash config

‎bsp/nrf5x/nrf52832/applications/SConscript‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
1-
Import('RTT_ROOT')
2-
Import('rtconfig')
31
from building import *
42

5-
cwd = os.path.join(str(Dir('#')), 'applications')
6-
src = Glob('*.c')
7-
CPPPATH = [cwd, str(Dir('#'))]
3+
cwd = GetCurrentDir()
4+
5+
src = Split('''
6+
main.c
7+
''')
8+
9+
if GetDepend(['BSP_USING_ON_CHIP_FS']):
10+
src += ['mnt.c']
11+
12+
13+
CPPPATH = [str(Dir('#')), cwd]
814

915
group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH)
1016

11-
Return('group')
17+
Return('group')

‎bsp/nrf5x/nrf52832/applications/application.c‎ renamed to ‎bsp/nrf5x/nrf52832/applications/main.c‎

File renamed without changes.

‎bsp/nrf5x/libraries/drivers/drv_fs.c‎ renamed to ‎bsp/nrf5x/nrf52832/applications/mnt.c‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@
3030
#error "if you want to use on chip filesystem, you need to enable mtd nor"
3131
#endif
3232

33+
#ifndef PKG_USING_LITTLEFS
34+
#error "if you want to use on chip filesystem, you need to enable littlefs"
35+
#endif
36+
3337
#include "fal.h"
3438
#include <dfs_posix.h>
3539

‎bsp/nrf5x/nrf52832/board/fal_cfg.h‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,7 @@
11
/*
2-
* File : fal_cfg.h
3-
* This file is part of FAL (Flash Abstraction Layer) package
4-
* COPYRIGHT (C) 2006 - 2018, RT-Thread Development Team
2+
* Copyright (c) 2006-2021, RT-Thread Development Team
53
*
6-
* This program is free software; you can redistribute it and/or modify
7-
* it under the terms of the GNU General Public License as published by
8-
* the Free Software Foundation; either version 2 of the License, or
9-
* (at your option) any later version.
10-
*
11-
* This program is distributed in the hope that it will be useful,
12-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14-
* GNU General Public License for more details.
15-
*
16-
* You should have received a copy of the GNU General Public License along
17-
* with this program; if not, write to the Free Software Foundation, Inc.,
18-
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
4+
* SPDX-License-Identifier: Apache-2.0
195
*
206
* Change Logs:
217
* Date Author Notes

0 commit comments

Comments
 (0)