Tested PetaLinux boot from SDCard

Author: dgarske

config/examples/versal_vmk180_sdcard.config

@@ -77,6 +77,9 @@ CFLAGS_EXTRA+=-DDISK_BLOCK_SIZE=0x80000
 # boundary crossings via SRS22/SRS23 writes (Cadence-specific behavior).
 CFLAGS_EXTRA+=-DSDHCI_SDMA_DISABLED
 
+# Linux rootfs is on partition 4 (default is /dev/mmcblk0p2 for QSPI boot)
+CFLAGS_EXTRA+=-DLINUX_BOOTARGS_ROOT=\"/dev/mmcblk0p4\"
+
 # ============================================================================
 # Boot Memory Layout
 # ============================================================================
@@ -87,7 +90,8 @@ WOLFBOOT_ORIGIN=0x8000000
 WOLFBOOT_LOAD_ADDRESS?=0x10000000
 
 # DTS (Device Tree) load address
-WOLFBOOT_LOAD_DTS_ADDRESS?=0x8A000000
+# Must be in DDR low (0x0-0x7FFFFFFF) - matches QSPI config and FIT ITS load address
+WOLFBOOT_LOAD_DTS_ADDRESS?=0x1000
 
 # ============================================================================
 # Required for test-app (even with WOLFBOOT_NO_PARTITIONS=1)

src/sdhci.c

@@ -116,7 +116,11 @@ void sdhci_irq_handler(void)
 
         /* Clear DMA interrupt status before restarting */
         SDHCI_REG_SET(SDHCI_SRS12, SDHCI_SRS12_DMAINT);
+#ifdef __riscv
+        asm volatile("fence rw, rw" ::: "memory");
+#else
         asm volatile("dsb sy" ::: "memory");
