From 4cbcf5987acc6eeab1ea6fe0a4c8bcde6138c316 Mon Sep 17 00:00:00 2001 From: supperthomas <78900636@qq.com> Date: Sun, 10 Oct 2021 21:06:03 +0800 Subject: [bsp][lpc55] fix the console, add the us_delay,fix sdio to filesystem --- bsp/lpc55sxx/Libraries/drivers/drv_uart.c | 2 +- bsp/lpc55sxx/lpc55s69_nxp_evk/.config | 67 ++++++++++++++++++++-- .../lpc55s69_nxp_evk/applications/SConscript | 5 +- bsp/lpc55sxx/lpc55s69_nxp_evk/applications/mnt.c | 32 +++++++++++ bsp/lpc55sxx/lpc55s69_nxp_evk/board/Kconfig | 4 ++ bsp/lpc55sxx/lpc55s69_nxp_evk/board/board.c | 30 ++++++++++ bsp/lpc55sxx/lpc55s69_nxp_evk/rtconfig.h | 37 +++++++++++- 7 files changed, 168 insertions(+), 9 deletions(-) create mode 100644 bsp/lpc55sxx/lpc55s69_nxp_evk/applications/mnt.c diff --git a/bsp/lpc55sxx/Libraries/drivers/drv_uart.c b/bsp/lpc55sxx/Libraries/drivers/drv_uart.c index c9bf72eb8d..d62b676e87 100644 --- a/bsp/lpc55sxx/Libraries/drivers/drv_uart.c +++ b/bsp/lpc55sxx/Libraries/drivers/drv_uart.c @@ -135,7 +135,7 @@ static const struct lpc_uart uarts[] = kCLOCK_Flexcomm0, &serial0, - "uart", + "uart0", }, #endif #ifdef BSP_USING_UART1 diff --git a/bsp/lpc55sxx/lpc55s69_nxp_evk/.config b/bsp/lpc55sxx/lpc55s69_nxp_evk/.config index 882b4e7c2f..7aa450dc1c 100644 --- a/bsp/lpc55sxx/lpc55s69_nxp_evk/.config +++ b/bsp/lpc55sxx/lpc55s69_nxp_evk/.config @@ -116,7 +116,38 @@ CONFIG_FINSH_ARG_MAX=10 # # Device virtual file system # -# CONFIG_RT_USING_DFS is not set +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_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_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 @@ -142,7 +173,13 @@ CONFIG_RT_USING_PIN=y # CONFIG_RT_USING_MTD_NAND is not set # CONFIG_RT_USING_PM is not set # CONFIG_RT_USING_RTC is not set -# CONFIG_RT_USING_SDIO is not set +CONFIG_RT_USING_SDIO=y +CONFIG_RT_SDIO_STACK_SIZE=512 +CONFIG_RT_SDIO_THREAD_PRIORITY=15 +CONFIG_RT_MMCSD_STACK_SIZE=1024 +CONFIG_RT_MMCSD_THREAD_PREORITY=22 +CONFIG_RT_MMCSD_MAX_PARTITION=16 +# CONFIG_RT_SDIO_DEBUG is not set # CONFIG_RT_USING_SPI is not set # CONFIG_RT_USING_WDT is not set # CONFIG_RT_USING_AUDIO is not set @@ -162,9 +199,16 @@ CONFIG_RT_USING_PIN=y # # POSIX layer and C standard library # -# CONFIG_RT_USING_LIBC is not set +CONFIG_RT_USING_LIBC=y # CONFIG_RT_USING_PTHREADS is not set -# CONFIG_RT_LIBC_USING_TIME is not set +CONFIG_RT_USING_POSIX=y +# CONFIG_RT_USING_POSIX_MMAP is not set +# CONFIG_RT_USING_POSIX_TERMIOS is not set +# CONFIG_RT_USING_POSIX_GETLINE is not set +# CONFIG_RT_USING_POSIX_AIO is not set +CONFIG_RT_LIBC_USING_TIME=y +# CONFIG_RT_USING_MODULE is not set +CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # # Network @@ -297,6 +341,9 @@ CONFIG_RT_USING_PIN=y # CONFIG_PKG_USING_AGILE_FTP is not set # CONFIG_PKG_USING_EMBEDDEDPROTO is not set # CONFIG_PKG_USING_RT_LINK_HW is not set +# CONFIG_PKG_USING_LORA_PKT_FWD is not set +# CONFIG_PKG_USING_LORA_GW_DRIVER_LIB is not set +# CONFIG_PKG_USING_LORA_PKT_SNIFFER is not set # CONFIG_PKG_USING_HM is not set # @@ -331,6 +378,13 @@ CONFIG_RT_USING_PIN=y # CONFIG_PKG_USING_NUEMWIN is not set # CONFIG_PKG_USING_MP3PLAYER is not set # CONFIG_PKG_USING_TINYJPEG is not set +# CONFIG_PKG_USING_UGUI is not set + +# +# U8G2: a monochrome graphic library +# +# CONFIG_PKG_USING_U8G2_OFFICIAL is not set +# CONFIG_PKG_USING_U8G2 is not set # # tools packages @@ -439,7 +493,6 @@ CONFIG_RT_USING_PIN=y # CONFIG_PKG_USING_AS7341 is not set # CONFIG_PKG_USING_STM32_SDIO is not set # CONFIG_PKG_USING_ICM20608 is not set -# CONFIG_PKG_USING_U8G2 is not set # CONFIG_PKG_USING_BUTTON is not set # CONFIG_PKG_USING_PCF8574 is not set # CONFIG_PKG_USING_SX12XX is not set @@ -501,6 +554,8 @@ CONFIG_RT_USING_PIN=y # CONFIG_PKG_USING_MCP23008 is not set # CONFIG_PKG_USING_BLUETRUM_SDK is not set # CONFIG_PKG_USING_MISAKA_AT24CXX is not set +# CONFIG_PKG_USING_MISAKA_RGB_BLING is not set +# CONFIG_PKG_USING_BL_MCU_SDK is not set # # AI packages @@ -588,7 +643,7 @@ CONFIG_HW_UART0_BAUDRATE_115200=y # CONFIG_BSP_USING_I2C is not set # CONFIG_BSP_USING_SPI is not set # CONFIG_BSP_USING_ADC is not set -# CONFIG_BSP_USING_SDIO is not set +CONFIG_BSP_USING_SDIO=y # CONFIG_BSP_USING_RTC is not set # CONFIG_BSP_USING_WDT is not set # CONFIG_BSP_USING_HWTIMER is not set diff --git a/bsp/lpc55sxx/lpc55s69_nxp_evk/applications/SConscript b/bsp/lpc55sxx/lpc55s69_nxp_evk/applications/SConscript index 6432d00362..89d07934b7 100644 --- a/bsp/lpc55sxx/lpc55s69_nxp_evk/applications/SConscript +++ b/bsp/lpc55sxx/lpc55s69_nxp_evk/applications/SConscript @@ -10,7 +10,10 @@ if rtconfig.CROSS_TOOL == 'gcc': CPPDEFINES = ['__START=entry'] else: CPPDEFINES = [] - + +if GetDepend('BSP_USING_SDIO'): + src += ['mnt.c'] + group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES=CPPDEFINES) Return('group') diff --git a/bsp/lpc55sxx/lpc55s69_nxp_evk/applications/mnt.c b/bsp/lpc55sxx/lpc55s69_nxp_evk/applications/mnt.c new file mode 100644 index 0000000000..57a6d8df72 --- /dev/null +++ b/bsp/lpc55sxx/lpc55s69_nxp_evk/applications/mnt.c @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2006-2021, RT-Thread Development Team + * + * SPDX-License-Identifier: Apache-2.0 + * + * sdio filesystem support + * Change Logs: + * Date Author Notes + * 2021-10-10 supperthomas first version + */ +#include "dfs_fs.h" +#include +#include + +#ifdef BSP_USING_SDIO + +/** + * @brief SDIO filesystem init + * @param void + * @retval 0: filesystem init success, -1: filesystem init failed + */ + +static int sdio_fs_init(void) +{ + int result = 0; + dfs_mount("sdcard0", "/", "elm", 0, 0); + return result; +} + +INIT_ENV_EXPORT(sdio_fs_init); + +#endif /* BSP_USING_SDIO */ diff --git a/bsp/lpc55sxx/lpc55s69_nxp_evk/board/Kconfig b/bsp/lpc55sxx/lpc55s69_nxp_evk/board/Kconfig index 158cad3c9a..a73ae472d7 100644 --- a/bsp/lpc55sxx/lpc55s69_nxp_evk/board/Kconfig +++ b/bsp/lpc55sxx/lpc55s69_nxp_evk/board/Kconfig @@ -135,6 +135,10 @@ menu "On-chip Peripheral Drivers" config BSP_USING_SDIO bool "Enable SDIO SD Card Interface" select RT_USING_SDIO + select RT_USING_DFS + select RT_USING_DFS_ELMFAT + select RT_USING_LIBC + select RT_LIBC_USING_TIME default y config BSP_USING_RTC diff --git a/bsp/lpc55sxx/lpc55s69_nxp_evk/board/board.c b/bsp/lpc55sxx/lpc55s69_nxp_evk/board/board.c index 0b71b508e7..73c7011f1d 100644 --- a/bsp/lpc55sxx/lpc55s69_nxp_evk/board/board.c +++ b/bsp/lpc55sxx/lpc55s69_nxp_evk/board/board.c @@ -107,3 +107,33 @@ void MemManage_Handler(void) rt_kprintf("Memory Fault!\n"); HardFault_Handler(); } + +void rt_hw_us_delay(rt_uint32_t us) +{ + rt_uint32_t ticks; + rt_uint32_t told, tnow, tcnt = 0; + rt_uint32_t reload = SysTick->LOAD; + + ticks = us * reload / (1000000 / RT_TICK_PER_SECOND); + told = SysTick->VAL; + while (1) + { + tnow = SysTick->VAL; + if (tnow != told) + { + if (tnow < told) + { + tcnt += told - tnow; + } + else + { + tcnt += reload - tnow + told; + } + told = tnow; + if (tcnt >= ticks) + { + break; + } + } + } +} diff --git a/bsp/lpc55sxx/lpc55s69_nxp_evk/rtconfig.h b/bsp/lpc55sxx/lpc55s69_nxp_evk/rtconfig.h index 8d43f792fd..412285dad0 100644 --- a/bsp/lpc55sxx/lpc55s69_nxp_evk/rtconfig.h +++ b/bsp/lpc55sxx/lpc55s69_nxp_evk/rtconfig.h @@ -45,7 +45,7 @@ #define RT_USING_DEVICE #define RT_USING_CONSOLE #define RT_CONSOLEBUF_SIZE 128 -#define RT_CONSOLE_DEVICE_NAME "uart" +#define RT_CONSOLE_DEVICE_NAME "uart0" #define RT_VER_NUM 0x40004 #define ARCH_ARM_CORTEX_FPU @@ -77,6 +77,27 @@ /* 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 */ @@ -87,12 +108,22 @@ #define RT_SERIAL_USING_DMA #define RT_SERIAL_RB_BUFSZ 64 #define RT_USING_PIN +#define RT_USING_SDIO +#define RT_SDIO_STACK_SIZE 512 +#define RT_SDIO_THREAD_PRIORITY 15 +#define RT_MMCSD_STACK_SIZE 1024 +#define RT_MMCSD_THREAD_PREORITY 22 +#define RT_MMCSD_MAX_PARTITION 16 /* Using USB */ /* POSIX layer and C standard library */ +#define RT_USING_LIBC +#define RT_USING_POSIX +#define RT_LIBC_USING_TIME +#define RT_LIBC_DEFAULT_TIMEZONE 8 /* Network */ @@ -142,6 +173,9 @@ /* multimedia packages */ +/* U8G2: a monochrome graphic library */ + + /* tools packages */ @@ -178,6 +212,7 @@ #define BSP_USING_UART #define BSP_USING_UART0 #define HW_UART0_BAUDRATE_115200 +#define BSP_USING_SDIO /* Onboard Peripheral Drivers */ -- cgit v1.3.1 From 672cc500c583e29887ba0e58561e681d114b9be7 Mon Sep 17 00:00:00 2001 From: supperthomas <78900636@qq.com> Date: Sun, 10 Oct 2021 21:34:54 +0800 Subject: fix the format --- bsp/lpc55sxx/lpc55s69_nxp_evk/board/board.c | 1 - 1 file changed, 1 deletion(-) diff --git a/bsp/lpc55sxx/lpc55s69_nxp_evk/board/board.c b/bsp/lpc55sxx/lpc55s69_nxp_evk/board/board.c index 73c7011f1d..f9b08f6270 100644 --- a/bsp/lpc55sxx/lpc55s69_nxp_evk/board/board.c +++ b/bsp/lpc55sxx/lpc55s69_nxp_evk/board/board.c @@ -74,7 +74,6 @@ void rt_hw_board_init() #endif //BOARD_BootClockFROHF96M(); - /* init systick 1 systick = 1/(100M / 100) 100个systick = 1s*/ SysTick_Config(SystemCoreClock / RT_TICK_PER_SECOND); /* set pend exception priority */ NVIC_SetPriority(PendSV_IRQn, (1 << __NVIC_PRIO_BITS) - 1); -- cgit v1.3.1 From 52738a85e30100e93b77b40105fde2b4316693db Mon Sep 17 00:00:00 2001 From: supperthomas <78900636@qq.com> Date: Sun, 10 Oct 2021 21:38:08 +0800 Subject: add the config --- bsp/lpc55sxx/lpc55s69_nxp_evk/.config | 23 +++++------------------ bsp/lpc55sxx/lpc55s69_nxp_evk/rtconfig.h | 11 ----------- 2 files changed, 5 insertions(+), 29 deletions(-) diff --git a/bsp/lpc55sxx/lpc55s69_nxp_evk/.config b/bsp/lpc55sxx/lpc55s69_nxp_evk/.config index 7aa450dc1c..65c0862ad6 100644 --- a/bsp/lpc55sxx/lpc55s69_nxp_evk/.config +++ b/bsp/lpc55sxx/lpc55s69_nxp_evk/.config @@ -74,7 +74,7 @@ CONFIG_RT_USING_DEVICE=y # CONFIG_RT_USING_INTERRUPT_INFO is not set CONFIG_RT_USING_CONSOLE=y CONFIG_RT_CONSOLEBUF_SIZE=128 -CONFIG_RT_CONSOLE_DEVICE_NAME="uart" +CONFIG_RT_CONSOLE_DEVICE_NAME="uart0" # CONFIG_RT_PRINTF_LONGLONG is not set CONFIG_RT_VER_NUM=0x40004 # CONFIG_RT_USING_CPU_FFS is not set @@ -173,13 +173,7 @@ CONFIG_RT_USING_PIN=y # CONFIG_RT_USING_MTD_NAND is not set # CONFIG_RT_USING_PM is not set # CONFIG_RT_USING_RTC is not set -CONFIG_RT_USING_SDIO=y -CONFIG_RT_SDIO_STACK_SIZE=512 -CONFIG_RT_SDIO_THREAD_PRIORITY=15 -CONFIG_RT_MMCSD_STACK_SIZE=1024 -CONFIG_RT_MMCSD_THREAD_PREORITY=22 -CONFIG_RT_MMCSD_MAX_PARTITION=16 -# CONFIG_RT_SDIO_DEBUG is not set +# CONFIG_RT_USING_SDIO is not set # CONFIG_RT_USING_SPI is not set # CONFIG_RT_USING_WDT is not set # CONFIG_RT_USING_AUDIO is not set @@ -199,16 +193,9 @@ CONFIG_RT_MMCSD_MAX_PARTITION=16 # # POSIX layer and C standard library # -CONFIG_RT_USING_LIBC=y +# CONFIG_RT_USING_LIBC is not set # CONFIG_RT_USING_PTHREADS is not set -CONFIG_RT_USING_POSIX=y -# CONFIG_RT_USING_POSIX_MMAP is not set -# CONFIG_RT_USING_POSIX_TERMIOS is not set -# CONFIG_RT_USING_POSIX_GETLINE is not set -# CONFIG_RT_USING_POSIX_AIO is not set -CONFIG_RT_LIBC_USING_TIME=y -# CONFIG_RT_USING_MODULE is not set -CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 +# CONFIG_RT_LIBC_USING_TIME is not set # # Network @@ -643,7 +630,7 @@ CONFIG_HW_UART0_BAUDRATE_115200=y # CONFIG_BSP_USING_I2C is not set # CONFIG_BSP_USING_SPI is not set # CONFIG_BSP_USING_ADC is not set -CONFIG_BSP_USING_SDIO=y +# CONFIG_BSP_USING_SDIO is not set # CONFIG_BSP_USING_RTC is not set # CONFIG_BSP_USING_WDT is not set # CONFIG_BSP_USING_HWTIMER is not set diff --git a/bsp/lpc55sxx/lpc55s69_nxp_evk/rtconfig.h b/bsp/lpc55sxx/lpc55s69_nxp_evk/rtconfig.h index 412285dad0..66b06db132 100644 --- a/bsp/lpc55sxx/lpc55s69_nxp_evk/rtconfig.h +++ b/bsp/lpc55sxx/lpc55s69_nxp_evk/rtconfig.h @@ -108,22 +108,12 @@ #define RT_SERIAL_USING_DMA #define RT_SERIAL_RB_BUFSZ 64 #define RT_USING_PIN -#define RT_USING_SDIO -#define RT_SDIO_STACK_SIZE 512 -#define RT_SDIO_THREAD_PRIORITY 15 -#define RT_MMCSD_STACK_SIZE 1024 -#define RT_MMCSD_THREAD_PREORITY 22 -#define RT_MMCSD_MAX_PARTITION 16 /* Using USB */ /* POSIX layer and C standard library */ -#define RT_USING_LIBC -#define RT_USING_POSIX -#define RT_LIBC_USING_TIME -#define RT_LIBC_DEFAULT_TIMEZONE 8 /* Network */ @@ -212,7 +202,6 @@ #define BSP_USING_UART #define BSP_USING_UART0 #define HW_UART0_BAUDRATE_115200 -#define BSP_USING_SDIO /* Onboard Peripheral Drivers */ -- cgit v1.3.1 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(-) 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