From f37df10a632eaaa33c70952291eb2bb3e8123cc4 Mon Sep 17 00:00:00 2001 From: tanek liang Date: Tue, 28 Nov 2017 21:31:55 +0800 Subject: [PATCH] [bsp] update stm32f429 bsp - enable SPI/SPI Flash/SDIO/SDCARD default - update mount file system code - enable C99 for MDK4 template - update all project file --- bsp/stm32f429-apollo/.config | 45 +- .../applications/application.c | 93 ++-- bsp/stm32f429-apollo/project.ewp | 33 ++ bsp/stm32f429-apollo/project.uvproj | 67 ++- bsp/stm32f429-apollo/project.uvprojx | 507 ++++++++++++++++-- bsp/stm32f429-apollo/rtconfig.h | 43 +- bsp/stm32f429-apollo/template.uvproj | 2 +- 7 files changed, 683 insertions(+), 107 deletions(-) diff --git a/bsp/stm32f429-apollo/.config b/bsp/stm32f429-apollo/.config index 27d5bc355..dad78988d 100644 --- a/bsp/stm32f429-apollo/.config +++ b/bsp/stm32f429-apollo/.config @@ -9,6 +9,9 @@ CONFIG_BOARD_STM32F429_APPOLO=y # CONFIG_RT_NAME_MAX=8 CONFIG_RT_ALIGN_SIZE=4 +# CONFIG_RT_THREAD_PRIORITY_8 is not set +CONFIG_RT_THREAD_PRIORITY_32=y +# CONFIG_RT_THREAD_PRIORITY_256 is not set CONFIG_RT_THREAD_PRIORITY_MAX=32 CONFIG_RT_TICK_PER_SECOND=1000 CONFIG_RT_DEBUG=y @@ -34,9 +37,11 @@ CONFIG_RT_USING_MESSAGEQUEUE=y # CONFIG_RT_USING_MEMPOOL=y CONFIG_RT_USING_MEMHEAP=y -CONFIG_RT_USING_HEAP=y +# CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set +CONFIG_RT_USING_HEAP=y # # Kernel Device Object @@ -80,7 +85,8 @@ CONFIG_FINSH_CMD_SIZE=80 # CONFIG_RT_USING_DFS=y CONFIG_DFS_USING_WORKDIR=y -CONFIG_DFS_FILESYSTEMS_MAX=2 +CONFIG_DFS_FILESYSTEMS_MAX=4 +CONFIG_DFS_FILESYSTEM_TYPES_MAX=4 CONFIG_DFS_FD_MAX=4 CONFIG_RT_USING_DFS_ELMFAT=y @@ -96,14 +102,14 @@ CONFIG_RT_DFS_ELM_USE_LFN_0=y CONFIG_RT_DFS_ELM_USE_LFN=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_MAX_SECTOR_SIZE=4096 # CONFIG_RT_DFS_ELM_USE_ERASE is not set CONFIG_RT_DFS_ELM_REENTRANT=y CONFIG_RT_USING_DFS_DEVFS=y CONFIG_RT_USING_DFS_NET=y CONFIG_HAVE_SYS_SELECT_H=y # CONFIG_HAVE_SYS_SOCKET_H is not set -# CONFIG_RT_USING_DFS_ROMFS is not set +CONFIG_RT_USING_DFS_ROMFS=y # CONFIG_RT_USING_DFS_RAMFS is not set # CONFIG_RT_USING_DFS_UFFS is not set # CONFIG_RT_USING_DFS_NFS is not set @@ -123,8 +129,21 @@ CONFIG_RT_USING_MTD_NAND=y # CONFIG_RT_MTD_NAND_DEBUG is not set CONFIG_RT_USING_RTC=y # CONFIG_RT_USING_SDIO is not set -# CONFIG_RT_USING_SPI is not set +CONFIG_RT_USING_SPI=y +CONFIG_RT_USING_SFUD=y +CONFIG_RT_SFUD_USING_SFDP=y +# CONFIG_RT_SFUD_USING_FLASH_INFO_TABLE is not set +# CONFIG_RT_SFUD_DEBUG is not set +# CONFIG_RT_USING_W25QXX is not set +# CONFIG_RT_USING_GD is not set +# CONFIG_RT_USING_ENC28J60 is not set +# CONFIG_RT_USING_SPI_WIFI is not set # CONFIG_RT_USING_WDT is not set +# CONFIG_RT_USING_WIFI is not set + +# +# Using USB +# # CONFIG_RT_USING_USB_HOST is not set # CONFIG_RT_USING_USB_DEVICE is not set @@ -213,6 +232,7 @@ CONFIG_LWIP_SO_RCVBUF=1 # # CONFIG_PKG_USING_PARTITION is not set # CONFIG_PKG_USING_SQLITE is not set +# CONFIG_PKG_USING_RTI is not set # # IoT - internet of things @@ -223,26 +243,23 @@ CONFIG_LWIP_SO_RCVBUF=1 # CONFIG_PKG_USING_WEBTERMINAL is not set # CONFIG_PKG_USING_CJSON is not set # CONFIG_PKG_USING_EZXML is not set - -# -# Marvell WiFi -# -# CONFIG_PKG_USING_MARVELLWIFI is not set +# CONFIG_PKG_USING_NANOPB is not set # # security packages # # CONFIG_PKG_USING_MBEDTLS is not set +# CONFIG_PKG_USING_libsodium is not set # # language packages # # CONFIG_PKG_USING_JERRYSCRIPT is not set +# CONFIG_PKG_USING_MICROPYTHON is not set # # multimedia packages # -# CONFIG_PKG_USING_FASTLZ is not set # # tools packages @@ -254,6 +271,12 @@ CONFIG_LWIP_SO_RCVBUF=1 # # miscellaneous packages # +# CONFIG_PKG_USING_FASTLZ is not set +# CONFIG_PKG_USING_MINILZO is not set + +# +# example package: hello +# # CONFIG_PKG_USING_HELLO is not set CONFIG_RT_USING_EXT_SDRAM=y CONFIG_RT_USING_UART1=y diff --git a/bsp/stm32f429-apollo/applications/application.c b/bsp/stm32f429-apollo/applications/application.c index 50d83efac..527e2d017 100644 --- a/bsp/stm32f429-apollo/applications/application.c +++ b/bsp/stm32f429-apollo/applications/application.c @@ -26,6 +26,8 @@ /* dfs Filesystem APIs */ #include #include + +#include #endif #ifdef RT_USING_LWIP @@ -44,8 +46,6 @@ #include #endif -//rt_module_t module_ptr; -#define DATA_PATH "/Data" void rt_init_thread_entry(void* parameter) { /* initialization RT-Thread Components */ @@ -58,41 +58,68 @@ void rt_init_thread_entry(void* parameter) gdb_set_device("uart6"); gdb_start(); #endif -#ifdef RT_USING_DFS - #ifdef RT_USING_DFS_UFFS - /* mount nand flash partition 0 as root directory */ - if (dfs_mount("nand0", "/", "uffs", 0, 0) == 0) + +#ifdef RT_USING_DFS + +#ifdef RT_USING_DFS_ELMFAT + { - mkdir("/sdcard",0); - rt_kprintf("uffs initialized!\n"); + static const rt_uint8_t _romfs_root_readme_txt[] = { + 0x52,0x54,0x2d,0x54,0x68,0x72,0x65,0x61,0x64,0x0d,0x0a,0x00 + }; + + static const rt_uint8_t _romfs_root_sdcard_aaa_txt[] = { + 0x52,0x54,0x2d,0x54,0x68,0x72,0x65,0x61,0x64,0x0d,0x0a,0x00 + }; + + static const struct romfs_dirent _romfs_root_sdcard[] = { + {ROMFS_DIRENT_FILE, "aaa.txt", (rt_uint8_t *)_romfs_root_sdcard_aaa_txt, sizeof(_romfs_root_sdcard_aaa_txt)/sizeof(_romfs_root_sdcard_aaa_txt[0])} + }; + + static const rt_uint8_t _romfs_root_spi_bbb_txt[] = { + 0x52,0x54,0x2d,0x54,0x68,0x72,0x65,0x61,0x64,0x0d,0x0a,0x00 + }; + + static const struct romfs_dirent _romfs_root_spi[] = { + {ROMFS_DIRENT_FILE, "bbb.txt", (rt_uint8_t *)_romfs_root_spi_bbb_txt, sizeof(_romfs_root_spi_bbb_txt)/sizeof(_romfs_root_spi_bbb_txt[0])} + }; + + static const struct romfs_dirent _romfs_root[] = { + {ROMFS_DIRENT_FILE, "readme.txt", (rt_uint8_t *)_romfs_root_readme_txt, sizeof(_romfs_root_readme_txt)/sizeof(_romfs_root_readme_txt[0])}, + {ROMFS_DIRENT_DIR, "sdcard", (rt_uint8_t *)_romfs_root_sdcard, sizeof(_romfs_root_sdcard)/sizeof(_romfs_root_sdcard[0])}, + {ROMFS_DIRENT_DIR, "spi", (rt_uint8_t *)_romfs_root_spi, sizeof(_romfs_root_spi)/sizeof(_romfs_root_spi[0])} + }; + + static const struct romfs_dirent romfs_root = { + ROMFS_DIRENT_DIR, "/", (rt_uint8_t *)_romfs_root, sizeof(_romfs_root)/sizeof(_romfs_root[0]) + }; + + if (dfs_mount(RT_NULL, "/", "rom", 0, &(romfs_root)) == 0) + { + rt_kprintf("ROM file system initializated!\n"); + } } - else + + /* mount sd card fat partition 0 as root directory */ + if (dfs_mount("W25Q256", "/spi", "elm", 0, 0) == 0) { - rt_kprintf("uffs initialzation failed!\n"); + rt_kprintf("spi flash mount to /spi !\n"); } - - #endif /* RT_USING_DFS_UFFS */ - #ifdef RT_USING_DFS_ELMFAT - /* mount sd card fat partition 0 as root directory */ - if (dfs_mount("sd0", "/sdcard", "elm", 0, 0) == 0) - { - rt_kprintf("File System initialized!\n"); - } - else - { - rt_kprintf("File System initialzation failed!\n"); - } - - /* mount sd card fat partition 0 as root directory */ - if (dfs_mount("W25Q256", "/spi", "elm", 0, 0) == 0) - { - rt_kprintf("spi flash mount to /spi !\n"); - } - else - { - rt_kprintf("spi flash mount to /spi failed!\n"); - } - #endif /* RT_USING_DFS_ELMFAT */ + else + { + rt_kprintf("spi flash mount to /spi failed!\n"); + } + + /* mount sd card fat partition 0 as root directory */ + if (dfs_mount("sd0", "/sdcard", "elm", 0, 0) == 0) + { + rt_kprintf("sd card mount to /sdcard!\n"); + } + else + { + rt_kprintf("sd card mount to /sdcard failed!\n"); + } +#endif /* RT_USING_DFS_ELMFAT */ #endif /* DFS */ diff --git a/bsp/stm32f429-apollo/project.ewp b/bsp/stm32f429-apollo/project.ewp index ffc836f44..230173a83 100644 --- a/bsp/stm32f429-apollo/project.ewp +++ b/bsp/stm32f429-apollo/project.ewp @@ -311,10 +311,13 @@ $PROJ_DIR$\Libraries\CMSIS\Device\ST\STM32F4xx\Include $PROJ_DIR$\. $PROJ_DIR$\..\..\libcpu\arm\cortex-m4 + $PROJ_DIR$\..\..\components\drivers\spi\sfud\inc $PROJ_DIR$\..\..\components\dfs\include $PROJ_DIR$\..\..\components\dfs\filesystems\devfs $PROJ_DIR$\..\..\components\dfs\filesystems\net\socket + $PROJ_DIR$\..\..\components\dfs\filesystems\romfs $PROJ_DIR$\Libraries\CMSIS\Include + $PROJ_DIR$\..\..\components\drivers\spi $PROJ_DIR$\applications $PROJ_DIR$\..\..\components\finsh $PROJ_DIR$\..\..\components\dfs\filesystems\elmfat @@ -1245,10 +1248,13 @@ $PROJ_DIR$\Libraries\CMSIS\Device\ST\STM32F4xx\Include $PROJ_DIR$\. $PROJ_DIR$\..\..\libcpu\arm\cortex-m4 + $PROJ_DIR$\..\..\components\drivers\spi\sfud\inc $PROJ_DIR$\..\..\components\dfs\include $PROJ_DIR$\..\..\components\dfs\filesystems\devfs $PROJ_DIR$\..\..\components\dfs\filesystems\net\socket + $PROJ_DIR$\..\..\components\dfs\filesystems\romfs $PROJ_DIR$\Libraries\CMSIS\Include + $PROJ_DIR$\..\..\components\drivers\spi $PROJ_DIR$\applications $PROJ_DIR$\..\..\components\finsh $PROJ_DIR$\..\..\components\dfs\filesystems\elmfat @@ -1912,6 +1918,12 @@ $PROJ_DIR$\drivers\drv_pcf8574.c + + $PROJ_DIR$\drivers\drv_spi.c + + + $PROJ_DIR$\drivers\drv_spi_flash.c + STM32_HAL @@ -2227,6 +2239,12 @@ $PROJ_DIR$\..\..\components\dfs\filesystems\net\net_sockets.c + + $PROJ_DIR$\..\..\components\dfs\filesystems\romfs\dfs_romfs.c + + + $PROJ_DIR$\..\..\components\dfs\filesystems\romfs\romfs.c + DeviceDrivers @@ -2248,6 +2266,21 @@ $PROJ_DIR$\..\..\components\drivers\serial\serial.c + + $PROJ_DIR$\..\..\components\drivers\spi\spi_core.c + + + $PROJ_DIR$\..\..\components\drivers\spi\spi_dev.c + + + $PROJ_DIR$\..\..\components\drivers\spi\spi_flash_sfud.c + + + $PROJ_DIR$\..\..\components\drivers\spi\sfud\src\sfud.c + + + $PROJ_DIR$\..\..\components\drivers\spi\sfud\src\sfud_sfdp.c + $PROJ_DIR$\..\..\components\drivers\src\completion.c diff --git a/bsp/stm32f429-apollo/project.uvproj b/bsp/stm32f429-apollo/project.uvproj index 04184b816..6fe956f02 100644 --- a/bsp/stm32f429-apollo/project.uvproj +++ b/bsp/stm32f429-apollo/project.uvproj @@ -353,13 +353,13 @@ 0 0 0 - 0 + 1 0 USE_HAL_DRIVER, RT_USING_ARM_LIBC, STM32F429xx - applications;.;drivers;Libraries\STM32F4xx_HAL_Driver\Inc;Libraries\CMSIS\Device\ST\STM32F4xx\Include;Libraries\CMSIS\Include;..\..\include;..\..\libcpu\arm\cortex-m4;..\..\libcpu\arm\common;..\..\components\dfs\include;..\..\components\dfs\filesystems\devfs;..\..\components\dfs\filesystems\elmfat;..\..\components\dfs\filesystems\net;..\..\components\dfs\filesystems\net\socket;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\finsh;..\..\components\libc\compilers\armlibc;..\..\components\net\lwip-2.0.2\src;..\..\components\net\lwip-2.0.2\src\include;..\..\components\net\lwip-2.0.2\src\include\ipv4;..\..\components\net\lwip-2.0.2\src\arch\include;..\..\components\net\lwip-2.0.2\src\include\netif + applications;.;drivers;Libraries\STM32F4xx_HAL_Driver\Inc;Libraries\CMSIS\Device\ST\STM32F4xx\Include;Libraries\CMSIS\Include;..\..\include;..\..\libcpu\arm\cortex-m4;..\..\libcpu\arm\common;..\..\components\dfs\include;..\..\components\dfs\filesystems\devfs;..\..\components\dfs\filesystems\elmfat;..\..\components\dfs\filesystems\net;..\..\components\dfs\filesystems\net\socket;..\..\components\dfs\filesystems\romfs;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\spi;..\..\components\drivers\include;..\..\components\drivers\spi\sfud\inc;..\..\components\drivers\include;..\..\components\finsh;..\..\components\libc\compilers\armlibc;..\..\components\net\lwip-2.0.2\src;..\..\components\net\lwip-2.0.2\src\include;..\..\components\net\lwip-2.0.2\src\include\ipv4;..\..\components\net\lwip-2.0.2\src\arch\include;..\..\components\net\lwip-2.0.2\src\include\netif @@ -495,6 +495,20 @@ drivers\drv_pcf8574.c + + + drv_spi.c + 1 + drivers\drv_spi.c + + + + + drv_spi_flash.c + 1 + drivers\drv_spi_flash.c + + STM32_HAL @@ -1214,6 +1228,20 @@ ..\..\components\dfs\filesystems\net\net_sockets.c + + + dfs_romfs.c + 1 + ..\..\components\dfs\filesystems\romfs\dfs_romfs.c + + + + + romfs.c + 1 + ..\..\components\dfs\filesystems\romfs\romfs.c + + DeviceDrivers @@ -1259,6 +1287,41 @@ ..\..\components\drivers\serial\serial.c + + + spi_core.c + 1 + ..\..\components\drivers\spi\spi_core.c + + + + + spi_dev.c + 1 + ..\..\components\drivers\spi\spi_dev.c + + + + + spi_flash_sfud.c + 1 + ..\..\components\drivers\spi\spi_flash_sfud.c + + + + + sfud.c + 1 + ..\..\components\drivers\spi\sfud\src\sfud.c + + + + + sfud_sfdp.c + 1 + ..\..\components\drivers\spi\sfud\src\sfud_sfdp.c + + completion.c diff --git a/bsp/stm32f429-apollo/project.uvprojx b/bsp/stm32f429-apollo/project.uvprojx index 7c7e50250..13d7ce038 100644 --- a/bsp/stm32f429-apollo/project.uvprojx +++ b/bsp/stm32f429-apollo/project.uvprojx @@ -1,45 +1,43 @@ - 2.1 -
### uVision Project, (C) Keil Software
- rt_thread_stm32f429 0x4 ARM-ADS 5060300::V5.06 update 3 (build 300)::ARMCC + 0 STM32F429IGHx STMicroelectronics - Keil.STM32F4xx_DFP.2.8.0 + Keil.STM32F4xx_DFP.2.11.0 http://www.keil.com/pack IRAM(0x20000000,0x30000) IRAM2(0x10000000,0x10000) IROM(0x08000000,0x100000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE - - + + UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F4xx_1024 -FS08000000 -FL0100000 -FP0($$Device:STM32F429IGHx$CMSIS\Flash\STM32F4xx_1024.FLM)) 0 $$Device:STM32F429IGHx$Drivers\CMSIS\Device\ST\STM32F4xx\Include\stm32f4xx.h - - - - - - - - - + + + + + + + + + $$Device:STM32F429IGHx$CMSIS\SVD\STM32F429x.svd 0 0 - - - - - + + + + + 0 0 @@ -61,8 +59,8 @@ 0 0 - - + + 0 0 0 @@ -71,8 +69,8 @@ 0 0 - - + + 0 0 0 @@ -81,15 +79,15 @@ 0 0 - - + + 0 0 0 0 0 - + 0 @@ -103,8 +101,8 @@ 0 0 3 - - + + 1 @@ -137,11 +135,11 @@ 1 BIN\UL2CM3.DLL - - - - - + + + + + 0 @@ -174,7 +172,7 @@ 0 0 "Cortex-M4" - + 0 0 0 @@ -306,7 +304,7 @@ 0x10000 - + 1 @@ -330,11 +328,12 @@ 1 0 0 + 0 - + USE_HAL_DRIVER, RT_USING_ARM_LIBC, STM32F429xx - - applications;.;drivers;Libraries\STM32F4xx_HAL_Driver\Inc;Libraries\CMSIS\Device\ST\STM32F4xx\Include;Libraries\CMSIS\Include;..\..\include;..\..\libcpu\arm\cortex-m4;..\..\libcpu\arm\common;..\..\components\dfs\include;..\..\components\dfs\filesystems\devfs;..\..\components\dfs\filesystems\elmfat;..\..\components\dfs\filesystems\net;..\..\components\dfs\filesystems\net\socket;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\finsh;..\..\components\libc\compilers\armlibc;..\..\components\net\lwip-2.0.2\src;..\..\components\net\lwip-2.0.2\src\include;..\..\components\net\lwip-2.0.2\src\include\ipv4;..\..\components\net\lwip-2.0.2\src\arch\include;..\..\components\net\lwip-2.0.2\src\include\netif + + applications;.;drivers;Libraries\STM32F4xx_HAL_Driver\Inc;Libraries\CMSIS\Device\ST\STM32F4xx\Include;Libraries\CMSIS\Include;..\..\include;..\..\libcpu\arm\cortex-m4;..\..\libcpu\arm\common;..\..\components\dfs\include;..\..\components\dfs\filesystems\devfs;..\..\components\dfs\filesystems\elmfat;..\..\components\dfs\filesystems\net;..\..\components\dfs\filesystems\net\socket;..\..\components\dfs\filesystems\romfs;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\spi;..\..\components\drivers\include;..\..\components\drivers\spi\sfud\inc;..\..\components\drivers\include;..\..\components\finsh;..\..\components\libc\compilers\armlibc;..\..\components\net\lwip-2.0.2\src;..\..\components\net\lwip-2.0.2\src\include;..\..\components\net\lwip-2.0.2\src\include\ipv4;..\..\components\net\lwip-2.0.2\src\arch\include;..\..\components\net\lwip-2.0.2\src\include\netif @@ -347,11 +346,12 @@ 0 0 0 + 0 - - - - + + + + @@ -363,13 +363,13 @@ 0 0x08000000 0x20000000 - + .\stm32f429_flash.sct - - + + --keep *.o(.rti_fn.*) --keep *.o(FSymTab) --keep *.o(VSymTab) - - + + @@ -382,6 +382,8 @@ 1 applications\application.c
+
+ startup.c 1 @@ -397,57 +399,91 @@ 1 drivers\board.c + + stm32f4xx_it.c 1 drivers\stm32f4xx_it.c + + usart.c 1 drivers\usart.c + + drv_sdram.c 1 drivers\drv_sdram.c + + drv_rtc.c 1 drivers\drv_rtc.c + + drv_mpu.c 1 drivers\drv_mpu.c + + drv_sdio_sd.c 1 drivers\drv_sdio_sd.c + + drv_nand.c 1 drivers\drv_nand.c + + drv_eth.c 1 drivers\drv_eth.c + + drv_iic.c 1 drivers\drv_iic.c + + drv_pcf8574.c 1 drivers\drv_pcf8574.c + + + drv_spi.c + 1 + drivers\drv_spi.c + + + + + drv_spi_flash.c + 1 + drivers\drv_spi_flash.c + +
STM32_HAL @@ -457,341 +493,477 @@ 1 Libraries\CMSIS\Device\ST\STM32F4xx\Source\Templates\system_stm32f4xx.c + + stm32f4xx_hal.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal.c + + stm32f4xx_hal_adc.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_adc.c + + stm32f4xx_hal_adc_ex.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_adc_ex.c + + stm32f4xx_hal_can.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_can.c + + stm32f4xx_hal_cec.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cec.c + + stm32f4xx_hal_cortex.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cortex.c + + stm32f4xx_hal_crc.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_crc.c + + stm32f4xx_hal_cryp.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cryp.c + + stm32f4xx_hal_cryp_ex.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cryp_ex.c + + stm32f4xx_hal_dac.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dac.c + + stm32f4xx_hal_dac_ex.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dac_ex.c + + stm32f4xx_hal_dcmi.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dcmi.c + + stm32f4xx_hal_dcmi_ex.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dcmi_ex.c + + stm32f4xx_hal_dfsdm.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dfsdm.c + + stm32f4xx_hal_dma.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dma.c + + stm32f4xx_hal_dma2d.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dma2d.c + + stm32f4xx_hal_dma_ex.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dma_ex.c + + stm32f4xx_hal_dsi.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dsi.c + + stm32f4xx_hal_eth.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_eth.c + + stm32f4xx_hal_flash.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_flash.c + + stm32f4xx_hal_flash_ex.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_flash_ex.c + + stm32f4xx_hal_flash_ramfunc.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_flash_ramfunc.c + + stm32f4xx_hal_fmpi2c.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_fmpi2c.c + + stm32f4xx_hal_fmpi2c_ex.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_fmpi2c_ex.c + + stm32f4xx_hal_gpio.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_gpio.c + + stm32f4xx_hal_hash.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_hash.c + + stm32f4xx_hal_hash_ex.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_hash_ex.c + + stm32f4xx_hal_hcd.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_hcd.c + + stm32f4xx_hal_i2c.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_i2c.c + + stm32f4xx_hal_i2c_ex.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_i2c_ex.c + + stm32f4xx_hal_i2s.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_i2s.c + + stm32f4xx_hal_i2s_ex.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_i2s_ex.c + + stm32f4xx_hal_irda.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_irda.c + + stm32f4xx_hal_iwdg.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_iwdg.c + + stm32f4xx_hal_lptim.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_lptim.c + + stm32f4xx_hal_ltdc.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_ltdc.c + + stm32f4xx_hal_ltdc_ex.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_ltdc_ex.c + + stm32f4xx_hal_nand.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_nand.c + + stm32f4xx_hal_nor.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_nor.c + + stm32f4xx_hal_pccard.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_pccard.c + + stm32f4xx_hal_pcd.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_pcd.c + + stm32f4xx_hal_pcd_ex.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_pcd_ex.c + + stm32f4xx_hal_pwr.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_pwr.c + + stm32f4xx_hal_pwr_ex.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_pwr_ex.c + + stm32f4xx_hal_qspi.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_qspi.c + + stm32f4xx_hal_rcc.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rcc.c + + stm32f4xx_hal_rcc_ex.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rcc_ex.c + + stm32f4xx_hal_rng.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rng.c + + stm32f4xx_hal_rtc.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rtc.c + + stm32f4xx_hal_rtc_ex.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rtc_ex.c + + stm32f4xx_hal_sai.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_sai.c + + stm32f4xx_hal_sai_ex.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_sai_ex.c + + stm32f4xx_hal_sd.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_sd.c + + stm32f4xx_hal_sdram.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_sdram.c + + stm32f4xx_hal_smartcard.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_smartcard.c + + stm32f4xx_hal_spdifrx.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_spdifrx.c + + stm32f4xx_hal_spi.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_spi.c + + stm32f4xx_hal_sram.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_sram.c + + stm32f4xx_hal_tim.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_tim.c + + stm32f4xx_hal_tim_ex.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_tim_ex.c + + stm32f4xx_hal_uart.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_uart.c + + stm32f4xx_hal_usart.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_usart.c + + stm32f4xx_hal_wwdg.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_wwdg.c + + stm32f4xx_ll_fmc.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_fmc.c + + stm32f4xx_ll_fsmc.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_fsmc.c + + stm32f4xx_ll_sdmmc.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_sdmmc.c + + stm32f4xx_ll_usb.c 1 Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_usb.c + + startup_stm32f429xx.s 2 @@ -807,71 +979,99 @@ 1 ..\..\src\clock.c + + components.c 1 ..\..\src\components.c + + device.c 1 ..\..\src\device.c + + idle.c 1 ..\..\src\idle.c + + ipc.c 1 ..\..\src\ipc.c + + irq.c 1 ..\..\src\irq.c + + kservice.c 1 ..\..\src\kservice.c + + mem.c 1 ..\..\src\mem.c + + memheap.c 1 ..\..\src\memheap.c + + mempool.c 1 ..\..\src\mempool.c + + object.c 1 ..\..\src\object.c + + scheduler.c 1 ..\..\src\scheduler.c + + signal.c 1 ..\..\src\signal.c + + thread.c 1 ..\..\src\thread.c + + timer.c 1 @@ -887,21 +1087,29 @@ 1 ..\..\libcpu\arm\cortex-m4\cpuport.c + + context_rvds.S 2 ..\..\libcpu\arm\cortex-m4\context_rvds.S + + backtrace.c 1 ..\..\libcpu\arm\common\backtrace.c + + div0.c 1 ..\..\libcpu\arm\common\div0.c + + showmem.c 1 @@ -917,62 +1125,98 @@ 1 ..\..\components\dfs\src\dfs.c + + dfs_file.c 1 ..\..\components\dfs\src\dfs_file.c + + dfs_fs.c 1 ..\..\components\dfs\src\dfs_fs.c + + dfs_posix.c 1 ..\..\components\dfs\src\dfs_posix.c + + poll.c 1 ..\..\components\dfs\src\poll.c + + select.c 1 ..\..\components\dfs\src\select.c + + devfs.c 1 ..\..\components\dfs\filesystems\devfs\devfs.c + + dfs_elm.c 1 ..\..\components\dfs\filesystems\elmfat\dfs_elm.c + + ff.c 1 ..\..\components\dfs\filesystems\elmfat\ff.c + + dfs_net.c 1 ..\..\components\dfs\filesystems\net\dfs_net.c + + net_netdb.c 1 ..\..\components\dfs\filesystems\net\net_netdb.c + + net_sockets.c 1 ..\..\components\dfs\filesystems\net\net_sockets.c + + + dfs_romfs.c + 1 + ..\..\components\dfs\filesystems\romfs\dfs_romfs.c + + + + + romfs.c + 1 + ..\..\components\dfs\filesystems\romfs\romfs.c + + DeviceDrivers @@ -982,56 +1226,113 @@ 1 ..\..\components\drivers\i2c\i2c_core.c + + i2c_dev.c 1 ..\..\components\drivers\i2c\i2c_dev.c + + i2c-bit-ops.c 1 ..\..\components\drivers\i2c\i2c-bit-ops.c + + mtd_nand.c 1 ..\..\components\drivers\mtd\mtd_nand.c + + rtc.c 1 ..\..\components\drivers\rtc\rtc.c + + serial.c 1 ..\..\components\drivers\serial\serial.c + + + + spi_core.c + 1 + ..\..\components\drivers\spi\spi_core.c + + + + + spi_dev.c + 1 + ..\..\components\drivers\spi\spi_dev.c + + + + + spi_flash_sfud.c + 1 + ..\..\components\drivers\spi\spi_flash_sfud.c + + + + + sfud.c + 1 + ..\..\components\drivers\spi\sfud\src\sfud.c + + + + + sfud_sfdp.c + 1 + ..\..\components\drivers\spi\sfud\src\sfud_sfdp.c + + + completion.c 1 ..\..\components\drivers\src\completion.c + + dataqueue.c 1 ..\..\components\drivers\src\dataqueue.c + + pipe.c 1 ..\..\components\drivers\src\pipe.c + + ringbuffer.c 1 ..\..\components\drivers\src\ringbuffer.c + + waitqueue.c 1 ..\..\components\drivers\src\waitqueue.c + + workqueue.c 1 @@ -1047,61 +1348,85 @@ 1 ..\..\components\finsh\shell.c + + symbol.c 1 ..\..\components\finsh\symbol.c + + cmd.c 1 ..\..\components\finsh\cmd.c + + finsh_compiler.c 1 ..\..\components\finsh\finsh_compiler.c + + finsh_error.c 1 ..\..\components\finsh\finsh_error.c + + finsh_heap.c 1 ..\..\components\finsh\finsh_heap.c + + finsh_init.c 1 ..\..\components\finsh\finsh_init.c + + finsh_node.c 1 ..\..\components\finsh\finsh_node.c + + finsh_ops.c 1 ..\..\components\finsh\finsh_ops.c + + finsh_parser.c 1 ..\..\components\finsh\finsh_parser.c + + finsh_var.c 1 ..\..\components\finsh\finsh_var.c + + finsh_vm.c 1 ..\..\components\finsh\finsh_vm.c + + finsh_token.c 1 @@ -1117,26 +1442,36 @@ 1 ..\..\components\libc\compilers\armlibc\libc.c + + libc_syms.c 1 ..\..\components\libc\compilers\armlibc\libc_syms.c + + mem_std.c 1 ..\..\components\libc\compilers\armlibc\mem_std.c + + stdio.c 1 ..\..\components\libc\compilers\armlibc\stdio.c + + stubs.c 1 ..\..\components\libc\compilers\armlibc\stubs.c + + time.c 1 @@ -1152,176 +1487,246 @@ 1 ..\..\components\net\lwip-2.0.2\src\arch\sys_arch.c + + api_lib.c 1 ..\..\components\net\lwip-2.0.2\src\api\api_lib.c + + api_msg.c 1 ..\..\components\net\lwip-2.0.2\src\api\api_msg.c + + err.c 1 ..\..\components\net\lwip-2.0.2\src\api\err.c + + netbuf.c 1 ..\..\components\net\lwip-2.0.2\src\api\netbuf.c + + netdb.c 1 ..\..\components\net\lwip-2.0.2\src\api\netdb.c + + netifapi.c 1 ..\..\components\net\lwip-2.0.2\src\api\netifapi.c + + sockets.c 1 ..\..\components\net\lwip-2.0.2\src\api\sockets.c + + tcpip.c 1 ..\..\components\net\lwip-2.0.2\src\api\tcpip.c + + def.c 1 ..\..\components\net\lwip-2.0.2\src\core\def.c + + dns.c 1 ..\..\components\net\lwip-2.0.2\src\core\dns.c + + inet_chksum.c 1 ..\..\components\net\lwip-2.0.2\src\core\inet_chksum.c + + init.c 1 ..\..\components\net\lwip-2.0.2\src\core\init.c + + ip.c 1 ..\..\components\net\lwip-2.0.2\src\core\ip.c + + memp.c 1 ..\..\components\net\lwip-2.0.2\src\core\memp.c + + netif.c 1 ..\..\components\net\lwip-2.0.2\src\core\netif.c + + pbuf.c 1 ..\..\components\net\lwip-2.0.2\src\core\pbuf.c + + raw.c 1 ..\..\components\net\lwip-2.0.2\src\core\raw.c + + stats.c 1 ..\..\components\net\lwip-2.0.2\src\core\stats.c + + sys.c 1 ..\..\components\net\lwip-2.0.2\src\core\sys.c + + tcp.c 1 ..\..\components\net\lwip-2.0.2\src\core\tcp.c + + tcp_in.c 1 ..\..\components\net\lwip-2.0.2\src\core\tcp_in.c + + tcp_out.c 1 ..\..\components\net\lwip-2.0.2\src\core\tcp_out.c + + timeouts.c 1 ..\..\components\net\lwip-2.0.2\src\core\timeouts.c + + udp.c 1 ..\..\components\net\lwip-2.0.2\src\core\udp.c + + ethernet.c 1 ..\..\components\net\lwip-2.0.2\src\netif\ethernet.c + + ethernetif.c 1 ..\..\components\net\lwip-2.0.2\src\netif\ethernetif.c + + lowpan6.c 1 ..\..\components\net\lwip-2.0.2\src\netif\lowpan6.c + + autoip.c 1 ..\..\components\net\lwip-2.0.2\src\core\ipv4\autoip.c + + dhcp.c 1 ..\..\components\net\lwip-2.0.2\src\core\ipv4\dhcp.c + + etharp.c 1 ..\..\components\net\lwip-2.0.2\src\core\ipv4\etharp.c + + icmp.c 1 ..\..\components\net\lwip-2.0.2\src\core\ipv4\icmp.c + + igmp.c 1 ..\..\components\net\lwip-2.0.2\src\core\ipv4\igmp.c + + ip4.c 1 ..\..\components\net\lwip-2.0.2\src\core\ipv4\ip4.c + + ip4_addr.c 1 ..\..\components\net\lwip-2.0.2\src\core\ipv4\ip4_addr.c + + ip4_frag.c 1 @@ -1332,5 +1737,9 @@ - + + + + + diff --git a/bsp/stm32f429-apollo/rtconfig.h b/bsp/stm32f429-apollo/rtconfig.h index 9a94a8d13..1fdf504e1 100644 --- a/bsp/stm32f429-apollo/rtconfig.h +++ b/bsp/stm32f429-apollo/rtconfig.h @@ -10,6 +10,9 @@ #define RT_NAME_MAX 8 #define RT_ALIGN_SIZE 4 +/* RT_THREAD_PRIORITY_8 is not set */ +#define RT_THREAD_PRIORITY_32 +/* RT_THREAD_PRIORITY_256 is not set */ #define RT_THREAD_PRIORITY_MAX 32 #define RT_TICK_PER_SECOND 1000 #define RT_DEBUG @@ -33,9 +36,11 @@ #define RT_USING_MEMPOOL #define RT_USING_MEMHEAP -#define RT_USING_HEAP +/* RT_USING_NOHEAP is not set */ #define RT_USING_SMALL_MEM /* RT_USING_SLAB is not set */ +/* RT_USING_MEMHEAP_AS_HEAP is not set */ +#define RT_USING_HEAP /* Kernel Device Object */ @@ -74,7 +79,8 @@ #define RT_USING_DFS #define DFS_USING_WORKDIR -#define DFS_FILESYSTEMS_MAX 2 +#define DFS_FILESYSTEMS_MAX 4 +#define DFS_FILESYSTEM_TYPES_MAX 4 #define DFS_FD_MAX 4 #define RT_USING_DFS_ELMFAT @@ -89,14 +95,14 @@ #define RT_DFS_ELM_USE_LFN 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_MAX_SECTOR_SIZE 4096 /* RT_DFS_ELM_USE_ERASE is not set */ #define RT_DFS_ELM_REENTRANT #define RT_USING_DFS_DEVFS #define RT_USING_DFS_NET #define HAVE_SYS_SELECT_H /* HAVE_SYS_SOCKET_H is not set */ -/* RT_USING_DFS_ROMFS is not set */ +#define RT_USING_DFS_ROMFS /* RT_USING_DFS_RAMFS is not set */ /* RT_USING_DFS_UFFS is not set */ /* RT_USING_DFS_NFS is not set */ @@ -115,8 +121,20 @@ /* RT_MTD_NAND_DEBUG is not set */ #define RT_USING_RTC /* RT_USING_SDIO is not set */ -/* RT_USING_SPI is not set */ +#define RT_USING_SPI +#define RT_USING_SFUD +#define RT_SFUD_USING_SFDP +/* RT_SFUD_USING_FLASH_INFO_TABLE is not set */ +/* RT_SFUD_DEBUG is not set */ +/* RT_USING_W25QXX is not set */ +/* RT_USING_GD is not set */ +/* RT_USING_ENC28J60 is not set */ +/* RT_USING_SPI_WIFI is not set */ /* RT_USING_WDT is not set */ +/* RT_USING_WIFI is not set */ + +/* Using USB */ + /* RT_USING_USB_HOST is not set */ /* RT_USING_USB_DEVICE is not set */ @@ -194,6 +212,7 @@ /* PKG_USING_PARTITION is not set */ /* PKG_USING_SQLITE is not set */ +/* PKG_USING_RTI is not set */ /* IoT - internet of things */ @@ -203,23 +222,20 @@ /* PKG_USING_WEBTERMINAL is not set */ /* PKG_USING_CJSON is not set */ /* PKG_USING_EZXML is not set */ - -/* Marvell WiFi */ - -/* PKG_USING_MARVELLWIFI is not set */ +/* PKG_USING_NANOPB is not set */ /* security packages */ /* PKG_USING_MBEDTLS is not set */ +/* PKG_USING_libsodium is not set */ /* language packages */ /* PKG_USING_JERRYSCRIPT is not set */ +/* PKG_USING_MICROPYTHON is not set */ /* multimedia packages */ -/* PKG_USING_FASTLZ is not set */ - /* tools packages */ /* PKG_USING_CMBACKTRACE is not set */ @@ -228,6 +244,11 @@ /* miscellaneous packages */ +/* PKG_USING_FASTLZ is not set */ +/* PKG_USING_MINILZO is not set */ + +/* example package: hello */ + /* PKG_USING_HELLO is not set */ #define RT_USING_EXT_SDRAM #define RT_USING_UART1 diff --git a/bsp/stm32f429-apollo/template.uvproj b/bsp/stm32f429-apollo/template.uvproj index f67932c2c..51ea6f1c0 100644 --- a/bsp/stm32f429-apollo/template.uvproj +++ b/bsp/stm32f429-apollo/template.uvproj @@ -356,7 +356,7 @@ 0 0 0 - 0 + 1 0