+#endif
 
         /* Write SDMA address to resume transfer.
          * Per SDHCI v4 spec: write high 32 bits first, then low 32 bits.

tools/scripts/versal_test.sh

@@ -375,7 +375,8 @@ Options:
   (none)              Full build, flash, and boot wolfBoot
   --test-app          Full build + flash test app to boot partition
   --test-update       Full build + flash test app v2 to update partition
-  --linux             Build wolfBoot + signed Linux FIT image and boot
+  --linux             Build wolfBoot + signed Linux FIT image and boot (QSPI)
+  --linux-sdcard      Build wolfBoot + signed Linux FIT image for SD card boot
   --linux-uboot       Build BOOT.BIN with U-Boot and flash Linux FIT image
   --sdcard            Build wolfBoot with SD card config and create SD card image
   --boot-sdcard       Test SD card boot mode only (no build/flash)
@@ -389,22 +390,23 @@ Environment Variables:
   BOARD_IP            Board IP address (default: 10.0.4.90)
   TFTP_DIR            TFTP directory path (default: /srv/tftp)
   VITIS_PATH          Xilinx Vitis installation path (default: /opt/Xilinx/Vitis/2024.2)
-  LINUX_IMAGES_DIR    Path to PetaLinux images directory (for --linux and --linux-uboot)
+  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)
 
 Examples:
   $0 --boot-sdcard --skipuart    # Reset to SD boot without UART capture
   $0 --boot-qspi --skipuart      # Reset to QSPI boot without UART capture
   $0 --sdcard                    # Build with SD card config and create SD card image
+  LINUX_IMAGES_DIR=/path/to/images/linux $0 --linux-sdcard  # PetaLinux SD card boot
 EOF
 }
 
 # Check for --skipuart flag or modes that don't need UART before starting UART capture
 SKIP_UART=false
 for arg in "$@"; do
     case "$arg" in
-        --skipuart|--sdcard) SKIP_UART=true ;;
+        --skipuart|--sdcard|--linux-sdcard) SKIP_UART=true ;;
     esac
 done
 
@@ -510,6 +512,94 @@ case "${1:-}" in
         log_ok "Signed FIT size: $(stat -c%s fitImage_v1_signed.bin) bytes"
 
         flash_and_boot "BOOT.BIN:0x0 fitImage_v1_signed.bin:0x800000" 90 "wolfBoot + Linux boot"
+        exit 0
+        ;;
+    --linux-sdcard)
+        log_info "=== Linux SD Card Boot Mode ==="
+        check_linux_images "plm.elf psmfw.elf bl31.elf Image system-default.dtb" "--linux-sdcard"
+        command -v mkimage &>/dev/null || { log_error "mkimage not found - install with: sudo apt install u-boot-tools"; exit 1; }
+
+        log_info "Copying Linux boot files..."
+        for f in plm.elf psmfw.elf bl31.elf Image system-default.dtb; do cp "${LINUX_IMAGES_DIR}/${f}" .; done
+        copy_pdi
+
+        # Build wolfBoot with SD card configuration
+        log_info "Building wolfBoot with SD card config..."
+        cp config/examples/versal_vmk180_sdcard.config .config
+        make clean && make || { log_error "Failed to build wolfBoot"; exit 1; }
+        [ ! -f "wolfboot.elf" ] && { log_error "wolfboot.elf not found"; exit 1; }
+        load_config .config
+
+        # Create FIT image from Linux kernel + DTB
+        log_info "Creating FIT image..."
+        mkimage -f ./hal/versal.its fitImage || { log_error "mkimage failed"; exit 1; }
+        log_ok "FIT image created: fitImage ($(stat -c%s fitImage) bytes)"
+
+        # Sign FIT image
+        log_info "Signing FIT image..."
+        export IMAGE_HEADER_SIZE IMAGE_SIGNATURE_SIZE
+        PRIVATE_KEY="${PRIVATE_KEY:-wolfboot_signing_private_key.der}"
+        ./tools/keytools/sign $SIGN_OPTIONS fitImage "$PRIVATE_KEY" 1 || { log_error "Signing v1 failed"; exit 1; }
+        ./tools/keytools/sign $SIGN_OPTIONS fitImage "$PRIVATE_KEY" 2 || { log_error "Signing v2 failed"; exit 1; }
+        log_ok "Signed FIT images: fitImage_v1_signed.bin, fitImage_v2_signed.bin"
+
+        # Create SD card image with MBR partitions
+        create_sdcard_image "$SDCARD_IMG" "$SDCARD_SIZE_MB" || exit 1
+
+        # Write signed FIT images to partitions (OFP_A=2, OFP_B=3)
+        log_info "Writing signed FIT images to SD card partitions..."
+        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=""
+        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)"
+        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"
+        fi
+
+        log_ok "SD card image created: $SDCARD_IMG"
+
+        # Generate BOOT.BIN
+        log_info ""
+        log_info "Generating BOOT.BIN with wolfBoot..."
+        source "${VITIS_PATH}/settings64.sh" 2>/dev/null || true
+        if command -v bootgen &>/dev/null; then
+            rm -f BOOT.BIN
+            bootgen -arch versal -image ./tools/scripts/versal_boot.bif -w -o BOOT.BIN || log_error "bootgen failed"
+            [ -f BOOT.BIN ] && {
+                log_ok "BOOT.BIN size: $(stat -c%s BOOT.BIN) bytes"
+                cp BOOT.BIN "${TFTP_DIR}/" 2>/dev/null && log_ok "BOOT.BIN copied to TFTP"
+            }
+        else
+            log_error "bootgen not found - source Vitis settings or set VITIS_PATH"
+        fi
+
+        log_info ""
+        log_info "SD Card Partition Layout:"
+        log_info "  Partition 1 (boot):   FAT32 - BOOT.BIN (PLM + PSM + BL31 + wolfBoot)"
+        log_info "  Partition 2 (OFP_A):  Signed Linux FIT image v1 (primary)"
+        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 "  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"
+        log_info "  sudo mount /dev/sdX1 /mnt && sudo cp BOOT.BIN /mnt/ && sudo umount /mnt"
+
         exit 0
         ;;
     --sdcard)