djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zephyr: Mount a file system during init.

Browse Source 
Adds support in the zephyr port to mount a file system if a block device
(sdhc disk access or flash area) is available. The mount point is either
"/sd" or "/flash" depending on the type of block device.

Tested with an sdhc disk access block device and fatfs on the
mimxrt1050_evk board.

Tested with a flash area block device and littlefs on the reel_board.
This commit is contained in:
Maureen Helm 2020-02-27 14:11:34 -06:00
parent f552451cba
commit 5feb54afbb
1 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ports/zephyr/main.c
View File

@ -5,6 +5,7 @@
*
* Copyright (c) 2013, 2014 Damien P. George
* Copyright (c) 2016-2017 Linaro Limited
* Copyright (c) 2020 NXP
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@ -33,6 +34,7 @@
#include <net/net_context.h>
#endif
#include "py/mperrno.h"
#include "py/compile.h"
#include "py/runtime.h"
#include "py/repl.h"
@ -45,6 +47,8 @@
#include "extmod/vfs.h"
#endif
#include "modzephyr.h"
#ifdef TEST
#include "lib/upytesthelper/upytesthelper.h"
#include "lib/tinytest/tinytest.c"
@ -81,6 +85,31 @@ void init_zephyr(void) {
#endif
}
#if MICROPY_VFS
STATIC void vfs_init(void) {
mp_obj_t bdev = NULL;
mp_obj_t mount_point;
const char *mount_point_str = NULL;
int ret = 0;
#ifdef CONFIG_DISK_ACCESS_SDHC
mp_obj_t args[] = { mp_obj_new_str(CONFIG_DISK_SDHC_VOLUME_NAME, strlen(CONFIG_DISK_SDHC_VOLUME_NAME)) };
bdev = zephyr_disk_access_type.make_new(&zephyr_disk_access_type, ARRAY_SIZE(args), 0, args);
mount_point_str = "/sd";
#elif defined(CONFIG_FLASH_MAP) && defined(DT_FLASH_AREA_STORAGE_ID)
mp_obj_t args[] = { MP_OBJ_NEW_SMALL_INT(DT_FLASH_AREA_STORAGE_ID), MP_OBJ_NEW_SMALL_INT(4096) };
bdev = zephyr_flash_area_type.make_new(&zephyr_flash_area_type, ARRAY_SIZE(args), 0, args);
mount_point_str = "/flash";
#endif
if ((bdev != NULL)) {
mount_point = mp_obj_new_str(mount_point_str, strlen(mount_point_str));
ret = mp_vfs_mount_and_chdir_protected(bdev, mount_point);
// TODO: if this failed, make a new file system and try to mount again
}
}
#endif // MICROPY_VFS
int real_main(void) {
mp_stack_ctrl_init();
// Make MicroPython's stack limit somewhat smaller than full stack available
@ -104,6 +133,10 @@ soft_reset:
mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_)); // current dir (or base dir of the script)
mp_obj_list_init(mp_sys_argv, 0);
#if MICROPY_VFS
vfs_init();
#endif
#if MICROPY_MODULE_FROZEN
pyexec_frozen_module("main.py");
#endif