head	1.29;
access;
symbols
	RELENG_8_4:1.29.0.2
	RELENG_9_1_0_RELEASE:1.28.2.1.4.2
	RELENG_9_1:1.28.2.1.0.4
	RELENG_9_1_BP:1.28.2.1
	RELENG_8_3_0_RELEASE:1.26.2.3.6.1
	RELENG_8_3:1.26.2.3.0.6
	RELENG_8_3_BP:1.26.2.3
	RELENG_9_0_0_RELEASE:1.28.2.1.2.1
	RELENG_9_0:1.28.2.1.0.2
	RELENG_9_0_BP:1.28.2.1
	RELENG_9:1.28.0.2
	RELENG_9_BP:1.28
	RELENG_7_4_0_RELEASE:1.21.2.12.4.1
	RELENG_8_2_0_RELEASE:1.26.2.3.4.1
	RELENG_7_4:1.21.2.12.0.4
	RELENG_7_4_BP:1.21.2.12
	RELENG_8_2:1.26.2.3.0.4
	RELENG_8_2_BP:1.26.2.3
	RELENG_8_1_0_RELEASE:1.26.2.3.2.1
	RELENG_8_1:1.26.2.3.0.2
	RELENG_8_1_BP:1.26.2.3
	RELENG_7_3_0_RELEASE:1.21.2.12.2.1
	RELENG_7_3:1.21.2.12.0.2
	RELENG_7_3_BP:1.21.2.12
	RELENG_8_0_0_RELEASE:1.26.2.1.2.1
	RELENG_8_0:1.26.2.1.0.2
	RELENG_8_0_BP:1.26.2.1
	RELENG_8:1.26.0.2
	RELENG_8_BP:1.26
	RELENG_7_2_0_RELEASE:1.21.2.1.4.1
	RELENG_7_2:1.21.2.1.0.4
	RELENG_7_2_BP:1.21.2.1
	RELENG_7_1_0_RELEASE:1.21.2.1.2.1
	RELENG_6_4_0_RELEASE:1.20.8.1.2.1
	RELENG_7_1:1.21.2.1.0.2
	RELENG_7_1_BP:1.21.2.1
	RELENG_6_4:1.20.8.1.0.2
	RELENG_6_4_BP:1.20.8.1
	RELENG_7_0_0_RELEASE:1.21
	RELENG_6_3_0_RELEASE:1.20
	RELENG_7_0:1.21.0.4
	RELENG_7_0_BP:1.21
	RELENG_6_3:1.20.0.18
	RELENG_6_3_BP:1.20
	RELENG_7:1.21.0.2
	RELENG_7_BP:1.21
	RELENG_6_2_0_RELEASE:1.20
	RELENG_6_2:1.20.0.16
	RELENG_6_2_BP:1.20
	RELENG_5_5_0_RELEASE:1.20
	RELENG_5_5:1.20.0.14
	RELENG_5_5_BP:1.20
	RELENG_6_1_0_RELEASE:1.20
	RELENG_6_1:1.20.0.12
	RELENG_6_1_BP:1.20
	RELENG_6_0_0_RELEASE:1.20
	RELENG_6_0:1.20.0.10
	RELENG_6_0_BP:1.20
	RELENG_6:1.20.0.8
	RELENG_6_BP:1.20
	RELENG_5_4_0_RELEASE:1.20
	RELENG_5_4:1.20.0.6
	RELENG_5_4_BP:1.20
	RELENG_4_11_0_RELEASE:1.11.2.2
	RELENG_4_11:1.11.2.2.0.14
	RELENG_4_11_BP:1.11.2.2
	RELENG_5_3_0_RELEASE:1.20
	RELENG_5_3:1.20.0.4
	RELENG_5_3_BP:1.20
	RELENG_5:1.20.0.2
	RELENG_5_BP:1.20
	RELENG_4_10_0_RELEASE:1.11.2.2
	RELENG_4_10:1.11.2.2.0.12
	RELENG_4_10_BP:1.11.2.2
	RELENG_5_2_1_RELEASE:1.19
	RELENG_5_2_0_RELEASE:1.19
	RELENG_5_2:1.19.0.4
	RELENG_5_2_BP:1.19
	RELENG_4_9_0_RELEASE:1.11.2.2
	RELENG_4_9:1.11.2.2.0.10
	RELENG_4_9_BP:1.11.2.2
	RELENG_5_1_0_RELEASE:1.19
	RELENG_5_1:1.19.0.2
	RELENG_5_1_BP:1.19
	RELENG_4_8_0_RELEASE:1.11.2.2
	RELENG_4_8:1.11.2.2.0.8
	RELENG_4_8_BP:1.11.2.2
	RELENG_5_0_0_RELEASE:1.18
	RELENG_5_0:1.18.0.2
	RELENG_5_0_BP:1.18
	RELENG_4_7_0_RELEASE:1.11.2.2
	RELENG_4_7:1.11.2.2.0.6
	RELENG_4_7_BP:1.11.2.2
	RELENG_4_6_2_RELEASE:1.11.2.2
	RELENG_4_6_1_RELEASE:1.11.2.2
	RELENG_4_6_0_RELEASE:1.11.2.2
	RELENG_4_6:1.11.2.2.0.4
	RELENG_4_6_BP:1.11.2.2
	RELENG_4_5_0_RELEASE:1.11.2.2
	RELENG_4_5:1.11.2.2.0.2
	RELENG_4_5_BP:1.11.2.2
	RELENG_4_4_0_RELEASE:1.11.2.1
	RELENG_4_4:1.11.2.1.0.4
	RELENG_4_4_BP:1.11.2.1
	KSE_MILESTONE_2:1.13
	KSE_PRE_MILESTONE_2:1.13
	RELENG_4_3_0_RELEASE:1.11.2.1
	RELENG_4_3:1.11.2.1.0.2
	RELENG_4_3_BP:1.11.2.1
	RELENG_4_2_0_RELEASE:1.11.2.1
	RELENG_4_1_1_RELEASE:1.11.2.1
	PRE_SMPNG:1.13
	RELENG_4_1_0_RELEASE:1.11.2.1
	RELENG_3_5_0_RELEASE:1.7.2.2
	RELENG_4_0_0_RELEASE:1.11
	RELENG_4:1.11.0.2
	RELENG_4_BP:1.11
	RELENG_3_4_0_RELEASE:1.7.2.2
	RELENG_3_3_0_RELEASE:1.7.2.2
	RELENG_3_2_PAO:1.7.0.4
	RELENG_3_2_PAO_BP:1.7
	RELENG_3_2_0_RELEASE:1.7
	POST_VFS_BIO_NFS_PATCH:1.7
	PRE_VFS_BIO_NFS_PATCH:1.7
	POST_SMP_VMSHARE:1.7
	PRE_SMP_VMSHARE:1.7
	POST_NEWBUS:1.7
	PRE_NEWBUS:1.7
	RELENG_3_1_0_RELEASE:1.7
	RELENG_3:1.7.0.2
	RELENG_3_BP:1.7
	RELENG_3_0_0_RELEASE:1.7
	initial:1.1.1.1
	MSMITH:1.1.1;
