From 082a550bbaf3ea1f6ab034853e2edc9a5cdedc56 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 27 Apr 2015 18:07:11 +0000
Subject: [PATCH] Do not nest the BSD and MBR partitions, which produces an
 unbootable image.  Use just an MBR scheme instead.

Sponsored by:	The FreeBSD Foundation
---
 release/arm64/make-memstick.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/release/arm64/make-memstick.sh b/release/arm64/make-memstick.sh
index 2507d5a160e..27ebf275cd2 100755
--- a/release/arm64/make-memstick.sh
+++ b/release/arm64/make-memstick.sh
@@ -36,8 +36,6 @@ if [ $? -ne 0 ]; then
 fi
 rm ${1}/etc/fstab
 
-mkimg -s bsd -p freebsd-ufs:=${2}.part -p freebsd-swap::1M -o ${2}.tmp
-mkimg -s mbr -p efi:=${1}/boot/boot1.efifat -p freebsd:=${2}.tmp -o ${2}
-rm ${2}.tmp
+mkimg -s mbr -p efi:=${1}/boot/boot1.efifat -p freebsd:=${2}.part -o ${2}
 rm ${2}.part