From owner-svn-src-head@FreeBSD.ORG  Mon Mar  2 18:08:40 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 358F92AD;
 Mon,  2 Mar 2015 18:08:40 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 201F1CA2;
 Mon,  2 Mar 2015 18:08:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t22I8d7W095094;
 Mon, 2 Mar 2015 18:08:39 GMT (envelope-from br@FreeBSD.org)
Received: (from br@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t22I8dvX095093;
 Mon, 2 Mar 2015 18:08:39 GMT (envelope-from br@FreeBSD.org)
Message-Id: <201503021808.t22I8dvX095093@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: br set sender to br@FreeBSD.org
 using -f
From: Ruslan Bukin <br@FreeBSD.org>
Date: Mon, 2 Mar 2015 18:08:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r279533 - head/sys/boot/amd64/boot1.efi
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Mar 2015 18:08:40 -0000

Author: br
Date: Mon Mar  2 18:08:39 2015
New Revision: 279533
URL: https://svnweb.freebsd.org/changeset/base/279533

Log:
  o Add more room for EFI boot blocks
  o Specify the filename as argument
  
  Differential Revision:	https://reviews.freebsd.org/D1999
  Reviewed by:	emaste@

Modified:
  head/sys/boot/amd64/boot1.efi/generate-fat.sh

Modified: head/sys/boot/amd64/boot1.efi/generate-fat.sh
==============================================================================
--- head/sys/boot/amd64/boot1.efi/generate-fat.sh	Mon Mar  2 18:04:57 2015	(r279532)
+++ head/sys/boot/amd64/boot1.efi/generate-fat.sh	Mon Mar  2 18:08:39 2015	(r279533)
@@ -13,7 +13,19 @@
 
 FAT_SIZE=1600 			#Size in 512-byte blocks of the produced image
 
-BOOT1_SIZE=64k
+BOOT1_SIZE=128k
+
+#
+# Known filenames
+# amd64: BOOTx64.efi
+# arm64: BOOTaa64.efi
+#
+if [ -z "$1" ]; then
+	echo "Usage: $0 filename"
+	exit 1
+fi
+
+FILENAME=$1
 
 # Generate 800K FAT image
 OUTPUT_FILE=fat.tmpl
@@ -28,7 +40,7 @@ mount -t msdosfs /dev/$DEVICE stub
 mkdir -p stub/efi/boot
 
 # Make a dummy file for boot1
-echo 'Boot1 START' | dd of=stub/efi/boot/BOOTx64.efi cbs=$BOOT1_SIZE count=1 conv=block
+echo 'Boot1 START' | dd of=stub/efi/boot/$FILENAME cbs=$BOOT1_SIZE count=1 conv=block
 
 umount stub
 mdconfig -d -u $DEVICE