locks; strict;
comment	@# @;


1.29
date	2012.11.17.01.51.16;	author svnexp;	state Exp;
branches
	1.29.2.1;
next	1.28;

1.28
date	2009.12.22.20.56.33;	author jhb;	state Exp;
branches
	1.28.2.1;
next	1.27;

1.27
date	2009.11.23.16.00.16;	author rnoland;	state Exp;
branches;
next	1.26;

1.26
date	2008.11.22.14.24.55;	author dfr;	state Exp;
branches
	1.26.2.1;
next	1.25;

1.25
date	2008.11.21.08.10.07;	author des;	state Exp;
branches;
next	1.24;

1.24
date	2008.11.19.16.39.01;	author dfr;	state Exp;
branches;
next	1.23;

1.23
date	2008.11.17.20.49.29;	author pjd;	state Exp;
branches;
next	1.22;

1.22
date	2007.10.24.21.32.58;	author jhb;	state Exp;
branches;
next	1.21;

1.21
date	2007.05.29.14.35.57;	author simokawa;	state Exp;
branches
	1.21.2.1;
next	1.20;

1.20
date	2003.12.08.19.02.06;	author obrien;	state Exp;
branches
	1.20.8.1;
next	1.19;

1.19
date	2002.12.31.02.29.03;	author obrien;	state Exp;
branches;
next	1.18;

1.18
date	2002.06.21.10.59.57;	author phk;	state Exp;
branches;
next	1.17;

1.17
date	2002.06.21.06.18.01;	author mckusick;	state Exp;
branches;
next	1.16;

1.16
date	2002.05.11.21.41.03;	author peter;	state Exp;
branches;
next	1.15;

1.15
date	2002.05.10.00.52.00;	author obrien;	state Exp;
branches;
next	1.14;

1.14
date	2001.11.04.03.27.06;	author jhb;	state Exp;
branches;
next	1.13;

1.13
date	2000.07.17.17.06.27;	author jlemon;	state Exp;
branches;
next	1.12;

1.12
date	2000.03.28.01.19.44;	author jhb;	state Exp;
branches;
next	1.11;

1.11
date	2000.01.27.21.20.50;	author jhb;	state Exp;
branches
	1.11.2.1;
next	1.10;

1.10
date	99.08.28.00.39.58;	author peter;	state Exp;
branches;
next	1.9;

1.9
date	99.07.19.20.16.34;	author rnordier;	state Exp;
branches;
next	1.8;

1.8
date	99.05.24.22.44.32;	author rnordier;	state Exp;
branches;
next	1.7;

1.7
date	98.10.14.20.40.56;	author rnordier;	state Exp;
branches
	1.7.2.1;
next	1.6;

1.6
date	98.10.12.02.05.44;	author rnordier;	state Exp;
branches;
next	1.5;

1.5
date	98.10.11.12.59.40;	author rnordier;	state Exp;
branches;
next	1.4;

1.4
date	98.10.09.23.30.16;	author rnordier;	state Exp;
branches;
next	1.3;

