(mynewt-core) branch master updated: hw/usb/tinyusb: Fix msc fat view with coredump on mcuboot

[andk]

This is an automated email from the ASF dual-hosted git repository.

andk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git


The following commit(s) were added to refs/heads/master by this push:
     new ac9aff0ff hw/usb/tinyusb: Fix msc fat view with coredump on mcuboot
ac9aff0ff is described below

commit ac9aff0ff397d53e6a548e192fda9ba7fb8fc558
Author: Andrzej Kaczmarek <andrzej.kaczma...@codecoup.pl>
AuthorDate: Tue Dec 19 09:56:43 2023 +0100

    hw/usb/tinyusb: Fix msc fat view with coredump on mcuboot
---
 hw/usb/tinyusb/msc_fat_view/pkg.yml            | 2 +-
 hw/usb/tinyusb/msc_fat_view/src/msc_fat_view.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/hw/usb/tinyusb/msc_fat_view/pkg.yml 
b/hw/usb/tinyusb/msc_fat_view/pkg.yml
index 4125ccf03..fbb45f0d3 100644
--- a/hw/usb/tinyusb/msc_fat_view/pkg.yml
+++ b/hw/usb/tinyusb/msc_fat_view/pkg.yml
@@ -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
diff --git a/hw/usb/tinyusb/msc_fat_view/src/msc_fat_view.c 
b/hw/usb/tinyusb/msc_fat_view/src/msc_fat_view.c
index 6a08b7d5e..7902701f7 100644
--- a/hw/usb/tinyusb/msc_fat_view/src/msc_fat_view.c
+++ b/hw/usb/tinyusb/msc_fat_view/src/msc_fat_view.c
@@ -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();
     }