From owner-svn-src-stable@freebsd.org Sat Sep 17 16:45:58 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 772B4BDE97E; Sat, 17 Sep 2016 16:45:58 +0000 (UTC) (envelope-from jhibbits@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 mx1.freebsd.org (Postfix) with ESMTPS id 41CA0146A; Sat, 17 Sep 2016 16:45:58 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8HGjvbX061435; Sat, 17 Sep 2016 16:45:57 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8HGjvDq061432; Sat, 17 Sep 2016 16:45:57 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201609171645.u8HGjvDq061432@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Sat, 17 Sep 2016 16:45:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r305901 - stable/11/sys/boot/powerpc/boot1.chrp X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Sep 2016 16:45:58 -0000 Author: jhibbits Date: Sat Sep 17 16:45:57 2016 New Revision: 305901 URL: https://svnweb.freebsd.org/changeset/base/305901 Log: MFC r305894: Increase the boot1 file size on the HFS boot image. The boot1.elf is too fat for 30k, it's now 32k on powerpc64, and 34k on powerpc. Without this, boot1 will fail with odd behaviors. Modified: stable/11/sys/boot/powerpc/boot1.chrp/Makefile.hfs stable/11/sys/boot/powerpc/boot1.chrp/generate-hfs.sh stable/11/sys/boot/powerpc/boot1.chrp/hfs.tmpl.bz2.uu Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/boot/powerpc/boot1.chrp/Makefile.hfs ============================================================================== --- stable/11/sys/boot/powerpc/boot1.chrp/Makefile.hfs Sat Sep 17 16:03:33 2016 (r305900) +++ stable/11/sys/boot/powerpc/boot1.chrp/Makefile.hfs Sat Sep 17 16:45:57 2016 (r305901) @@ -1,4 +1,4 @@ # This file autogenerated by generate-hfs.sh - DO NOT EDIT # $FreeBSD$ -BOOTINFO_OFFSET=0x58 +BOOTINFO_OFFSET=0x9c BOOT1_OFFSET=0x1c Modified: stable/11/sys/boot/powerpc/boot1.chrp/generate-hfs.sh ============================================================================== --- stable/11/sys/boot/powerpc/boot1.chrp/generate-hfs.sh Sat Sep 17 16:03:33 2016 (r305900) +++ stable/11/sys/boot/powerpc/boot1.chrp/generate-hfs.sh Sat Sep 17 16:45:57 2016 (r305901) @@ -15,7 +15,7 @@ HFS_SIZE=1600 #Size in 512-byte blocks of the produced image CHRPBOOT_SIZE=2k -BOOT1_SIZE=30k +BOOT1_SIZE=64k # Generate 800K HFS image OUTPUT_FILE=hfs.tmpl Modified: stable/11/sys/boot/powerpc/boot1.chrp/hfs.tmpl.bz2.uu ============================================================================== --- stable/11/sys/boot/powerpc/boot1.chrp/hfs.tmpl.bz2.uu Sat Sep 17 16:03:33 2016 (r305900) +++ stable/11/sys/boot/powerpc/boot1.chrp/hfs.tmpl.bz2.uu Sat Sep 17 16:45:57 2016 (r305901) @@ -2,17 +2,17 @@ HFS template boot filesystem created by DO NOT EDIT $FreeBSD$ begin 644 hfs.tmpl.bz2 -M0EIH.3%!62936?(HJX\``"]_]?___O)20>!4M2$>0#MUW$1$``$!$``"2!`( -M4EG``>G*VV3"22334_2(/*>ID,@``:#U&"-#(!IZ0`)$HIY0>B-#(/4T```& -M@R:`&@``<:,F1A&(!A-!@$T&@9,FC)D,(#!4E-*--31ZAB!DT!ID:#$81HT& -M@9-!Z::C:E=SZCC1((92M^1Q@3&>="[<2FD((A[AT#`[('#?MSV(S,>HOI'#2,"EJ0PU5).T`PX,54O,RTW8-",N1`R>?SL"+?Q51[H]# -MJ1C5"]BDBF1UJ!Y`J$WTC]QAFZ%Q21$J,I&0,0?9?DPU!Z>$9.380JJCO$Q8 -MXZTX)GQCCGNC%G1BIDBHTK#J9N0,M[85QC:.'>]#,GPRAALU*=)2`$ND22<. --VK/^+N2*<*$AY%%7'@`` +M0EIH.3%!629365^MV6L``"]__O___M)20>!0O2$>0#MUW$!$``%%$``@``!` +M!`!R2<`![@H2"2A2-Z)-HC]4`:`-``T:&@&@#0/TTH<`PC":8A@$`R`&$:9, +MF$8"&AP#",)IB&`0#(`81IDR81@(:")0HT*>4,:0TT`:!ZC0/*/4/1&@;4>H +M&@RYG-FL-,\=C91FTSS@99`O+OA;*$ZN3-&UF`W@#SP:;MVF_EN,-]P$ZN2B +M=";7YHA7VT!#<@,B`H*?S#?Q;CUJ8H8+9:E)+4"L7'CL5&D.IO4;H98%^4@[ +M9`*L&1``5*0#A(EB8BH`S'1O^N +M)Y6'!#N:*:JYTEX\:%'"?.G$FCP8TM_0/ND`^IG3[ +M.QUEDP&P>3+Z442Q!:S.A1>00]'X'D%)UX9QZ>$Q?(808QB-4%9BBTL"L(BB +MEJ*'HH820Q$'%G':JF.:>$U4H`0S`:GSZM-C5BNX(2&$B"J*45`"4FEZ__%W +))%.%"07ZW9:P ` end