1.3
date	98.10.06.06.12.55;	author msmith;	state Exp;
branches;
next	1.2;

1.2
date	98.09.17.23.52.03;	author msmith;	state Exp;
branches;
next	1.1;

1.1
date	98.08.21.03.17.41;	author msmith;	state Exp;
branches
	1.1.1.1;
next	;

1.29.2.1
date	2012.11.17.01.51.16;	author svnexp;	state dead;
branches;
next	1.29.2.2;

1.29.2.2
date	2013.03.28.13.04.01;	author svnexp;	state Exp;
branches;
next	;

1.28.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.28.2.1.2.1
	1.28.2.1.4.1;
next	1.28.2.2;

1.28.2.2
date	2012.11.17.11.36.47;	author svnexp;	state Exp;
branches;
next	;

1.28.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.28.2.1.2.2;

1.28.2.1.2.2
date	2012.11.17.08.36.45;	author svnexp;	state Exp;
branches;
next	;

1.28.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.28.2.1.4.2;

1.28.2.1.4.2
date	2012.11.17.08.47.36;	author svnexp;	state Exp;
branches;
next	;

1.26.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.26.2.1.2.1;
next	1.26.2.2;

1.26.2.2
date	2009.12.07.16.37.02;	author rnoland;	state Exp;
branches;
next	1.26.2.3;

1.26.2.3
date	2009.12.30.17.42.41;	author jhb;	state Exp;
branches
	1.26.2.3.2.1
	1.26.2.3.4.1
	1.26.2.3.6.1;
next	1.26.2.4;

1.26.2.4
date	2012.11.17.10.36.27;	author svnexp;	state Exp;
branches;
next	;

1.26.2.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.26.2.3.2.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.26.2.3.4.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.26.2.3.6.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.26.2.3.6.2;

1.26.2.3.6.2
date	2012.11.17.08.25.07;	author svnexp;	state Exp;
branches;
next	;

1.21.2.1
date	2008.01.24.19.42.16;	author jhb;	state Exp;
branches
	1.21.2.1.2.1
	1.21.2.1.4.1;
next	1.21.2.2;

1.21.2.2
date	2009.05.23.19.54.18;	author kmacy;	state Exp;
branches;
next	1.21.2.3;

1.21.2.3
date	2009.05.25.02.59.54;	author kmacy;	state Exp;
branches;
next	1.21.2.4;

1.21.2.4
date	2009.05.25.03.06.26;	author kmacy;	state Exp;
branches;
next	1.21.2.5;

1.21.2.5
date	2009.06.05.12.00.55;	author kmacy;	state Exp;
branches;
next	1.21.2.6;

1.21.2.6
date	2009.06.05.12.14.43;	author kmacy;	state Exp;
branches;
next	1.21.2.7;

1.21.2.7
date	2009.06.10.01.18.07;	author kmacy;	state Exp;
branches;
next	1.21.2.8;

1.21.2.8
date	2009.06.10.01.20.46;	author kmacy;	state Exp;
branches;
next	1.21.2.9;

1.21.2.9
date	2009.06.10.09.06.42;	author kmacy;	state Exp;
branches;
next	1.21.2.10;

1.21.2.10
date	2009.12.07.17.15.36;	author rnoland;	state Exp;
branches;
next	1.21.2.11;

1.21.2.11
date	2009.12.30.17.45.35;	author jhb;	state Exp;
branches;
next	1.21.2.12;

1.21.2.12
date	2009.12.30.22.40.30;	author jhb;	state Exp;
branches
	1.21.2.12.2.1
	1.21.2.12.4.1;
next	1.21.2.13;

1.21.2.13
date	2012.11.17.08.04.52;	author svnexp;	state Exp;
branches;
next	;

1.21.2.1.2.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.21.2.1.4.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.21.2.12.2.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.21.2.12.4.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.21.2.12.4.2;

1.21.2.12.4.2
date	2012.11.17.08.17.05;	author svnexp;	state Exp;
branches;
next	;

1.20.8.1
date	2008.01.24.22.23.21;	author jhb;	state Exp;
branches
	1.20.8.1.2.1;
next	1.20.8.2;

1.20.8.2
date	2012.11.17.07.42.37;	author svnexp;	state Exp;
branches;
next	;

1.20.8.1.2.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;

1.11.2.1
date	2000.04.15.03.09.39;	author ps;	state Exp;
branches;
next	1.11.2.2;

1.11.2.2
date	2001.12.21.21.02.08;	author jhb;	state Exp;
branches;
next	1.11.2.3;

1.11.2.3
date	2012.11.17.07.25.20;	author svnexp;	state Exp;
branches;
next	;

1.7.2.1
date	99.07.28.08.38.57;	author rnordier;	state Exp;
branches;
next	1.7.2.2;

1.7.2.2
date	99.08.29.16.20.40;	author peter;	state Exp;
branches;
next	;

1.1.1.1
date	98.08.21.03.17.41;	author msmith;	state Exp;
branches;
next	;


desc
@@


1.29
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/sys/boot/i386/Makefile 200872 2009-12-22 20:56:33Z jhb $

