From owner-svn-src-head@freebsd.org  Sun Jun 17 02:49:43 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 84A451009AA1;
 Sun, 17 Jun 2018 02:49:43 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 354767AF9F;
 Sun, 17 Jun 2018 02:49:43 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1545C7677;
 Sun, 17 Jun 2018 02:49:43 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5H2ngO4074190;
 Sun, 17 Jun 2018 02:49:42 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5H2ngkD074189;
 Sun, 17 Jun 2018 02:49:42 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201806170249.w5H2ngkD074189@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Sun, 17 Jun 2018 02:49:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r335274 - head/tools/boot
X-SVN-Group: head
X-SVN-Commit-Author: imp
X-SVN-Commit-Paths: head/tools/boot
X-SVN-Commit-Revision: 335274
X-SVN-Commit-Repository: base
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.26
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 Jun 2018 02:49:43 -0000

Author: imp
Date: Sun Jun 17 02:49:42 2018
New Revision: 335274
URL: https://svnweb.freebsd.org/changeset/base/335274

Log:
  FreeBSD/amd64 requires 256MiB to boot UEFI, 128MB simply doesn't work.
  128MiB still works for Legacy booting, however. Go ahead and do 256MiB
  for all amd64 boxes, since the number of such boxes < 256MiB is
  vanishingly small.

Modified:
  head/tools/boot/rootgen.sh

Modified: head/tools/boot/rootgen.sh
==============================================================================
--- head/tools/boot/rootgen.sh	Sun Jun 17 01:39:22 2018	(r335273)
+++ head/tools/boot/rootgen.sh	Sun Jun 17 02:49:42 2018	(r335274)
@@ -315,7 +315,7 @@ qemu_amd64_legacy()
     img=$1
     sh=$2
 
-    echo "qemu-system-x86_64 --drive file=${img},format=raw ${qser}" > $sh
+    echo "qemu-system-x86_64 -m 256m --drive file=${img},format=raw ${qser}" > $sh
 }
 
 qemu_amd64_uefi()
@@ -323,7 +323,7 @@ qemu_amd64_uefi()
     img=$1
     sh=$2
 
-    echo "qemu-system-x86_64 -bios ~/bios/OVMF-X64.fd --drive file=${img},format=raw ${qser}" > $sh
+    echo "qemu-system-x86_64 -m 256m -bios ~/bios/OVMF-X64.fd --drive file=${img},format=raw ${qser}" > $sh
 }
 
 qemu_amd64_both()
@@ -331,8 +331,8 @@ qemu_amd64_both()
     img=$1
     sh=$2
 
-    echo "qemu-system-x86_64 --drive file=${img},format=raw ${qser}" > $sh
-    echo "qemu-system-x86_64 -bios ~/bios/OVMF-X64.fd --drive file=${img},format=raw ${qser}" >> $sh
+    echo "qemu-system-x86_64 -m 256m --drive file=${img},format=raw ${qser}" > $sh
+    echo "qemu-system-x86_64 -m 256m -bios ~/bios/OVMF-X64.fd --drive file=${img},format=raw ${qser}" >> $sh
 }
 
 # arm