diff --git a/bsp/lpc55sxx/lpc55s69_nxp_evk/.config b/bsp/lpc55sxx/lpc55s69_nxp_evk/.config index 65c0862ad6..4e48518f54 100644 --- a/bsp/lpc55sxx/lpc55s69_nxp_evk/.config +++ b/bsp/lpc55sxx/lpc55s69_nxp_evk/.config @@ -116,38 +116,15 @@ CONFIG_FINSH_ARG_MAX=10 # # Device virtual file system # -CONFIG_RT_USING_DFS=y -CONFIG_DFS_USING_WORKDIR=y -CONFIG_DFS_FILESYSTEMS_MAX=4 -CONFIG_DFS_FILESYSTEM_TYPES_MAX=4 -CONFIG_DFS_FD_MAX=16 -# CONFIG_RT_USING_DFS_MNTTABLE is not set -CONFIG_RT_USING_DFS_ELMFAT=y - -# -# elm-chan's FatFs, Generic FAT Filesystem Module -# -CONFIG_RT_DFS_ELM_CODE_PAGE=437 -CONFIG_RT_DFS_ELM_WORD_ACCESS=y +# CONFIG_RT_USING_DFS is not set # CONFIG_RT_DFS_ELM_USE_LFN_0 is not set # CONFIG_RT_DFS_ELM_USE_LFN_1 is not set # CONFIG_RT_DFS_ELM_USE_LFN_2 is not set -CONFIG_RT_DFS_ELM_USE_LFN_3=y -CONFIG_RT_DFS_ELM_USE_LFN=3 -CONFIG_RT_DFS_ELM_LFN_UNICODE_0=y +# CONFIG_RT_DFS_ELM_USE_LFN_3 is not set +# CONFIG_RT_DFS_ELM_LFN_UNICODE_0 is not set # CONFIG_RT_DFS_ELM_LFN_UNICODE_1 is not set # CONFIG_RT_DFS_ELM_LFN_UNICODE_2 is not set # CONFIG_RT_DFS_ELM_LFN_UNICODE_3 is not set -CONFIG_RT_DFS_ELM_LFN_UNICODE=0 -CONFIG_RT_DFS_ELM_MAX_LFN=255 -CONFIG_RT_DFS_ELM_DRIVES=2 -CONFIG_RT_DFS_ELM_MAX_SECTOR_SIZE=512 -# CONFIG_RT_DFS_ELM_USE_ERASE is not set -CONFIG_RT_DFS_ELM_REENTRANT=y -CONFIG_RT_DFS_ELM_MUTEX_TIMEOUT=3000 -CONFIG_RT_USING_DFS_DEVFS=y -# CONFIG_RT_USING_DFS_ROMFS is not set -# CONFIG_RT_USING_DFS_RAMFS is not set # # Device Drivers diff --git a/bsp/lpc55sxx/lpc55s69_nxp_evk/project.uvoptx b/bsp/lpc55sxx/lpc55s69_nxp_evk/project.uvoptx index df9b986715..2069450d61 100644 --- a/bsp/lpc55sxx/lpc55s69_nxp_evk/project.uvoptx +++ b/bsp/lpc55sxx/lpc55s69_nxp_evk/project.uvoptx @@ -198,7 +198,7 @@ Applications - 1 + 0 0 0 0 @@ -229,18 +229,6 @@ 0 0 0 - ..\..\..\libcpu\arm\common\backtrace.c - backtrace.c - 0 - 0 - - - 2 - 3 - 1 - 0 - 0 - 0 ..\..\..\libcpu\arm\common\showmem.c showmem.c 0 @@ -248,7 +236,7 @@ 2 - 4 + 3 1 0 0 @@ -260,19 +248,19 @@ 2 - 5 - 2 + 4 + 1 0 0 0 - ..\..\..\libcpu\arm\cortex-m4\context_rvds.S - context_rvds.S + ..\..\..\libcpu\arm\common\backtrace.c + backtrace.c 0 0 2 - 6 + 5 1 0 0 @@ -282,6 +270,18 @@ 0 0 + + 2 + 6 + 2 + 0 + 0 + 0 + ..\..\..\libcpu\arm\cortex-m4\context_rvds.S + context_rvds.S + 0 + 0 + @@ -321,30 +321,6 @@ 0 0 0 - ..\..\..\components\drivers\src\ringbuffer.c - ringbuffer.c - 0 - 0 - - - 3 - 10 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\src\ringblk_buf.c - ringblk_buf.c - 0 - 0 - - - 3 - 11 - 1 - 0 - 0 - 0 ..\..\..\components\drivers\src\waitqueue.c waitqueue.c 0 @@ -352,31 +328,7 @@ 3 - 12 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\src\pipe.c - pipe.c - 0 - 0 - - - 3 - 13 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\src\workqueue.c - workqueue.c - 0 - 0 - - - 3 - 14 + 10 1 0 0 @@ -388,7 +340,19 @@ 3 - 15 + 11 + 1 + 0 + 0 + 0 + ..\..\..\components\drivers\src\pipe.c + pipe.c + 0 + 0 + + + 3 + 12 1 0 0 @@ -398,6 +362,42 @@ 0 0 + + 3 + 13 + 1 + 0 + 0 + 0 + ..\..\..\components\drivers\src\ringbuffer.c + ringbuffer.c + 0 + 0 + + + 3 + 14 + 1 + 0 + 0 + 0 + ..\..\..\components\drivers\src\workqueue.c + workqueue.c + 0 + 0 + + + 3 + 15 + 1 + 0 + 0 + 0 + ..\..\..\components\drivers\src\ringblk_buf.c + ringblk_buf.c + 0 + 0 + @@ -549,6 +549,18 @@ 0 0 0 + ..\..\..\src\irq.c + irq.c + 0 + 0 + + + 6 + 27 + 1 + 0 + 0 + 0 ..\..\..\src\object.c object.c 0 @@ -556,7 +568,19 @@ 6 - 27 + 28 + 1 + 0 + 0 + 0 + ..\..\..\src\kservice.c + kservice.c + 0 + 0 + + + 6 + 29 1 0 0 @@ -566,30 +590,6 @@ 0 0 - - 6 - 28 - 1 - 0 - 0 - 0 - ..\..\..\src\thread.c - thread.c - 0 - 0 - - - 6 - 29 - 1 - 0 - 0 - 0 - ..\..\..\src\device.c - device.c - 0 - 0 - 6 30 @@ -597,8 +597,8 @@ 0 0 0 - ..\..\..\src\clock.c - clock.c + ..\..\..\src\idle.c + idle.c 0 0 @@ -609,8 +609,8 @@ 0 0 0 - ..\..\..\src\idle.c - idle.c + ..\..\..\src\mempool.c + mempool.c 0 0 @@ -633,8 +633,8 @@ 0 0 0 - ..\..\..\src\timer.c - timer.c + ..\..\..\src\clock.c + clock.c 0 0 @@ -645,8 +645,8 @@ 0 0 0 - ..\..\..\src\kservice.c - kservice.c + ..\..\..\src\device.c + device.c 0 0 @@ -669,8 +669,8 @@ 0 0 0 - ..\..\..\src\mempool.c - mempool.c + ..\..\..\src\timer.c + timer.c 0 0 @@ -681,8 +681,8 @@ 0 0 0 - ..\..\..\src\irq.c - irq.c + ..\..\..\src\thread.c + thread.c 0 0 diff --git a/bsp/lpc55sxx/lpc55s69_nxp_evk/project.uvprojx b/bsp/lpc55sxx/lpc55s69_nxp_evk/project.uvprojx index 6ce9cac461..ad26c305f2 100644 --- a/bsp/lpc55sxx/lpc55s69_nxp_evk/project.uvprojx +++ b/bsp/lpc55sxx/lpc55s69_nxp_evk/project.uvprojx @@ -10,7 +10,7 @@ rtthread-lpc55s6x 0x4 ARM-ADS - 6160000::V6.16::ARMCLANG + 6120000::V6.12::.\ARMCLANG 1 @@ -393,11 +393,6 @@ CPU - - backtrace.c - 1 - ..\..\..\libcpu\arm\common\backtrace.c - showmem.c 1 @@ -409,15 +404,20 @@ ..\..\..\libcpu\arm\common\div0.c - context_rvds.S - 2 - ..\..\..\libcpu\arm\cortex-m4\context_rvds.S + backtrace.c + 1 + ..\..\..\libcpu\arm\common\backtrace.c cpuport.c 1 ..\..\..\libcpu\arm\cortex-m4\cpuport.c + + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m4\context_rvds.S + @@ -433,41 +433,41 @@ 1 ..\..\..\components\drivers\serial\serial.c - - ringbuffer.c - 1 - ..\..\..\components\drivers\src\ringbuffer.c - - - ringblk_buf.c - 1 - ..\..\..\components\drivers\src\ringblk_buf.c - waitqueue.c 1 ..\..\..\components\drivers\src\waitqueue.c - - pipe.c - 1 - ..\..\..\components\drivers\src\pipe.c - - - workqueue.c - 1 - ..\..\..\components\drivers\src\workqueue.c - completion.c 1 ..\..\..\components\drivers\src\completion.c + + pipe.c + 1 + ..\..\..\components\drivers\src\pipe.c + dataqueue.c 1 ..\..\..\components\drivers\src\dataqueue.c + + ringbuffer.c + 1 + ..\..\..\components\drivers\src\ringbuffer.c + + + workqueue.c + 1 + ..\..\..\components\drivers\src\workqueue.c + + + ringblk_buf.c + 1 + ..\..\..\components\drivers\src\ringblk_buf.c + @@ -533,55 +533,30 @@ Kernel + + irq.c + 1 + ..\..\..\src\irq.c + object.c 1 ..\..\..\src\object.c - - ipc.c - 1 - ..\..\..\src\ipc.c - - - thread.c - 1 - ..\..\..\src\thread.c - - - device.c - 1 - ..\..\..\src\device.c - - - clock.c - 1 - ..\..\..\src\clock.c - - - idle.c - 1 - ..\..\..\src\idle.c - - - scheduler.c - 1 - ..\..\..\src\scheduler.c - - - timer.c - 1 - ..\..\..\src\timer.c - kservice.c 1 ..\..\..\src\kservice.c - mem.c + ipc.c 1 - ..\..\..\src\mem.c + ..\..\..\src\ipc.c + + + idle.c + 1 + ..\..\..\src\idle.c mempool.c @@ -589,9 +564,34 @@ ..\..\..\src\mempool.c - irq.c + scheduler.c 1 - ..\..\..\src\irq.c + ..\..\..\src\scheduler.c + + + clock.c + 1 + ..\..\..\src\clock.c + + + device.c + 1 + ..\..\..\src\device.c + + + mem.c + 1 + ..\..\..\src\mem.c + + + timer.c + 1 + ..\..\..\src\timer.c + + + thread.c + 1 + ..\..\..\src\thread.c components.c diff --git a/bsp/lpc55sxx/lpc55s69_nxp_evk/rtconfig.h b/bsp/lpc55sxx/lpc55s69_nxp_evk/rtconfig.h index 66b06db132..041693aa1c 100644 --- a/bsp/lpc55sxx/lpc55s69_nxp_evk/rtconfig.h +++ b/bsp/lpc55sxx/lpc55s69_nxp_evk/rtconfig.h @@ -77,27 +77,6 @@ /* Device virtual file system */ -#define RT_USING_DFS -#define DFS_USING_WORKDIR -#define DFS_FILESYSTEMS_MAX 4 -#define DFS_FILESYSTEM_TYPES_MAX 4 -#define DFS_FD_MAX 16 -#define RT_USING_DFS_ELMFAT - -/* elm-chan's FatFs, Generic FAT Filesystem Module */ - -#define RT_DFS_ELM_CODE_PAGE 437 -#define RT_DFS_ELM_WORD_ACCESS -#define RT_DFS_ELM_USE_LFN_3 -#define RT_DFS_ELM_USE_LFN 3 -#define RT_DFS_ELM_LFN_UNICODE_0 -#define RT_DFS_ELM_LFN_UNICODE 0 -#define RT_DFS_ELM_MAX_LFN 255 -#define RT_DFS_ELM_DRIVES 2 -#define RT_DFS_ELM_MAX_SECTOR_SIZE 512 -#define RT_DFS_ELM_REENTRANT -#define RT_DFS_ELM_MUTEX_TIMEOUT 3000 -#define RT_USING_DFS_DEVFS /* Device Drivers */