.include <bsd.own.mk>

SUBDIR=		mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot kgzldr \
		libi386 libfirewire loader

# special boot programs, 'self-extracting boot2+loader'
SUBDIR+=	pxeldr

.if ${MK_ZFS} != "no"
SUBDIR+=	zfsboot gptzfsboot zfsloader
.endif

.include <bsd.subdir.mk>
@


1.29.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:04:01 +0000
@
text
@d1 15
@


1.29.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 15
# $FreeBSD: releng/8.4/sys/boot/i386/Makefile 201265 2009-12-30 17:42:41Z jhb $

.include <bsd.own.mk>

SUBDIR=		mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot kgzldr \
		libi386 libfirewire loader

# special boot programs, 'self-extracting boot2+loader'
SUBDIR+=	pxeldr

.if ${MK_ZFS} != "no"
SUBDIR+=	zfsboot gptzfsboot zfsloader
.endif

.include <bsd.subdir.mk>
@


1.28
log
@SVN rev 200872 on 2009-12-22 20:56:33Z by jhb

Don't build zfsboot, gptzfsboot, and zfsloader if WITHOUT_ZFS is enabled.

MFC after:	1 week
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.28.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.28.2.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/sys/boot/i386/Makefile 200872 2009-12-22 20:56:33Z jhb $
@


1.28.2.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.28.2.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/sys/boot/i386/Makefile 200872 2009-12-22 20:56:33Z jhb $
@


1.28.2.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.28.2.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/sys/boot/i386/Makefile 200872 2009-12-22 20:56:33Z jhb $
@


1.27
log
@SVN rev 199714 on 2009-11-23 16:00:16Z by rnoland

Create a seperate ZFS enabled loader.

This adds zfsloader which will be called by zfsboot/gptzfsboot code rather
than the tradional loader.  This eliminates the need to set the
LOADER_ZFS_SUPPORT variable in order to get a ZFS enabled loader.

Note however, that you must reinstall your bootcode (zfsboot/gptzfsboot)
in order for the boot process to use the new loader.

New installations will no longer be required to build a ZFS enabled
loader for a working ZFS boot system.  Installing zfsboot/gptzfsboot is
sufficient for acknowledging the use of CDDL code and therefore the ZFS
enabled loader.

Based on a previous patch from jhb@@

Reviewed by:	jhb@@
MFC after:	2 weeks
@
text
@d3 4
a6 2
SUBDIR=		mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot zfsboot \
		gptzfsboot kgzldr libi386 libfirewire loader zfsloader
d11 4
@


1.26
log
@SVN rev 185175 on 2008-11-22 14:24:55Z by dfr

Fix amd64 build and re-enable gptzfsboot.
@
text
@d4 1
a4 1
		gptzfsboot kgzldr libi386 libfirewire loader
@


1.26.2.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.26.2.2
log
@SVN rev 200220 on 2009-12-07 16:37:02Z by rnoland

MFC 199714

Create a seperate ZFS enabled loader.

This adds zfsloader which will be called by zfsboot/gptzfsboot code rather
than the tradional loader.  This eliminates the need to set the
LOADER_ZFS_SUPPORT variable in order to get a ZFS enabled loader.

Note however, that you must reinstall your bootcode (zfsboot/gptzfsboot)
in order for the boot process to use the new loader.

New installations will no longer be required to build a ZFS enabled
loader for a working ZFS boot system.  Installing zfsboot/gptzfsboot is
sufficient for acknowledging the use of CDDL code and therefore the ZFS
enabled loader.
@
text
@d4 1
a4 1
		gptzfsboot kgzldr libi386 libfirewire loader zfsloader
@


1.26.2.3
log
@SVN rev 201265 on 2009-12-30 17:42:41Z by jhb

MFC 200872:
Don't build zfsboot, gptzfsboot, and zfsloader if WITHOUT_ZFS is enabled.
@
text
@d3 2
a4 4
.include <bsd.own.mk>

SUBDIR=		mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot kgzldr \
		libi386 libfirewire loader
a8 4
.if ${MK_ZFS} != "no"
SUBDIR+=	zfsboot gptzfsboot zfsloader
.endif

@


1.26.2.4
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/8/sys/boot/i386/Makefile 201265 2009-12-30 17:42:41Z jhb $
@


1.26.2.3.6.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.26.2.3.6.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/sys/boot/i386/Makefile 201265 2009-12-30 17:42:41Z jhb $
@


1.26.2.3.4.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.26.2.3.2.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.26.2.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.25
log
@SVN rev 185151 on 2008-11-21 08:10:07Z by des

Disconnect gptzfsboot from the build until dfr@@ gets his act together.
@
text
@d4 1
a4 1
		kgzldr libi386 libfirewire loader
@


1.24
log
@SVN rev 185096 on 2008-11-19 16:39:01Z by dfr

Add a GPT-aware variant of zfsboot which should be used in a similar manner
to gptboot, i.e. installed in a freebsd-boot partition using /sbin/gpart or
/sbin/gpt.

