Skip to content
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.

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

hw/usb/tinyusb: Fix msc fat view with coredump on mcuboot #3122

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion hw/usb/tinyusb/msc_fat_view/pkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,5 @@ pkg.deps:
pkg.init.!BOOT_LOADER:
msc_fat_view_pkg_init: $before:tinyusb_start

pkg.init.MSC_FAT_VIEW_COREDUMP_FILES:
pkg.init.'!BOOT_LOADER && MSC_FAT_VIEW_COREDUMP_FILES':
msc_fat_view_coredump_pkg_init: $before:msc_fat_view_pkg_init
4 changes: 4 additions & 0 deletions hw/usb/tinyusb/msc_fat_view/src/msc_fat_view.c
Original file line number Diff line number Diff line change
Expand Up @@ -1807,6 +1807,10 @@ boot_preboot(void)
os_cputime_delay_usecs(30);
if (hal_gpio_read(MYNEWT_VAL(MSC_FAT_BOOT_PIN)) == MYNEWT_VAL(MSC_FAT_BOOT_PIN_VALUE)) {
hal_gpio_deinit(MYNEWT_VAL(MSC_FAT_BOOT_PIN));
#if MYNEWT_VAL(MSC_FAT_VIEW_COREDUMP_FILES)
extern void msc_fat_view_coredump_pkg_init(void);
msc_fat_view_coredump_pkg_init();
#endif
msc_fat_view_pkg_init();
tinyusb_start();
}
Expand Down