This is an automated email from the ASF dual-hosted git repository.
jerzy 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 a1e27f4b5 tinyusb/msc_fat_view: Add entry for BOOT.BIN
a1e27f4b5 is described below
commit a1e27f4b5014a074af55ba7ce9f0a20e4f2a3125
Author: Jerzy Kasenberg <[email protected]>
AuthorDate: Thu Apr 3 22:34:38 2025 +0200
tinyusb/msc_fat_view: Add entry for BOOT.BIN
This allows to show booloader in fat view.
When enabled by MSC_FAT_VIEW_BOOT_BIN fat
view is populated with BOOT.BIN that can
be easily extracted if needed.
Signed-off-by: Jerzy Kasenberg <[email protected]>
---
hw/usb/tinyusb/msc_fat_view/pkg.yml | 3 +
hw/usb/tinyusb/msc_fat_view/src/entry_boot_bin.c | 71 ++++++++++++++++++++++++
hw/usb/tinyusb/msc_fat_view/syscfg.yml | 4 ++
3 files changed, 78 insertions(+)
diff --git a/hw/usb/tinyusb/msc_fat_view/pkg.yml
b/hw/usb/tinyusb/msc_fat_view/pkg.yml
index 9f914db72..97d72b9e8 100644
--- a/hw/usb/tinyusb/msc_fat_view/pkg.yml
+++ b/hw/usb/tinyusb/msc_fat_view/pkg.yml
@@ -56,6 +56,9 @@ pkg.source_files.MSC_FAT_VIEW_HUGE_FILE:
pkg.source_files.MSC_FAT_VIEW_SLOT0_IMAGE:
- src/entry_slot0.c
+pkg.source_files.MSC_FAT_VIEW_BOOT_BIN:
+ - src/entry_boot_bin.c
+
pkg.source_files.MSC_FAT_VIEW_SLOT0_HEX:
- src/entry_slot0_hex.c
diff --git a/hw/usb/tinyusb/msc_fat_view/src/entry_boot_bin.c
b/hw/usb/tinyusb/msc_fat_view/src/entry_boot_bin.c
new file mode 100644
index 000000000..a6aea53ed
--- /dev/null
+++ b/hw/usb/tinyusb/msc_fat_view/src/entry_boot_bin.c
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#include <stdio.h>
+#include <sysflash/sysflash.h>
+#include <msc_fat_view/msc_fat_view.h>
+
+#define BUF_SIZE 32
+
+static uint32_t
+bootloader_size(const file_entry_t *file)
+{
+ static uint32_t size = 0;
+ const struct flash_area *fa;
+ uint32_t offset;
+ int buf_size = BUF_SIZE;
+ uint8_t buf[BUF_SIZE];
+ (void)file;
+
+ if (size == 0) {
+ if (0 == flash_area_open(FLASH_AREA_BOOTLOADER, &fa)) {
+ offset = FLASH_AREA_BOOTLOADER_SIZE - BUF_SIZE;
+ while (offset > 0 && buf_size > 2) {
+ if (!flash_area_read_is_empty(fa, offset, buf, buf_size)) {
+ buf_size /= 2;
+ offset += buf_size;
+ } else {
+ offset -= buf_size;
+ }
+ }
+ size = offset + buf_size;
+
+ flash_area_close(fa);
+ }
+ }
+
+ return size;
+}
+
+static void
+bootlaoder_read(const struct file_entry *entry, uint32_t file_sector, uint8_t
buffer[512])
+{
+ const struct flash_area *fa;
+ uint32_t addr;
+ (void)entry;
+
+ if (0 == flash_area_open(FLASH_AREA_BOOTLOADER, &fa)) {
+ addr = file_sector * 512;
+ flash_area_read(fa, addr, buffer, 512);
+ flash_area_close(fa);
+ }
+}
+
+ROOT_DIR_ENTRY(boot_bin, "BOOT.BIN", FAT_FILE_ENTRY_ATTRIBUTE_READ_ONLY,
bootloader_size,
+ bootlaoder_read, NULL, NULL, NULL);
diff --git a/hw/usb/tinyusb/msc_fat_view/syscfg.yml
b/hw/usb/tinyusb/msc_fat_view/syscfg.yml
index 1e3b39118..9dd5b51f4 100644
--- a/hw/usb/tinyusb/msc_fat_view/syscfg.yml
+++ b/hw/usb/tinyusb/msc_fat_view/syscfg.yml
@@ -68,6 +68,10 @@ syscfg.defs:
description: >
Show image from slot 0 as a file 'FIRMWARE.IMG'.
value: 0
+ MSC_FAT_VIEW_BOOT_BIN:
+ description: >
+ Show bootloader bin as a file 'BOOT.BIN'.
+ value: 0
MSC_FAT_VIEW_SLOT0_HEX:
description: >
Show content of slot 0 as a text file 'SLOT0.HEX'.