Tweak the /boot/loader ZFS support so that it can find ZFS pools that are
contained in GPT partitions.
@
text
@d4 1
a4 1
		gptzfsboot kgzldr libi386 libfirewire loader
@


1.23
log
@SVN rev 185029 on 2008-11-17 20:49:29Z by pjd

Update ZFS from version 6 to 13 and bring some FreeBSD-specific changes.

This bring huge amount of changes, I'll enumerate only user-visible changes:

- Delegated Administration

	Allows regular users to perform ZFS operations, like file system
	creation, snapshot creation, etc.

- L2ARC

	Level 2 cache for ZFS - allows to use additional disks for cache.
	Huge performance improvements mostly for random read of mostly
	static content.

- slog

	Allow to use additional disks for ZFS Intent Log to speed up
	operations like fsync(2).

- vfs.zfs.super_owner

	Allows regular users to perform privileged operations on files stored
	on ZFS file systems owned by him. Very careful with this one.

- chflags(2)

	Not all the flags are supported. This still needs work.

- ZFSBoot

	Support to boot off of ZFS pool. Not finished, AFAIK.

	Submitted by:	dfr

- Snapshot properties

- New failure modes

	Before if write requested failed, system paniced. Now one
	can select from one of three failure modes:
	- panic - panic on write error
	- wait - wait for disk to reappear
	- continue - serve read requests if possible, block write requests

- Refquota, refreservation properties

	Just quota and reservation properties, but don't count space consumed
	by children file systems, clones and snapshots.

- Sparse volumes

	ZVOLs that don't reserve space in the pool.

- External attributes

	Compatible with extattr(2).

- NFSv4-ACLs

	Not sure about the status, might not be complete yet.

	Submitted by:	trasz

- Creation-time properties

- Regression tests for zpool(8) command.

Obtained from:	OpenSolaris
@
text
@d4 1
a4 1
		kgzldr libi386 libfirewire loader
@


1.22
log
@First cut at support for booting a GPT labeled disk via the BIOS bootstrap
on i386 and amd64 machines.  The overall process is that /boot/pmbr lives
in the PMBR (similar to /boot/mbr for MBR disks) and is responsible for
locating and loading /boot/gptboot.  /boot/gptboot is similar to /boot/boot
except that it groks GPT rather than MBR + bsdlabel.  Unlike /boot/boot,
/boot/gptboot lives in its own dedicated GPT partition with a new
"FreeBSD boot" type.  This partition does not have a fixed size in that
/boot/pmbr will load the entire partition into the lower 640k.  However,
it is limited in that it can only be 545k.  That's still a lot better than
the current 7.5k limit for boot2 on MBR.  gptboot mostly acts just like
boot2 in that it reads /boot.config and loads up /boot/loader.  Some more
details:
- Include uuid_equal() and uuid_is_nil() in libstand.
- Add a new 'boot' command to gpt(8) which makes a GPT disk bootable using
  /boot/pmbr and /boot/gptboot.  Note that the disk must have some free
  space for the boot partition.
  - This required exposing the backend of the 'add' function as a
    gpt_add_part() function to the rest of gpt(8).  'boot' uses this to
    create a boot partition if needed.
- Don't cripple cgbase() in the UFS boot code for /boot/gptboot so that
  it can handle a filesystem > 1.5 TB.
- /boot/gptboot has a simple loader (gptldr) that doesn't do any I/O
  unlike boot1 since /boot/pmbr loads all of gptboot up front.  The
  C portion of gptboot (gptboot.c) has been repocopied from boot2.c.
  The primary changes are to parse the GPT to find a root filesystem
  and to use 64-bit disk addresses.  Currently gptboot assumes that the
  first UFS partition on the disk is the / filesystem, but this algorithm
  will likely be improved in the future.
- Teach the biosdisk driver in /boot/loader to understand GPT tables.
  GPT partitions are identified as 'disk0pX:' (e.g. disk0p2:) which is
  similar to the /dev names the kernel uses (e.g. /dev/ad0p2).
- Add a new "freebsd-boot" alias to g_part() for the new boot UUID.

MFC after:	1 month
Discussed with:	marcel (some things might still change, but am committing
			what I have so far)
@
text
@d3 2
a4 2
SUBDIR=		mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot kgzldr \
		libi386 libfirewire loader
@


1.21
log
@MFp4: add FireWire/dcons support in loader for i386/amd64.

It is disabled by default. You need to put
LOADER_FIREWIRE_SUPPORT=yes in /etc/make.conf
and rebuild loader to enable it.
(cd /sys/boot/i386 && make clean && make && make install)

You can find a short introduction of dcons at
http://wiki.freebsd.org/DebugWithDcons
@
text
@d3 2
a4 2
SUBDIR=		mbr boot0 boot0sio btx boot2 cdboot kgzldr libi386 libfirewire \
		loader
@


1.21.2.1
log
@MFC: Add support for booting from GPT-labeled disks from the BIOS.  This
includes /boot/pmbr, /boot/gptboot, and 'gpt boot'.
@
text
@d3 2
a4 2
SUBDIR=		mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot kgzldr \
		libi386 libfirewire loader
@


