diff options
| author | Meco Man <[email protected]> | 2021-11-18 11:40:38 -0500 |
|---|---|---|
| committer | Meco Man <[email protected]> | 2021-11-18 11:44:57 -0500 |
| commit | 5f2f862ed9f315c63f4fee9a491f55fe40292adc (patch) | |
| tree | de76945e20018634deeea6877e3fdf450352927b | |
| parent | b7d17f3df88ce9331f0527d254254b750cef8892 (diff) | |
[stm32f469] update project
| -rw-r--r-- | bsp/stm32/stm32f469-st-disco/.config | 43 | ||||
| -rw-r--r-- | bsp/stm32/stm32f469-st-disco/project.ewp | 242 | ||||
| -rw-r--r-- | bsp/stm32/stm32f469-st-disco/project.uvprojx | 197 | ||||
| -rw-r--r-- | bsp/stm32/stm32f469-st-disco/rtconfig.h | 28 |
4 files changed, 96 insertions, 414 deletions
diff --git a/bsp/stm32/stm32f469-st-disco/.config b/bsp/stm32/stm32f469-st-disco/.config index e29ef04a16..135645a1bc 100644 --- a/bsp/stm32/stm32f469-st-disco/.config +++ b/bsp/stm32/stm32f469-st-disco/.config @@ -121,38 +121,7 @@ CONFIG_FINSH_ARG_MAX=10 # # Device virtual file system # -CONFIG_RT_USING_DFS=y -CONFIG_DFS_USING_WORKDIR=y -CONFIG_DFS_FILESYSTEMS_MAX=2 -CONFIG_DFS_FILESYSTEM_TYPES_MAX=2 -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 +# CONFIG_RT_USING_DFS is not set # # Device Drivers @@ -174,17 +143,11 @@ CONFIG_RT_USING_PIN=y # CONFIG_RT_USING_ADC is not set # CONFIG_RT_USING_DAC is not set # CONFIG_RT_USING_PWM is not set -CONFIG_RT_USING_MTD_NOR=y +# CONFIG_RT_USING_MTD_NOR is not set # 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 diff --git a/bsp/stm32/stm32f469-st-disco/project.ewp b/bsp/stm32/stm32f469-st-disco/project.ewp index 1a249d6915..3e484e8c68 100644 --- a/bsp/stm32/stm32f469-st-disco/project.ewp +++ b/bsp/stm32/stm32f469-st-disco/project.ewp @@ -215,9 +215,8 @@ <option>
<name>CCDefines</name>
<state />
- <state>RT_USING_DLIBC</state>
- <state>_DLIB_FILE_DESCRIPTOR</state>
<state>STM32F469xx</state>
+ <state>__RTTHREAD__</state>
<state>USE_HAL_DRIVER</state>
</option>
<option>
@@ -344,21 +343,19 @@ <option>
<name>CCIncludePath2</name>
<state />
- <state>$PROJ_DIR$\..\..\..\components\dfs\filesystems\devfs</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\nogcc</state>
<state>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Include</state>
<state>$PROJ_DIR$\..\..\..\components\finsh</state>
<state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
<state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4</state>
- <state>$PROJ_DIR$\..\..\..\components\dfs\include</state>
<state>$PROJ_DIR$\board\ports</state>
<state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common</state>
+ <state>$PROJ_DIR$\..\..\..\examples\utest\testcases\kernel</state>
<state>$PROJ_DIR$\.</state>
<state>$PROJ_DIR$\applications</state>
<state>$PROJ_DIR$\..\libraries\HAL_Drivers\config</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\dlib</state>
<state>$PROJ_DIR$\board</state>
- <state>$PROJ_DIR$\..\..\..\components\dfs\filesystems\elmfat</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common</state>
<state>$PROJ_DIR$\board\CubeMX_Config\Inc</state>
<state>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include</state>
<state>$PROJ_DIR$\..\..\..\include</state>
@@ -1252,9 +1249,8 @@ </option>
<option>
<name>CCDefines</name>
- <state>RT_USING_DLIBC</state>
- <state>_DLIB_FILE_DESCRIPTOR</state>
<state>STM32F469xx</state>
+ <state>__RTTHREAD__</state>
<state>USE_HAL_DRIVER</state>
</option>
<option>
@@ -1381,21 +1377,19 @@ <option>
<name>CCIncludePath2</name>
<state />
- <state>$PROJ_DIR$\..\..\..\components\dfs\filesystems\devfs</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\nogcc</state>
<state>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Include</state>
<state>$PROJ_DIR$\..\..\..\components\finsh</state>
<state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
<state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4</state>
- <state>$PROJ_DIR$\..\..\..\components\dfs\include</state>
<state>$PROJ_DIR$\board\ports</state>
<state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common</state>
+ <state>$PROJ_DIR$\..\..\..\examples\utest\testcases\kernel</state>
<state>$PROJ_DIR$\.</state>
<state>$PROJ_DIR$\applications</state>
<state>$PROJ_DIR$\..\libraries\HAL_Drivers\config</state>
- <state>$PROJ_DIR$\..\..\..\components\libc\compilers\dlib</state>
<state>$PROJ_DIR$\board</state>
- <state>$PROJ_DIR$\..\..\..\components\dfs\filesystems\elmfat</state>
+ <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common</state>
<state>$PROJ_DIR$\board\CubeMX_Config\Inc</state>
<state>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include</state>
<state>$PROJ_DIR$\..\..\..\include</state>
@@ -2078,22 +2072,22 @@ <group>
<name>Applications</name>
<file>
- <name>$PROJ_DIR$\applications\main.c</name>
+ <name>$PROJ_DIR$\applications\lcd_init.c</name>
</file>
<file>
- <name>$PROJ_DIR$\applications\lcd_init.c</name>
+ <name>$PROJ_DIR$\applications\main.c</name>
</file>
</group>
<group>
- <name>cpu</name>
+ <name>CPU</name>
<file>
<name>$PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c</name>
+ <name>$PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c</name>
+ <name>$PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c</name>
@@ -2108,91 +2102,37 @@ <name>$PROJ_DIR$\..\..\..\components\drivers\misc\pin.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\drivers\mtd\mtd_nor.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\components\drivers\sdio\block_dev.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\components\drivers\sdio\mmcsd_core.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\components\drivers\sdio\sd.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\components\drivers\sdio\sdio.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\drivers\serial\serial.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\drivers\sdio\mmc.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\drivers\serial\serial.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\components\drivers\src\completion.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c</name>
- </file>
- <file>
<name>$PROJ_DIR$\..\..\..\components\drivers\src\pipe.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c</name>
- </file>
- <file>
<name>$PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c</name>
</file>
</group>
<group>
- <name>dlib</name>
- <file>
- <name>$PROJ_DIR$\..\..\..\components\libc\compilers\dlib\environ.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\components\libc\compilers\dlib\libc.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\components\libc\compilers\dlib\rmtx.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\components\libc\compilers\dlib\stdio.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_close.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_lseek.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_mem.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_open.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_read.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_remove.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_write.c</name>
- </file>
- </group>
- <group>
<name>Drivers</name>
<file>
- <name>$PROJ_DIR$\board\board.c</name>
+ <name>$PROJ_DIR$\board\CubeMX_Config\Src\stm32f4xx_hal_msp.c</name>
</file>
<file>
- <name>$PROJ_DIR$\board\CubeMX_Config\Src\stm32f4xx_hal_msp.c</name>
+ <name>$PROJ_DIR$\board\board.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\iar\startup_stm32f469xx.s</name>
@@ -2208,126 +2148,57 @@ </file>
</group>
<group>
- <name>Filesystem</name>
- <file>
- <name>$PROJ_DIR$\..\..\..\components\dfs\src\dfs.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\components\dfs\src\dfs_file.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\components\dfs\src\dfs_fs.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\components\dfs\src\dfs_posix.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\components\dfs\src\poll.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\components\dfs\src\select.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\components\dfs\filesystems\devfs\devfs.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\components\dfs\filesystems\elmfat\dfs_elm.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\components\dfs\filesystems\elmfat\ff.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\components\dfs\filesystems\elmfat\option\ccsbcs.c</name>
- </file>
- </group>
- <group>
- <name>finsh</name>
+ <name>Finsh</name>
<file>
<name>$PROJ_DIR$\..\..\..\components\finsh\shell.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\cmd.c</name>
- </file>
- <file>
<name>$PROJ_DIR$\..\..\..\components\finsh\msh.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\msh_file.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\finsh_compiler.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\finsh_error.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\finsh_heap.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\finsh_init.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\finsh_node.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\finsh_ops.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\finsh_parser.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\finsh_var.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\finsh_vm.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\components\finsh\finsh_token.c</name>
+ <name>$PROJ_DIR$\..\..\..\components\finsh\cmd.c</name>
</file>
</group>
<group>
<name>Kernel</name>
<file>
- <name>$PROJ_DIR$\..\..\..\src\clock.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\src\components.c</name>
+ <name>$PROJ_DIR$\..\..\..\src\irq.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\src\device.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\src\idle.c</name>
+ <name>$PROJ_DIR$\..\..\..\src\memheap.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\src\ipc.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\src\irq.c</name>
+ <name>$PROJ_DIR$\..\..\..\src\clock.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\src\kservice.c</name>
+ <name>$PROJ_DIR$\..\..\..\src\idle.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\src\memheap.c</name>
+ <name>$PROJ_DIR$\..\..\..\src\object.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\src\mempool.c</name>
+ <name>$PROJ_DIR$\..\..\..\src\timer.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\src\object.c</name>
+ <name>$PROJ_DIR$\..\..\..\src\thread.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\src\scheduler.c</name>
+ <name>$PROJ_DIR$\..\..\..\src\mempool.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\src\signal.c</name>
+ <name>$PROJ_DIR$\..\..\..\src\kservice.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\src\thread.c</name>
+ <name>$PROJ_DIR$\..\..\..\src\scheduler.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\src\timer.c</name>
+ <name>$PROJ_DIR$\..\..\..\src\components.c</name>
</file>
</group>
<group>
@@ -2335,71 +2206,62 @@ <file>
<name>$PROJ_DIR$\..\..\..\components\libc\compilers\common\time.c</name>
</file>
- <file>
- <name>$PROJ_DIR$\..\..\..\components\libc\compilers\common\unistd.c</name>
- </file>
</group>
<group>
- <name>STM32_HAL</name>
- <file>
- <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\system_stm32f4xx.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cec.c</name>
- </file>
+ <name>Libraries</name>
<file>
- <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cortex.c</name>
+ <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_uart.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_crc.c</name>
+ <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cryp_ex.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cryp.c</name>
+ <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_pwr_ex.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cryp_ex.c</name>
+ <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rng.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dma.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dma_ex.c</name>
+ <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_pwr.c</name>
+ <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rcc_ex.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_pwr_ex.c</name>
+ <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_usart.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rcc.c</name>
+ <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cec.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rcc_ex.c</name>
+ <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rcc.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rng.c</name>
+ <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dma_ex.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_gpio.c</name>
+ <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_pwr.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_uart.c</name>
+ <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\system_stm32f4xx.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_usart.c</name>
+ <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_crc.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_sdmmc.c</name>
+ <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cortex.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_sd.c</name>
+ <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cryp.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_nor.c</name>
+ <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_gpio.c</name>
</file>
</group>
+ <group>
+ <name>utestcases</name>
+ </group>
</project>
diff --git a/bsp/stm32/stm32f469-st-disco/project.uvprojx b/bsp/stm32/stm32f469-st-disco/project.uvprojx index b3619ee515..19895be4be 100644 --- a/bsp/stm32/stm32f469-st-disco/project.uvprojx +++ b/bsp/stm32/stm32f469-st-disco/project.uvprojx @@ -335,7 +335,7 @@ <MiscControls /> <Define>USE_HAL_DRIVER, STM32F469xx, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND</Define> <Undefine /> - <IncludePath>applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\dfs\include;..\..\..\components\dfs\filesystems\devfs;..\..\..\components\dfs\filesystems\elmfat;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel</IncludePath> + <IncludePath>applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel</IncludePath> </VariousControls> </Cads> <Aads> @@ -404,16 +404,16 @@ </Files> <Files> <File> - <FileName>div0.c</FileName> + <FileName>showmem.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\libcpu\arm\common\div0.c</FilePath> + <FilePath>..\..\..\libcpu\arm\common\showmem.c</FilePath> </File> </Files> <Files> <File> - <FileName>showmem.c</FileName> + <FileName>div0.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\libcpu\arm\common\showmem.c</FilePath> + <FilePath>..\..\..\libcpu\arm\common\div0.c</FilePath> </File> </Files> <Files> @@ -442,65 +442,37 @@ </Files> <Files> <File> - <FileName>mtd_nor.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\components\drivers\mtd\mtd_nor.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>mmc.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\components\drivers\sdio\mmc.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>sd.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\components\drivers\sdio\sd.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>block_dev.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\components\drivers\sdio\block_dev.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>sdio.c</FileName> + <FileName>serial.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\drivers\sdio\sdio.c</FilePath> + <FilePath>..\..\..\components\drivers\serial\serial.c</FilePath> </File> </Files> <Files> <File> - <FileName>mmcsd_core.c</FileName> + <FileName>waitqueue.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\drivers\sdio\mmcsd_core.c</FilePath> + <FilePath>..\..\..\components\drivers\src\waitqueue.c</FilePath> </File> </Files> <Files> <File> - <FileName>serial.c</FileName> + <FileName>pipe.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\drivers\serial\serial.c</FilePath> + <FilePath>..\..\..\components\drivers\src\pipe.c</FilePath> </File> </Files> <Files> <File> - <FileName>pipe.c</FileName> + <FileName>workqueue.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\drivers\src\pipe.c</FilePath> + <FilePath>..\..\..\components\drivers\src\workqueue.c</FilePath> </File> </Files> <Files> <File> - <FileName>workqueue.c</FileName> + <FileName>ringblk_buf.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\components\drivers\src\workqueue.c</FilePath> + <FilePath>..\..\..\components\drivers\src\ringblk_buf.c</FilePath> </File> </Files> <Files> @@ -524,20 +496,6 @@ <FilePath>..\..\..\components\drivers\src\dataqueue.c</FilePath> </File> </Files> - <Files> - <File> - <FileName>ringblk_buf.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\components\drivers\src\ringblk_buf.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>waitqueue.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\components\drivers\src\waitqueue.c</FilePath> - </File> - </Files> </Group> <Group> <GroupName>Drivers</GroupName> @@ -585,58 +543,6 @@ </Files> </Group> <Group> - <GroupName>Filesystem</GroupName> - <Files> - <File> - <FileName>dfs_fs.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\components\dfs\src\dfs_fs.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>dfs.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\components\dfs\src\dfs.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>dfs_file.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\components\dfs\src\dfs_file.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>devfs.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\components\dfs\filesystems\devfs\devfs.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>ff.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\components\dfs\filesystems\elmfat\ff.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>dfs_elm.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\components\dfs\filesystems\elmfat\dfs_elm.c</FilePath> - </File> - </Files> - <Files> - <File> - <FileName>ffunicode.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\..\components\dfs\filesystems\elmfat\ffunicode.c</FilePath> - </File> - </Files> - </Group> - <Group> <GroupName>Finsh</GroupName> <Files> <File> @@ -664,93 +570,93 @@ <GroupName>Kernel</GroupName> <Files> <File> - <FileName>timer.c</FileName> + <FileName>object.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\timer.c</FilePath> + <FilePath>..\..\..\src\object.c</FilePath> </File> </Files> <Files> <File> - <FileName>mempool.c</FileName> + <FileName>kservice.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\mempool.c</FilePath> + <FilePath>..\..\..\src\kservice.c</FilePath> </File> </Files> <Files> <File> - <FileName>components.c</FileName> + <FileName>clock.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\components.c</FilePath> + <FilePath>..\..\..\src\clock.c</FilePath> </File> </Files> <Files> <File> - <FileName>scheduler.c</FileName> + <FileName>memheap.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\scheduler.c</FilePath> + <FilePath>..\..\..\src\memheap.c</FilePath> </File> </Files> <Files> <File> - <FileName>irq.c</FileName> + <FileName>mempool.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\irq.c</FilePath> + <FilePath>..\..\..\src\mempool.c</FilePath> </File> </Files> <Files> <File> - <FileName>memheap.c</FileName> + <FileName>timer.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\memheap.c</FilePath> + <FilePath>..\..\..\src\timer.c</FilePath> </File> </Files> <Files> <File> - <FileName>thread.c</FileName> + <FileName>scheduler.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\thread.c</FilePath> + <FilePath>..\..\..\src\scheduler.c</FilePath> </File> </Files> <Files> <File> - <FileName>idle.c</FileName> + <FileName>thread.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\idle.c</FilePath> + <FilePath>..\..\..\src\thread.c</FilePath> </File> </Files> <Files> <File> - <FileName>device.c</FileName> + <FileName>components.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\device.c</FilePath> + <FilePath>..\..\..\src\components.c</FilePath> </File> </Files> <Files> <File> - <FileName>clock.c</FileName> + <FileName>device.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\clock.c</FilePath> + <FilePath>..\..\..\src\device.c</FilePath> </File> </Files> <Files> <File> - <FileName>object.c</FileName> + <FileName>ipc.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\object.c</FilePath> + <FilePath>..\..\..\src\ipc.c</FilePath> </File> </Files> <Files> <File> - <FileName>kservice.c</FileName> + <FileName>irq.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\kservice.c</FilePath> + <FilePath>..\..\..\src\irq.c</FilePath> </File> </Files> <Files> <File> - <FileName>ipc.c</FileName> + <FileName>idle.c</FileName> <FileType>1</FileType> - <FilePath>..\..\..\src\ipc.c</FilePath> + <FilePath>..\..\..\src\idle.c</FilePath> </File> </Files> </Group> @@ -810,13 +716,6 @@ </Files> <Files> <File> - <FileName>stm32f4xx_hal_sd.c</FileName> - <FileType>1</FileType> - <FilePath>..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_sd.c</FilePath> - </File> - </Files> - <Files> - <File> <FileName>stm32f4xx_hal_rcc_ex.c</FileName> <FileType>1</FileType> <FilePath>..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rcc_ex.c</FilePath> @@ -845,13 +744,6 @@ </Files> <Files> <File> - <FileName>stm32f4xx_ll_sdmmc.c</FileName> - <FileType>1</FileType> - <FilePath>..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_sdmmc.c</FilePath> - </File> - </Files> - <Files> - <File> <FileName>stm32f4xx_hal_dma_ex.c</FileName> <FileType>1</FileType> <FilePath>..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dma_ex.c</FilePath> @@ -887,13 +779,6 @@ </Files> <Files> <File> - <FileName>stm32f4xx_hal_nor.c</FileName> - <FileType>1</FileType> - <FilePath>..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_nor.c</FilePath> - </File> - </Files> - <Files> - <File> <FileName>stm32f4xx_hal_cryp.c</FileName> <FileType>1</FileType> <FilePath>..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cryp.c</FilePath> diff --git a/bsp/stm32/stm32f469-st-disco/rtconfig.h b/bsp/stm32/stm32f469-st-disco/rtconfig.h index 82fa61a18f..a008d32aec 100644 --- a/bsp/stm32/stm32f469-st-disco/rtconfig.h +++ b/bsp/stm32/stm32f469-st-disco/rtconfig.h @@ -81,27 +81,6 @@ /* Device virtual file system */ -#define RT_USING_DFS -#define DFS_USING_WORKDIR -#define DFS_FILESYSTEMS_MAX 2 -#define DFS_FILESYSTEM_TYPES_MAX 2 -#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 */ @@ -112,13 +91,6 @@ #define RT_SERIAL_USING_DMA #define RT_SERIAL_RB_BUFSZ 64 #define RT_USING_PIN -#define RT_USING_MTD_NOR -#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 */ |
