From 818d95d52ef19a9bde4889b789e659a2ea10cbbf Mon Sep 17 00:00:00 2001 From: supperthomas <78900636@qq.com> Date: Sun, 10 Oct 2021 21:39:36 +0800 Subject: add the fixed project --- bsp/lpc55sxx/lpc55s69_nxp_evk/.config | 29 +-------- bsp/lpc55sxx/lpc55s69_nxp_evk/project.uvoptx | 94 +++++++++++++-------------- bsp/lpc55sxx/lpc55s69_nxp_evk/project.uvprojx | 86 ++++++++++++------------ bsp/lpc55sxx/lpc55s69_nxp_evk/rtconfig.h | 21 ------ 4 files changed, 93 insertions(+), 137 deletions(-) (limited to 'bsp/lpc55sxx') 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,8 +229,8 @@ 0 0 0 - ..\..\..\libcpu\arm\common\backtrace.c - backtrace.c + ..\..\..\libcpu\arm\common\showmem.c + showmem.c 0 0 @@ -241,8 +241,8 @@ 0 0 0 - ..\..\..\libcpu\arm\common\showmem.c - showmem.c + ..\..\..\libcpu\arm\common\div0.c + div0.c 0 0 @@ -253,32 +253,32 @@ 0 0 0 - ..\..\..\libcpu\arm\common\div0.c - div0.c + ..\..\..\libcpu\arm\common\backtrace.c + backtrace.c 0 0 2 5 - 2 + 1 0 0 0 - ..\..\..\libcpu\arm\cortex-m4\context_rvds.S - context_rvds.S + ..\..\..\libcpu\arm\cortex-m4\cpuport.c + cpuport.c 0 0 2 6 - 1 + 2 0 0 0 - ..\..\..\libcpu\arm\cortex-m4\cpuport.c - cpuport.c + ..\..\..\libcpu\arm\cortex-m4\context_rvds.S + context_rvds.S 0 0 @@ -321,8 +321,8 @@ 0 0 0 - ..\..\..\components\drivers\src\ringbuffer.c - ringbuffer.c + ..\..\..\components\drivers\src\waitqueue.c + waitqueue.c 0 0 @@ -333,8 +333,8 @@ 0 0 0 - ..\..\..\components\drivers\src\ringblk_buf.c - ringblk_buf.c + ..\..\..\components\drivers\src\completion.c + completion.c 0 0 @@ -345,8 +345,8 @@ 0 0 0 - ..\..\..\components\drivers\src\waitqueue.c - waitqueue.c + ..\..\..\components\drivers\src\pipe.c + pipe.c 0 0 @@ -357,8 +357,8 @@ 0 0 0 - ..\..\..\components\drivers\src\pipe.c - pipe.c + ..\..\..\components\drivers\src\dataqueue.c + dataqueue.c 0 0 @@ -369,8 +369,8 @@ 0 0 0 - ..\..\..\components\drivers\src\workqueue.c - workqueue.c + ..\..\..\components\drivers\src\ringbuffer.c + ringbuffer.c 0 0 @@ -381,8 +381,8 @@ 0 0 0 - ..\..\..\components\drivers\src\completion.c - completion.c + ..\..\..\components\drivers\src\workqueue.c + workqueue.c 0 0 @@ -393,8 +393,8 @@ 0 0 0 - ..\..\..\components\drivers\src\dataqueue.c - dataqueue.c + ..\..\..\components\drivers\src\ringblk_buf.c + ringblk_buf.c 0 0 @@ -549,8 +549,8 @@ 0 0 0 - ..\..\..\src\object.c - object.c + ..\..\..\src\irq.c + irq.c 0 0 @@ -561,8 +561,8 @@ 0 0 0 - ..\..\..\src\ipc.c - ipc.c + ..\..\..\src\object.c + object.c 0 0 @@ -573,8 +573,8 @@ 0 0 0 - ..\..\..\src\thread.c - thread.c + ..\..\..\src\kservice.c + kservice.c 0 0 @@ -585,8 +585,8 @@ 0 0 0 - ..\..\..\src\device.c - device.c + ..\..\..\src\ipc.c + ipc.c 0 0 @@ -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 + @@ -434,39 +434,39 @@ ..\..\..\components\drivers\serial\serial.c - ringbuffer.c + waitqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\waitqueue.c - ringblk_buf.c + completion.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\completion.c - waitqueue.c + pipe.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\pipe.c - pipe.c + dataqueue.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\dataqueue.c - workqueue.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\ringbuffer.c - completion.c + workqueue.c 1 - ..\..\..\components\drivers\src\completion.c + ..\..\..\components\drivers\src\workqueue.c - dataqueue.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\ringblk_buf.c @@ -534,34 +534,34 @@ Kernel - object.c + irq.c 1 - ..\..\..\src\object.c + ..\..\..\src\irq.c - ipc.c + object.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\object.c - thread.c + kservice.c 1 - ..\..\..\src\thread.c + ..\..\..\src\kservice.c - device.c + ipc.c 1 - ..\..\..\src\device.c + ..\..\..\src\ipc.c - clock.c + idle.c 1 - ..\..\..\src\clock.c + ..\..\..\src\idle.c - idle.c + mempool.c 1 - ..\..\..\src\idle.c + ..\..\..\src\mempool.c scheduler.c @@ -569,14 +569,14 @@ ..\..\..\src\scheduler.c - timer.c + clock.c 1 - ..\..\..\src\timer.c + ..\..\..\src\clock.c - kservice.c + device.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\device.c mem.c @@ -584,14 +584,14 @@ ..\..\..\src\mem.c - mempool.c + timer.c 1 - ..\..\..\src\mempool.c + ..\..\..\src\timer.c - irq.c + thread.c 1 - ..\..\..\src\irq.c + ..\..\..\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 */ -- cgit v1.3.1