1.21.2.2
log
@SVN rev 192665 on 2009-05-23 19:54:18Z by kmacy

Import ZFS loader support missed in the initial MFC
set LOADER_ZFS_SUPPORT=Y in make.conf to enable
@
text
@d3 2
a4 2
SUBDIR=		mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot zfsboot \
		kgzldr libi386 libfirewire loader
@


1.21.2.3
log
@SVN rev 192714 on 2009-05-25 02:59:54Z by kmacy

import gptzfsboot
@
text
@d4 1
a4 1
		gptzfsboot kgzldr libi386 libfirewire loader
@


1.21.2.4
log
@SVN rev 192715 on 2009-05-25 03:06:26Z by kmacy

don't try building zfsboot and gptzfsboot if zfs loader is not enabled
@
text
@d3 2
a4 6
SUBDIR=		mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot \
		kgzldr libi386 libfirewire loader

.if defined(LOADER_ZFS_SUPPORT)
SUBDIR+=		zfsboot gptzfsboot
.endif
@


1.21.2.5
log
@SVN rev 193494 on 2009-06-05 12:00:55Z by kmacy

roll zfs loader support under MK_ZFS to enable / disable consistently
@
text
@d6 1
a6 1
.if ${MK_ZFS} != "no"
@


1.21.2.6
log
@SVN rev 193495 on 2009-06-05 12:14:43Z by kmacy

reverse previous commit ...
@
text
@d6 1
a6 1
.if defined(LOADER_ZFS_SUPPORT)
@


1.21.2.7
log
@SVN rev 193876 on 2009-06-10 01:18:07Z by kmacy

- enable building of loader by default
- fix MK_ZFS == "no" and MK_CDDL == "no" handling
@
text
@a1 1
.include <bsd.own.mk>
d6 1
a6 1
.if ${MK_ZFS}
@


1.21.2.8
log
@SVN rev 193877 on 2009-06-10 01:20:46Z by kmacy

Should be ${MK_ZFS} != "no"
@
text
@d7 1
a7 1
.if ${MK_ZFS} != "no"
@


1.21.2.9
log
@SVN rev 193890 on 2009-06-10 09:06:42Z by kmacy

fix loader for default settings case
@
text
@d5 5
a9 1
		zfsboot gptzfsboot kgzldr libi386 libfirewire loader
@


1.21.2.10
log
@SVN rev 200221 on 2009-12-07 17:15:36Z by rnoland

MFC 199714

Create a seperate ZFS enabled loader.

This adds zfsloader which will be called by zfsboot/gptzfsboot code rather
than the tradional loader.  This eliminates the need to set the
LOADER_ZFS_SUPPORT variable in order to get a ZFS enabled loader.

Note however, that you must reinstall your bootcode (zfsboot/gptzfsboot)
in order for the boot process to use the new loader.

New installations will no longer be required to build a ZFS enabled
loader for a working ZFS boot system.  Installing zfsboot/gptzfsboot is
sufficient for acknowledging the use of CDDL code and therefore the ZFS
enabled loader.
@
text
@d4 2
a5 2
SUBDIR=		mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot zfsboot \
		gptzfsboot kgzldr libi386 libfirewire loader zfsloader
@


1.21.2.11
log
@SVN rev 201266 on 2009-12-30 17:45:35Z by jhb

MFC 200872:
Don't build zfsboot, gptzfsboot, and zfsloader if WITHOUT_ZFS is enabled.
@
text
@d4 2
a5 4
.include <bsd.own.mk>

SUBDIR=		mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot kgzldr \
		libi386 libfirewire loader
a9 4
.if ${MK_ZFS} != "no"
SUBDIR+=	zfsboot gptzfsboot zfsloader
.endif

@


1.21.2.12
log
@SVN rev 201288 on 2009-12-30 22:40:30Z by jhb

Remove duplicate include of bsd.own.mk.
@
text
@d2 1
@


1.21.2.13
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/sys/boot/i386/Makefile 201288 2009-12-30 22:40:30Z jhb $
@


1.21.2.12.4.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.21.2.12.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/sys/boot/i386/Makefile 201288 2009-12-30 22:40:30Z jhb $
@


1.21.2.12.2.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.21.2.1.4.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.21.2.1.2.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.20
log
@Hook boot0sio to the build.  Use 'boot0cfg -b /boot/boot0sio' to use.
@
text
@d3 2
a4 1
SUBDIR=		mbr boot0 boot0sio btx boot2 cdboot kgzldr libi386 loader
@


1.20.8.1
log
@MFC: Add support for booting from GPT-labeled disks from the BIOS.  This
includes /boot/pmbr, /boot/gptboot, and 'gpt boot'.
@
text
@d3 1
a3 2
SUBDIR=		mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot kgzldr \
		libi386 loader
@


1.20.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/sys/boot/i386/Makefile 175651 2008-01-24 22:23:22Z jhb $
@


1.20.8.1.2.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


