Skip to content

[bsp/stm32l496_ali] add the on-chip flash #6061

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Guozhanxin merged 11 commits into from
Jun 13, 2022
Merged

[bsp/stm32l496_ali] add the on-chip flash #6061

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
79ce3cf
[bsp/stm32l496_ali] add the on-chip flash
supperthomas Jun 9, 2022
54706c8
[bsp/stm32l496_ali]add Kconfig
supperthomas Jun 10, 2022
aaba2c0
remove the DFS
supperthomas Jun 10, 2022
e8c6e9f
fix Kconfig
supperthomas Jun 10, 2022
e6830f3
fix the config
supperthomas Jun 10, 2022
b30363c
fix the config
supperthomas Jun 10, 2022
0017b74
fix the define
supperthomas Jun 10, 2022
263ef92
fix log
supperthomas Jun 10, 2022
d27c285
update
mysterywolf Jun 10, 2022
1d20c69
Merge branch 'RT-Thread:master' into stm32_ali
mysterywolf Jun 10, 2022
64690ce
Merge pull request #4 from mysterywolf/stm32_ali
supperthomas Jun 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion bsp/stm32/stm32l496-ali-developer/board/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,16 @@ menu "On-chip Peripheral Drivers"
default n
endif

config BSP_USING_ON_CHIP_FLASH
config BSP_USING_ONCHIP_FLASH
bool "Enable on-chip FLASH"
select RT_USING_FAL
default n

config BSP_USING_ONCHIP_FLASH_FATFS
bool "Enable onchip flash with FatFS"
depends on BSP_USING_ONCHIP_FLASH
select RT_USING_DFS
select RT_USING_DFS_ELMFAT
Comment thread
supperthomas marked this conversation as resolved.
default n

menuconfig BSP_USING_SPI
Expand Down
3 changes: 3 additions & 0 deletions bsp/stm32/stm32l496-ali-developer/board/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ if GetDepend(['BSP_USING_SPI_LCD']):
if GetDepend(['BSP_USING_SDCARD']):
src += Glob('ports/sdcard_port.c')

if GetDepend(['BSP_USING_ONCHIP_FLASH']):
src += Glob('mnt.c')

path = [cwd]
path += [cwd + '/CubeMX_Config/Inc']
path += [cwd + '/ports']
Expand Down
44 changes: 44 additions & 0 deletions bsp/stm32/stm32l496-ali-developer/board/mnt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
/*
* Copyright (c) 2006-2022, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
* Change Logs:
* Date Author Notes
* 2022-06-08 supperthomas first version
*/

#include <rtthread.h>
#include <rtdevice.h>

@mysterywolf mysterywolf Jun 10, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
#define DBG_TAG "mnt"
#define DBG_LVL DBG_INFO
#include <rtdbg.h>

#include "fal.h"
#include <dfs_fs.h>

#ifdef RT_USING_DFS
#include <dfs_fs.h>

int mnt_init(void)
{
#ifdef BSP_USING_ONCHIP_FLASH
fal_init();
#define FS_PARTITION_NAME "flash"
struct rt_device *mtd_dev;
mtd_dev = fal_blk_device_create(FS_PARTITION_NAME);
if (dfs_mount(FS_PARTITION_NAME, "/", "elm", 0, 0) == 0)
Comment thread
supperthomas marked this conversation as resolved.
{
rt_kprintf("Filesystem initialized!");
Comment thread
supperthomas marked this conversation as resolved.
Outdated
}
else
{
dfs_mkfs("elm", FS_PARTITION_NAME);
if (dfs_mount(FS_PARTITION_NAME, "/", "elm", 0, 0) != 0)
{
rt_kprintf("Failed to initialize filesystem!");
Comment thread
supperthomas marked this conversation as resolved.
Outdated
}
}
#endif
return 0;
}
INIT_ENV_EXPORT(mnt_init);
#endif

4 changes: 2 additions & 2 deletions bsp/stm32/stm32l496-ali-developer/board/ports/fal_cfg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ extern const struct fal_flash_dev stm32_onchip_flash;
/* partition table */
#define FAL_PART_TABLE \
{ \
{FAL_PART_MAGIC_WROD, "app", "onchip_flash", 0, 496 * 1024, 0}, \
{FAL_PART_MAGIC_WROD, "param", "onchip_flash", 496* 1024, 16 * 1024, 0}, \
{FAL_PART_MAGIC_WROD, "app", "onchip_flash", 0, 512 * 1024, 0}, \
{FAL_PART_MAGIC_WROD, "flash", "onchip_flash", 512* 1024, 512 * 1024, 0}, \
}
#endif /* FAL_PART_HAS_TABLE_CFG */
#endif /* _FAL_CFG_H_ */
11 changes: 8 additions & 3 deletions bsp/stm32/stm32l496-st-nucleo/board/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,16 @@ menu "On-chip Peripheral Drivers"
endif
endif

config BSP_USING_ON_CHIP_FLASH
config BSP_USING_ONCHIP_FLASH
bool "Enable on-chip FLASH"
select RT_USING_FAL
default n

config BSP_USING_ONCHIP_FLASH_FATFS
bool "Enable onchip flash with FatFS"
depends on BSP_USING_ONCHIP_FLASH
select RT_USING_DFS
select RT_USING_DFS_ELMFAT
select RT_USING_FAL
bool "Enable on-chip FLASH"
default n

config BSP_USING_USBD
Expand Down