Peer review fixes

Author: dgarske

config/examples/versal_vmk180_sdcard.config

@@ -96,7 +96,7 @@ WOLFBOOT_PARTITION_SIZE=0x4000000
 WOLFBOOT_SECTOR_SIZE=0x1000
 
 # ============================================================================
-# UART Configuration - UART1 for APU console (matches VMK180 board)
+# UART Configuration - UART0 for APU console (matches VMK180 board)
 # ============================================================================
 CFLAGS_EXTRA+=-DDEBUG_UART_NUM=0
 

src/disk.c

@@ -47,18 +47,6 @@
  */
 static struct disk_drive Drives[MAX_DISKS] = {0};
 
-/**
- * @brief Opens a disk drive and initializes its partitions.
- *
- * This function opens a disk drive with the specified drive number, reads its
- * MBR (Master Boot Record) to identify GPT partitions, and initializes the
- * disk_drive structure for further operations.
- *
- * @param[in] drv The drive number to open (0 to `MAX_DISKS - 1`).
- *
- * @return The number of partitions found and initialized on success, or -1 if
- * the drive cannot be opened or no valid GPT partition table is found.
- */
 /**
  * @brief Parse MBR partition table entries.
  *
@@ -109,6 +97,18 @@ static int disk_open_mbr(struct disk_drive *drive, const uint8_t *mbr_sector)
     return drive->n_parts;
 }
 
+/**
+ * @brief Opens a disk drive and initializes its partitions.
+ *
+ * This function opens a disk drive with the specified drive number, reads its
+ * MBR (Master Boot Record) to identify GPT partitions, and initializes the
+ * disk_drive structure for further operations.
+ *
+ * @param[in] drv The drive number to open (0 to `MAX_DISKS - 1`).
+ *
+ * @return The number of partitions found and initialized on success, or -1 if
+ * the drive cannot be opened or no valid GPT partition table is found.
+ */
 int disk_open(int drv)
 {
     int r;

src/update_disk.c

@@ -382,8 +382,11 @@ void RAMFUNCTION wolfBoot_start(void)
         BENCHMARK_START();
         load_off = 0;
         do {
+            uint32_t chunk = os_image.fw_size - load_off;
+            if (chunk > DISK_BLOCK_SIZE)
+                chunk = DISK_BLOCK_SIZE;
             ret = disk_part_read(BOOT_DISK, cur_part,
-                IMAGE_HEADER_SIZE + load_off, DISK_BLOCK_SIZE,
+                IMAGE_HEADER_SIZE + load_off, chunk,
                 ((uint8_t *)load_address) + load_off);
             if (ret < 0)
                 break;

tools/scripts/versal_test.sh

@@ -178,7 +178,7 @@ trap cleanup EXIT INT TERM
 
 # SD card image configuration
 SDCARD_IMG="${SDCARD_IMG:-${WOLFBOOT_ROOT}/sdcard.img}"
-SDCARD_SIZE_MB="${SDCARD_SIZE_MB:-1024}"
+SDCARD_SIZE_MB="${SDCARD_SIZE_MB:-512}"
 SDCARD_BOOT_SIZE_MB="${SDCARD_BOOT_SIZE_MB:-128}"
 SDCARD_OFP_SIZE_MB="${SDCARD_OFP_SIZE_MB:-200}"
 
@@ -220,7 +220,7 @@ get_partition_offset() {
     local img="$1" part="$2"
     local sector
     # Parse sfdisk dump for partition start sector
-    sector=$(sfdisk -d "$img" 2>/dev/null | grep "^${img}${part}" | sed 's/.*start=\s*\([0-9]*\).*/\1/')
+    sector=$(sfdisk -d "$img" 2>/dev/null | grep "^${img}${part}" | sed 's/.*start=[[:space:]]*\([0-9]*\).*/\1/')
     if [ -z "$sector" ]; then
         # Fallback: parse fdisk output
         sector=$(fdisk -l "$img" 2>/dev/null | grep "^${img}${part}" | awk '{print $2}')
@@ -591,10 +591,7 @@ case "${1:-}" in
         log_info "  Partition 3 (OFP_B):  Signed Linux FIT image v2 (update)"
         log_info "  Partition 4 (rootfs): Linux root filesystem"
         log_info ""
-        log_info "Provision SD card:"
-        log_info "  sudo ./tools/scripts/versal_sdcard_provision.sh /dev/sdX"
-        log_info ""
-        log_info "Or manually:"
+        log_info "Provision SD card manually:"
         log_info "  sudo dd if=$SDCARD_IMG of=/dev/sdX bs=4M status=progress conv=fsync"
         log_info "  sync"
         log_info "  sudo mkfs.vfat -F 32 -n BOOT /dev/sdX1"
@@ -621,7 +618,7 @@ case "${1:-}" in
         ./tools/keytools/sign $SIGN_OPTIONS test-app/image.bin "$PRIVATE_KEY" 2 || { log_error "Signing v2 failed"; exit 1; }
         log_ok "Signed test applications: image_v1_signed.bin, image_v2_signed.bin"
 
-        # Create SD card image with GPT partitions
+        # Create SD card image with MBR (DOS) partition table
         create_sdcard_image "$SDCARD_IMG" "$SDCARD_SIZE_MB" || exit 1
 
         # Write signed images to partitions (OFP_A=2, OFP_B=3)