diff options
| author | Maureen Helm <maureen.helm@nxp.com> | 2021-05-20 20:52:37 -0500 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2021-06-06 20:17:42 +1000 |
| commit | f17c0db5f7bedd6653dc4559b3adb6d5c424a648 (patch) | |
| tree | 4d8acdd39d6e964da19cd987b6973e93fc43ed3f | |
| parent | b15e1ef5a6c40b543e2b0d65252ef1475d03005e (diff) | |
zephyr: Update disk access configuration for Zephyr v2.6.0.
Zephyr's Kconfig symbols and defaults for SDHC/SDMMC disk drivers and
the disk access subsystem were reworked between Zephyr v2.5.0 and
v2.6.0. Update MicroPython accordingly.
Signed-off-by: Maureen Helm <maureen.helm@nxp.com>
| -rw-r--r-- | ports/zephyr/boards/mimxrt1050_evk.conf | 3 | ||||
| -rw-r--r-- | ports/zephyr/main.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/ports/zephyr/boards/mimxrt1050_evk.conf b/ports/zephyr/boards/mimxrt1050_evk.conf index 051ab7e60..c4abf726a 100644 --- a/ports/zephyr/boards/mimxrt1050_evk.conf +++ b/ports/zephyr/boards/mimxrt1050_evk.conf @@ -1,9 +1,8 @@ # Required for zephyr.DiskAccess block devices CONFIG_DISK_ACCESS=y -CONFIG_DISK_ACCESS_SDHC=y CONFIG_USB=y CONFIG_USB_DEVICE_STACK=y CONFIG_USB_DEVICE_PRODUCT="Zephyr MicroPython" CONFIG_USB_MASS_STORAGE=y -CONFIG_MASS_STORAGE_DISK_NAME="SDHC" +CONFIG_MASS_STORAGE_DISK_NAME="SDMMC" diff --git a/ports/zephyr/main.c b/ports/zephyr/main.c index f8ec0a0d2..7172f3782 100644 --- a/ports/zephyr/main.c +++ b/ports/zephyr/main.c @@ -100,8 +100,8 @@ STATIC void vfs_init(void) { 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)) }; + #ifdef CONFIG_DISK_DRIVER_SDMMC + mp_obj_t args[] = { mp_obj_new_str(CONFIG_SDMMC_VOLUME_NAME, strlen(CONFIG_SDMMC_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) && FLASH_AREA_LABEL_EXISTS(storage) |