1.19
log
@RIP liloldr.
It is not complete (the LILO root= specification isn't passed to our
loader for instance), it has not been touched in over 2 years.  Linux has
moved on to GRUB, so this is OBE now.  If someone creeps up to work on it,
it could become a port.
@
text
@d3 1
a3 1
SUBDIR=		mbr boot0 btx boot2 cdboot kgzldr libi386 loader
@


1.18
log
@Revert the part of Kirks UFS2 commit which added divdi3.c and moddi3.c
to libi386, this issue was resolved already in a cleaner way.
@
text
@a6 1
SUBDIR+=	liloldr
@


1.17
log
@This commit adds basic support for the UFS2 filesystem. The UFS2
filesystem expands the inode to 256 bytes to make space for 64-bit
block pointers. It also adds a file-creation time field, an ability
to use jumbo blocks per inode to allow extent like pointer density,
and space for extended attributes (up to twice the filesystem block
size worth of attributes, e.g., on a 16K filesystem, there is space
for 32K of attributes). UFS2 fully supports and runs existing UFS1
filesystems. New filesystems built using newfs can be built in either
UFS1 or UFS2 format using the -O option. In this commit UFS1 is
the default format, so if you want to build UFS2 format filesystems,
you must specify -O 2. This default will be changed to UFS2 when
UFS2 proves itself to be stable. In this commit the boot code for
reading UFS2 filesystems is not compiled (see /sys/boot/common/ufsread.c)
as there is insufficient space in the boot block. Once the size of the
boot block is increased, this code can be defined.

Things to note: the definition of SBSIZE has changed to SBLOCKSIZE.
The header file <ufs/ufs/dinode.h> must be included before
<ufs/ffs/fs.h> so as to get the definitions of ufs2_daddr_t and
ufs_lbn_t.

Still TODO:
Verify that the first level bootstraps work for all the architectures.
Convert the utility ffsinfo to understand UFS2 and test growfs.
Add support for the extended attribute storage. Update soft updates
to ensure integrity of extended attribute storage. Switch the
current extended attribute interfaces to use the extended attribute
storage. Add the extent like functionality (framework is there,
but is currently never used).

Sponsored by: DARPA & NAI Labs.
Reviewed by:	Poul-Henning Kamp <phk@@freebsd.org>
@
text
@d3 1
a3 1
SUBDIR=		libi386 mbr boot0 btx boot2 cdboot kgzldr loader
@


1.16
log
@Reconnect boot2.  I'm sure I'll regret this though.  :-)
@
text
@d3 1
a3 1
SUBDIR=		mbr boot0 btx boot2 cdboot kgzldr libi386 loader
@


1.15
log
@Turn off boot2 -- it gained over 96 bytes dieting on the in-tree Gcc 3.1.
@
text
@d3 1
a3 1
SUBDIR=		mbr boot0 btx cdboot kgzldr libi386 loader
@


1.14
log
@Use the new cdboot instead of cdldr.
@
text
@d3 1
a3 1
SUBDIR=		mbr boot0 btx boot2 cdboot kgzldr libi386 loader
@


1.13
log
@Hook up liloldr
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/boot/i386/Makefile,v 1.12 2000/03/28 01:19:44 jhb Exp $
d3 1
a3 1
SUBDIR=		mbr boot0 kgzldr btx boot2 libi386 loader
a5 1
SUBDIR+=	cdldr 
@


1.12
log
@Mega i386 loader commit.
- Don't hard code 0x10000 as the entry point for the loader.  Instead add
  src/sys/boot/i386/Makefile.inc which defines a make variable with the
  entry point for the loader.  Move the loader's entry point up to
  0x20000, which makes PXE happy.
- Don't try to use cpp to parse btxldr for the optional BTXLDR_VERBOSE,
  instead use m4 to achieve this.  Also, add a BTXLDR_VERBOSE knob in the
  btxldr Makefile to turn this option on.
- Redo parts of cdldr's Makefile so that it now builds and installs cdboot
  instead of having i386/loader/Makefile do that.  Also, add in some more
  variables to make the pxeldr Makefile almost identical and thus to ease
  maintainability.
- Teach cdldr about the a.out format.  Cdldr now parsers the a.out header
  of the loader binary and relocates it based on that.  The entry point of
  the loader no longer has to be hardcoded into cdldr.  Also, the boot
  info table from mkisofs is no longer required to get a useful cdboot.
- Update the lsdev function for BIOS disks to parse other file systems
  (such as DOS FAT) that we currently support.  This is still buggy as
  it assumes that a floppy with a DOS boot sector actually has a MBR and
  parses it as such.  I'll be fixing this in the future.
- The biggie:  Add in support for booting off of PXE-enabled network
  adapters.  Currently, we use the TFTP API provided by the PXE BIOS.
  Eventually we will switch to using the low-level NIC driver thus
  allowing both TFTP and NFS to be used, but for now it's just TFTP.

Submitted by:	ps, alfred
Testing by:	Benno Rice <benno@@netizen.com.au>
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/boot/i386/Makefile,v 1.11 2000/01/27 21:20:50 jhb Exp $
d8 1
@


1.11
log
@Add the new cdldr CD bootstrap loader.  This patch includes the following:

- Fix btxldr to preserve a NULL bootinfo pointer when it copies the kernel
  arguments.
