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
 

docs/Targets.md

@@ -2061,10 +2061,10 @@ cp ${PREBUILT_DIR}/bl31.elf .
 cp ${PREBUILT_DIR}/system-default.dtb .
 
 source ${VITIS_PATH}/settings64.sh
-bootgen -arch versal -image ./tools/scripts/vmk180/boot_wolfboot.bif -w -o BOOT.BIN
+bootgen -arch versal -image ./tools/scripts/versal_boot.bif -w -o BOOT.BIN
 ```
 
-The BIF file (`boot_wolfboot.bif`) references files using relative paths in the same directory.
+The BIF file (`versal_boot.bif`) references files using relative paths in the same directory.
 
 **Flash QSPI**
 

hal/versal.c

@@ -1539,8 +1539,11 @@ int ext_flash_erase(uintptr_t address, int len)
 #if defined(DISK_SDCARD) || defined(DISK_EMMC)
 #include "sdhci.h"
 
-/* Use SD1 for external SD card slot on VMK180 */
-#define VERSAL_SDHCI_BASE  VERSAL_SD1_BASE  /* 0xF1050000 */
+/* SD controller base address selection:
+ *   SD0 (VERSAL_SD0_BASE = 0xF1040000) - internal, typically eMMC
+ *   SD1 (VERSAL_SD1_BASE = 0xF1050000) - external SD card slot on VMK180
+ * Note: VMK180 board does not have eMMC hardware, only SD1 is used. */
+#define VERSAL_SDHCI_BASE  VERSAL_SD1_BASE
 
 /* ============================================================================
  * Register Translation: Cadence SD4HC -> Standard SDHCI (Arasan)

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/sdhci.c

@@ -1183,10 +1183,10 @@ static int sdhci_transfer(int dir, uint32_t cmd_index, uint32_t block_addr,
             /* SDMA mode with Host Version 4 enable.
              * HV4E is required for SDMA to use the 64-bit address registers
              * (SRS22/SRS23) instead of the legacy 32-bit register (SRS00).
-             * A64S is cleared to use 32-bit DMA addressing. */
+             * A64 is cleared in SRS15 to use 32-bit DMA addressing. */
             sdhci_reg_or(SDHCI_SRS10, SDHCI_SRS10_DMA_SDMA);
             sdhci_reg_or(SDHCI_SRS15, SDHCI_SRS15_HV4E);
-            sdhci_reg_and(SDHCI_SRS16, ~SDHCI_SRS16_A64S);
+            sdhci_reg_and(SDHCI_SRS15, ~SDHCI_SRS15_A64);
             /* Set SDMA address */
             SDHCI_REG_SET(SDHCI_SRS22, (uint32_t)(uintptr_t)buf);
             SDHCI_REG_SET(SDHCI_SRS23, (uint32_t)(((uint64_t)(uintptr_t)buf) >> 32));

src/update_disk.c

@@ -382,10 +382,13 @@ 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)
+            if (ret <= 0)
                 break;
             load_off += ret;
         } while (load_off < os_image.fw_size);

tools/scripts/versal_test.sh

@@ -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}')
@@ -245,6 +245,10 @@ write_to_partition() {
         return 1
     fi
 
+    local file_size=$(stat -c%s "$file")
+    local part_size=$(sfdisk -d "$img" 2>/dev/null | grep "^${img}${part}" | sed 's/.*size=[[:space:]]*\([0-9]*\).*/\1/')
+    [ -n "$part_size" ] && [ "$file_size" -gt $((part_size * 512)) ] && { log_error "File $file (${file_size}B) exceeds partition $part size ($((part_size * 512))B)"; return 1; }
+
     log_info "Writing $file to partition $part (offset: ${offset_bytes} bytes, sector: ${offset_blocks})"
     dd if="$file" of="$img" bs=512 seek="$offset_blocks" conv=notrunc status=progress 2>/dev/null || {
         log_error "Failed to write $file to partition $part"
@@ -392,7 +396,7 @@ Environment Variables:
   VITIS_PATH          Xilinx Vitis installation path (default: /opt/Xilinx/Vitis/2024.2)
   LINUX_IMAGES_DIR    Path to PetaLinux images directory (for --linux, --linux-sdcard, --linux-uboot)
   SDCARD_IMG          SD card image output path (default: sdcard.img)
-  SDCARD_SIZE_MB      SD card image size in MB (default: 512)
+  SDCARD_SIZE_MB      SD card image size in MB (default: 1024)
 
 Examples:
   $0 --boot-sdcard --skipuart    # Reset to SD boot without UART capture
@@ -551,20 +555,14 @@ case "${1:-}" in
         write_to_partition "$SDCARD_IMG" 2 fitImage_v1_signed.bin || exit 1
         write_to_partition "$SDCARD_IMG" 3 fitImage_v2_signed.bin || exit 1
 
-        # Write rootfs to partition 4 if available
-        ROOTFS_IMG=""
+        # Write rootfs filesystem image to partition 4 if available
         if [ -f "${LINUX_IMAGES_DIR}/rootfs.ext4" ]; then
-            ROOTFS_IMG="${LINUX_IMAGES_DIR}/rootfs.ext4"
-        elif [ -f "${LINUX_IMAGES_DIR}/rootfs.cpio.gz" ]; then
-            ROOTFS_IMG="${LINUX_IMAGES_DIR}/rootfs.cpio.gz"
-        fi
-        if [ -n "$ROOTFS_IMG" ]; then
             log_info "Writing rootfs to partition 4..."
-            write_to_partition "$SDCARD_IMG" 4 "$ROOTFS_IMG" || exit 1
-            log_ok "rootfs written ($(stat -c%s "$ROOTFS_IMG") bytes)"
+            write_to_partition "$SDCARD_IMG" 4 "${LINUX_IMAGES_DIR}/rootfs.ext4" || exit 1
+            log_ok "rootfs written ($(stat -c%s "${LINUX_IMAGES_DIR}/rootfs.ext4") bytes)"
         else
-            log_info "No rootfs found in $LINUX_IMAGES_DIR (looked for rootfs.ext4, rootfs.cpio.gz)"
-            log_info "You can write rootfs to partition 4 manually"
+            log_info "No rootfs.ext4 found in $LINUX_IMAGES_DIR"
+            log_info "You can write a rootfs filesystem image to partition 4 manually"
         fi
 
         log_ok "SD card image created: $SDCARD_IMG"
@@ -591,10 +589,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 +616,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)