Author: jhibbits
Date: Fri Sep 16 22:51:37 2016
New Revision: 305894
URL: https://svnweb.freebsd.org/changeset/base/305894
Log:
Increase the boot1 file size on the HFS boot image.
The boot1.elf is too fat for 30k, it's not 32k on powerpc64, and 34k on
powerpc.
Without this, boot1 will fail with odd behaviors.
MFC after: 1 day
Modified:
head/sys/boot/powerpc/boot1.chrp/Makefile.hfs
head/sys/boot/powerpc/boot1.chrp/generate-hfs.sh
head/sys/boot/powerpc/boot1.chrp/hfs.tmpl.bz2.uu
Modified: head/sys/boot/powerpc/boot1.chrp/Makefile.hfs
==============================================================================
--- head/sys/boot/powerpc/boot1.chrp/Makefile.hfs Fri Sep 16 21:14:11
2016 (r305893)
+++ head/sys/boot/powerpc/boot1.chrp/Makefile.hfs Fri Sep 16 22:51:37
2016 (r305894)
@@ -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: head/sys/boot/powerpc/boot1.chrp/generate-hfs.sh
==============================================================================
--- head/sys/boot/powerpc/boot1.chrp/generate-hfs.sh Fri Sep 16 21:14:11
2016 (r305893)
+++ head/sys/boot/powerpc/boot1.chrp/generate-hfs.sh Fri Sep 16 22:51:37
2016 (r305894)
@@ -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: head/sys/boot/powerpc/boot1.chrp/hfs.tmpl.bz2.uu
==============================================================================
--- head/sys/boot/powerpc/boot1.chrp/hfs.tmpl.bz2.uu Fri Sep 16 21:14:11
2016 (r305893)
+++ head/sys/boot/powerpc/boot1.chrp/hfs.tmpl.bz2.uu Fri Sep 16 22:51:37
2016 (r305894)
@@ -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,><P)B_
-M'31",-UG78$CN,$&,P3:!)"2/J]\T9KP63TV)"&Y8"1B*E$I(H935A3LKL9M
-M74FBH6E17;ETD`2U#;5%_9P+&>HOI'#2,"EJ0PU5)<J26E2$`KSGEA(F9(P%
-M4&+M\K54E21K+%@1UU%`;'(KZQS5)SNB[)4WUZY`"6K8U]=8Z-W*[M[UXWZ.
-M`DAMLBTF-IC8Z77:KA%),$[3LHK,^`EA`+E,(2&TIFEA-;:US^NQ)+<8%WIC
-M59:&JR9^`#&G)[email protected]#ZQ_>.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(E<M\J&(@6BZXC<0K!#!)!H05`5*L!^DNM12_"L`<9!Y.7T
+M<I94[[MT$^$30P-DYBVI.X7R<KY7&H$DA(<S;NW1PB7-47*Q>B8BH`S'1O^N
+M)Y6'!#N:*:<E!+,#/,\;M_FXRP![+P44D6],L'G1X7Q&[JI6WN@&KCIW8:".
+MTP=Y77`%67""`=I/UR500#!=DD+!>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
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