- Add the cdldr bootstrap program.  This program is tacked onto the
  beginning of the standard 3rd stage boot loader (/boot/loader) to form
  the CD boot loader (/boot/cdboot).  When a CD is booted, the cdboot file
  is copied into memory instead and executed.  The cdldr stub emulates the
  environment normally provided by boot2 and then starts the loader.  This
  booting method does not emulate a floppy drive, but boots directly off of
  the CD.  This should fix the problems some BIOS's have with emulating a
  2.88 MB floppy image.
- Add support to the loader to recognize that it has been booted by cdldr
  instead of boot2 and use a simpler method of extracting the BIOS boot
  device.
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/boot/i386/Makefile,v 1.10 1999/08/28 00:39:58 peter Exp $
d3 5
a7 1
SUBDIR=		mbr boot0 kgzldr btx boot2 cdldr libi386 loader
@


1.11.2.1
log
@MFC: sync up loader with current, including PXE.
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/boot/i386/Makefile,v 1.12 2000/03/28 01:19:44 jhb Exp $
d3 1
a3 5
SUBDIR=		mbr boot0 kgzldr btx boot2 libi386 loader

# special boot programs, 'self-extracting boot2+loader'
SUBDIR+=	cdldr 
SUBDIR+=	pxeldr
@


1.11.2.2
log
@MFC: Switch from old cdldr to new cdboot.

Approved by:	re
@
text
@d1 1
a1 1
# $FreeBSD$
d3 1
a3 1
SUBDIR=		mbr boot0 btx boot2 cdboot kgzldr libi386 loader
d6 1
@


1.11.2.3
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/4/sys/boot/i386/Makefile 88366 2001-12-21 21:02:08Z jhb $
@


1.10
log
@$Id$ -> $FreeBSD$
@
text
@d1 1
a1 1
# $FreeBSD$
d3 1
a3 1
SUBDIR=		mbr boot0 kgzldr btx boot2 libi386 loader
@


1.9
log
@Activate kgzldr.
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.8 1999/05/24 22:44:32 rnordier Exp $
@


1.8
log
@Activate mbr.
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.7 1998/10/14 20:40:56 rnordier Exp $
d3 1
a3 1
SUBDIR=		mbr boot0 btx boot2 libi386 loader
@


1.7
log
@Activate boot2.
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.6 1998/10/12 02:05:44 rnordier Exp $
d3 1
a3 1
SUBDIR=		boot0 btx boot2 libi386 loader
@


1.7.2.1
log
@MFC: Activate mbr, kgzldr.
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.7 1998/10/14 20:40:56 rnordier Exp $
d3 1
a3 1
SUBDIR=		mbr boot0 kgzldr btx boot2 libi386 loader
@


1.7.2.2
log
@$Id$ -> $FreeBSD$
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.6
log
@Drop .MAKEFLAGS: hack.
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.5 1998/10/11 12:59:40 rnordier Exp $
d3 1
a3 1
SUBDIR=		boot0 btx libi386 loader
@


1.5
log
@Override for ELF.
@
text
@d1 1
a1 1
#	$Id:$
a3 2

.MAKEFLAGS:	OBJFORMAT=elf
@


1.4
log
@Turn off the new /sys/boot stuff (except boot0) unless OBJFORMAT
is elf.  (The BTX client must be ELF, though it is packaged as a.out
for compatibility.)
@
text
@d1 1
a1 1
SUBDIR=		boot0
d3 3
a5 3
.if ${OBJFORMAT} == elf
SUBDIR+=	btx libi386 loader
.endif
@


1.3
log
@Build boot0 as well.
@
text
@d1 5
a5 1
SUBDIR=		boot0 btx libi386 loader
@


1.2
log
@Initial integration of the i386 bootloader and BTX.

 - Discard large amounts of BIOS-related code in favour of the more compact
   BTX vm86 interface.
 - Build the loader module as ELF, although the resulting object is a.out,
   make gensetdefs 32/64-bit sensitive and use a single copy of it.
 - Throw away installboot, as it's no longer required.
 - Use direct bcopy operations in the i386_copy module, as BTX
   maps the first 16M of memory.  Check operations against the
   detected size of actual memory.
@
text
@d1 1
a1 1
SUBDIR=		btx libi386 loader
@


1.1
log
@Initial revision
@
text
@d1 1
a1 1
SUBDIR=		installboot libi386 loader
@


1.1.1.1
log
@This is the new unified bootstrap, sometimes known previously as the
'three-stage' bootstrap.
There are a number of caveats with the code in its current state:
 - The i386 bootstrap only supports booting from a floppy.
 - The kernel and kld do not yet know how to deal with the extended
   information and module summary passed in.
 - PnP-based autodetection and demand loading of modules is not implemented.
 - i386 ELF kernel loading is not ready yet.
 - The i386 bootstrap is loaded via an ugly blockmap.

On the alpha, both net- and disk-booting (SRM console machines only) is
supported.  No blockmaps are used by this code.

Obtained from:	Parts from the NetBSD/i386 standalone bootstrap.
@
text
@@
