From owner-svn-src-all@FreeBSD.ORG  Sat Apr 26 17:51:42 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 0B51BBB8;
 Sat, 26 Apr 2014 17:51:42 +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 EBA1512EB;
 Sat, 26 Apr 2014 17:51:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3QHpfjR059246;
 Sat, 26 Apr 2014 17:51:41 GMT
 (envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3QHpfXF059049;
 Sat, 26 Apr 2014 17:51:41 GMT
 (envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201404261751.s3QHpfXF059049@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sat, 26 Apr 2014 17:51:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r264980 - 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-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Apr 2014 17:51:42 -0000

Author: nwhitehorn
Date: Sat Apr 26 17:51:41 2014
New Revision: 264980
URL: http://svnweb.freebsd.org/changeset/base/264980

Log:
  Apparently this is supposed to be FAT32, not FAT12.

Modified:
  head/sys/boot/amd64/boot1.efi/Makefile.fat
  head/sys/boot/amd64/boot1.efi/fat.tmpl.bz2.uu
  head/sys/boot/amd64/boot1.efi/generate-fat.sh

Modified: head/sys/boot/amd64/boot1.efi/Makefile.fat
==============================================================================
--- head/sys/boot/amd64/boot1.efi/Makefile.fat	Sat Apr 26 16:58:35 2014	(r264979)
+++ head/sys/boot/amd64/boot1.efi/Makefile.fat	Sat Apr 26 17:51:41 2014	(r264980)
@@ -1,3 +1,3 @@
 # This file autogenerated by generate-fat.sh - DO NOT EDIT
 # $FreeBSD$
-BOOT1_OFFSET=0x2d
+BOOT1_OFFSET=0x3b

Modified: head/sys/boot/amd64/boot1.efi/fat.tmpl.bz2.uu
==============================================================================
--- head/sys/boot/amd64/boot1.efi/fat.tmpl.bz2.uu	Sat Apr 26 16:58:35 2014	(r264979)
+++ head/sys/boot/amd64/boot1.efi/fat.tmpl.bz2.uu	Sat Apr 26 17:51:41 2014	(r264980)
@@ -2,21 +2,24 @@ FAT template boot filesystem created by 
 DO NOT EDIT
 $FreeBSD$
 begin 644 fat.tmpl.bz2
-M0EIH.3%!62936?1V`!$`&J7____[ZZKJJ_^N_ZO^Z_^[ON_\`4`00!0$#$$"
-M0D)$6&(<P`(Y=SNY1(2DHTC":::-`!H`&@-````#)IH#3(&@:`!IIDT--,@E
-M53TFCWZJGJ`-!D`-`#(::```:```&@:!D`!D``&*B3:C]4T]0#0`:``-`T``
-M``````````&@)131/4T-*>IZC3RGZH\B&$,U&AH#)B:,$8TAF@@]0T>IZF&A
-M&GZID,1IZFAMO%FPGL0"(QIZV"3_!`$@N(@`DD$?C&$["`)`!)$6@#\HOB42
-M0`"2(X0FGX1#L"`'7E,'#-'HM!'QUD0\R,?9U,6ZE8F,Y6*L<9S<6PH)"%_"
-MX'_PL4A),QB"(`B(=14*-"8,(QCG.(2$A(1J'010CB&R$(0B00FPP(0A"$)E
-M#`A"$(1]LB&!"$(0B4&1#`A"$(14W<9J.:&A@8&!@8'`Z$(D(02@^L=UL>:+
-MBG:Q5+4&'[/P4@D2?M<,E!0&YBF8+],4^%$`4<YVD4=K")O.IZ\#)``!CU-1
-M``!L%C7V^RL80`#K(AUU+"D])9/B4@>*%$N9MF:Z29-_VG2G7<$LJ-44RST&
-MB53YE@H%(G5G$.FU;=L[DQVA]"(V4B1+%BP%.A<-10-%#R#NKR='@\'#"_'U
-M'I36ZT:8QIN*3E$:HZIZRJ?$Y1L&<1'C)G(=8,E.L(KU<9X=%/NX.6\=@^IW
-M\-PC$B&I"T\!(VI3"K!X:\%.01Y#X/83[SH.J*H5BH:ILFV1'X/D/V1$W6'\
-MFY>YE:*(I!.X@'D>H_(PY'(W1+B;:,Y?H8Y%(Q')!>DDE;\J1-DRXJJ/O(1@
-M'X/24=!+/V8S1)B(R:UE"0&&1:PUS(1`!$04``++GZ/8(CE5P1P8?^7QB[DB
-(G"A(>CL`"(``
+M0EIH.3%!629362<X?*4`'$M________________________^`T`8`!0$#%$"
+M0$($26(<P`+]@@``08$T::&FFF)B:&FFA@(P",(#)@)IHP$`8`$R,`FF0#(`
+M8AID!55*,3)B/29#)H9,U,F1HT#308&B#3",$&0:--I`PC3)H`R::,"9-`R9
+M&$&!-&FAIIIB8FAIIH8",`C"`R8"::,!`&`!,C`)ID`R`&(:9`5))$Q*>0F1
+MIH#31H--/48U#0--&":#0`80&@TT,@`-&FF"&F@'J::&U/34NO5O]KH&,P3D
+M9TC0KV+%M5^)$Y=$D2(S=*LB`@R"#`))MDFE$%&-NDVQ;AN6'M4LC-TEV[;Q
+MO4PF6^32;0F_3B=<!/)]P7"4#AN(H7%<9QW(<E1.4HW+<QS7.0J12J93JA4H
+M:J5;GN@Z+I(:L=-6*U7*]8.HZJQ62S2ZT6KK.N[#LK9;NT[;N.ZN'>=]<O`N
+MD1=O"\3QO(\J\7J]7R_>9YV`]#!83TL-$>IZWL>U[G#?8XC[6LXKC..Y"]R7
+MW+2`DCI_O6(CB*@F:HXU$D_U22''VTEI>J0$D<5XJTGX,_@%TB=+22<.G#2]
+M8%U/0HF\H&"DJE]1'D[:R*HAO::Y1KJ51.W[.PJD;.AF*B305`)(Y*D=,J3E
+M*C32FALJLNY<P*93W5YF*=$IQU.`L6-.HP.$[I<9C"M*JD4QN57Y6Z'FK\?B
+MH64E.:LD:EHV\H=:H/3=1>U!J@"Z_P%2`,'![YLW>M2IC2`:`CEJ&T49+FZ_
+M1LE?,Y33\]9\*FD5,=K=4NCB[FR1Y"F3ZC%OGB-9C3?UV/,;:Y_5*B>JJ2SV
+M'4VCKU)D*&.INFX6:M1L6Q:1<O*,QA]=<P,BTPWK[0W7FOQU632YRP7U&%AQ
+M*N5LEBY4NTSK%.Y7B;M1VC`LZJF)3*7+&)HFR:3&E],AB;Y_R\R&X9+6N$OS
+MG.@F!CKTC7,*\N.>HC>J9JLU)CN\93G:R2HF-)RY."9[:-NSFY;)AW3_&>YC
+MGE^<EGLW+WC-:)@V^HRU+@$D4`>RL\!$JAO6TM%S=C+LRM7_XNY(IPH2!.</
+"E*``
 `
 end

Modified: head/sys/boot/amd64/boot1.efi/generate-fat.sh
==============================================================================
--- head/sys/boot/amd64/boot1.efi/generate-fat.sh	Sat Apr 26 16:58:35 2014	(r264979)
+++ head/sys/boot/amd64/boot1.efi/generate-fat.sh	Sat Apr 26 17:51:41 2014	(r264980)
@@ -20,7 +20,7 @@ OUTPUT_FILE=fat.tmpl
 
 dd if=/dev/zero of=$OUTPUT_FILE bs=512 count=$FAT_SIZE
 DEVICE=`mdconfig -a -f $OUTPUT_FILE`
-newfs_msdos -F 12 $DEVICE
+newfs_msdos -F 32 $DEVICE
 mkdir stub
 mount -t msdosfs /dev/$DEVICE stub