head	1.46;
access;
symbols
	RELENG_8_4:1.46.0.2
	RELENG_9_1_0_RELEASE:1.45.2.1.4.2
	RELENG_9_1:1.45.2.1.0.4
	RELENG_9_1_BP:1.45.2.1
	RELENG_8_3_0_RELEASE:1.39.2.2.6.1
	RELENG_8_3:1.39.2.2.0.6
	RELENG_8_3_BP:1.39.2.2
	RELENG_9_0_0_RELEASE:1.45.2.1.2.1
	RELENG_9_0:1.45.2.1.0.2
	RELENG_9_0_BP:1.45.2.1
	RELENG_9:1.45.0.2
	RELENG_9_BP:1.45
	RELENG_7_4_0_RELEASE:1.32.2.6.4.1
	RELENG_8_2_0_RELEASE:1.39.2.2.4.1
	RELENG_7_4:1.32.2.6.0.4
	RELENG_7_4_BP:1.32.2.6
	RELENG_8_2:1.39.2.2.0.4
	RELENG_8_2_BP:1.39.2.2
	RELENG_8_1_0_RELEASE:1.39.2.2.2.1
	RELENG_8_1:1.39.2.2.0.2
	RELENG_8_1_BP:1.39.2.2
	RELENG_7_3_0_RELEASE:1.32.2.6.2.1
	RELENG_7_3:1.32.2.6.0.2
	RELENG_7_3_BP:1.32.2.6
	RELENG_8_0_0_RELEASE:1.39.2.1.2.1
	RELENG_8_0:1.39.2.1.0.2
	RELENG_8_0_BP:1.39.2.1
	RELENG_8:1.39.0.2
	RELENG_8_BP:1.39
	RELENG_7_2_0_RELEASE:1.32.2.1.2.1
	RELENG_7_2:1.32.2.1.0.2
	RELENG_7_2_BP:1.32.2.1
	RELENG_7_1_0_RELEASE:1.32.6.1
	RELENG_6_4_0_RELEASE:1.26.12.1
	RELENG_7_1:1.32.0.6
	RELENG_7_1_BP:1.32
	RELENG_6_4:1.26.0.12
	RELENG_6_4_BP:1.26
	RELENG_7_0_0_RELEASE:1.32
	RELENG_6_3_0_RELEASE:1.26
	RELENG_7_0:1.32.0.4
	RELENG_7_0_BP:1.32
	RELENG_6_3:1.26.0.10
	RELENG_6_3_BP:1.26
	RELENG_7:1.32.0.2
	RELENG_7_BP:1.32
	RELENG_6_2_0_RELEASE:1.26
	RELENG_6_2:1.26.0.8
	RELENG_6_2_BP:1.26
	RELENG_5_5_0_RELEASE:1.24
	RELENG_5_5:1.24.0.8
	RELENG_5_5_BP:1.24
	RELENG_6_1_0_RELEASE:1.26
	RELENG_6_1:1.26.0.6
	RELENG_6_1_BP:1.26
	RELENG_6_0_0_RELEASE:1.26
	RELENG_6_0:1.26.0.4
	RELENG_6_0_BP:1.26
	RELENG_6:1.26.0.2
	RELENG_6_BP:1.26
	RELENG_5_4_0_RELEASE:1.24
	RELENG_5_4:1.24.0.6
	RELENG_5_4_BP:1.24
	RELENG_4_11_0_RELEASE:1.6.2.1
	RELENG_4_11:1.6.2.1.0.10
	RELENG_4_11_BP:1.6.2.1
	RELENG_5_3_0_RELEASE:1.24
	RELENG_5_3:1.24.0.4
	RELENG_5_3_BP:1.24
	RELENG_5:1.24.0.2
	RELENG_5_BP:1.24
	RELENG_4_10_0_RELEASE:1.6.2.1
	RELENG_4_10:1.6.2.1.0.8
	RELENG_4_10_BP:1.6.2.1
	RELENG_5_2_1_RELEASE:1.18
	RELENG_5_2_0_RELEASE:1.18
	RELENG_5_2:1.18.0.2
	RELENG_5_2_BP:1.18
	RELENG_4_9_0_RELEASE:1.6.2.1
	RELENG_4_9:1.6.2.1.0.6
	RELENG_4_9_BP:1.6.2.1
	RELENG_5_1_0_RELEASE:1.16
	RELENG_5_1:1.16.0.2
	RELENG_5_1_BP:1.16
	RELENG_4_8_0_RELEASE:1.6.2.1
	RELENG_4_8:1.6.2.1.0.4
	RELENG_4_8_BP:1.6.2.1
	RELENG_5_0_0_RELEASE:1.14
	RELENG_5_0:1.14.0.2
	RELENG_5_0_BP:1.14
	RELENG_4_7_0_RELEASE:1.6.2.1
	RELENG_4_7:1.6.2.1.0.2
	RELENG_4_7_BP:1.6.2.1
	RELENG_4_6_2_RELEASE:1.6
	RELENG_4_6_1_RELEASE:1.6
	RELENG_4_6_0_RELEASE:1.6
	RELENG_4_6:1.6.0.10
	RELENG_4_6_BP:1.6
	RELENG_4_5_0_RELEASE:1.6
	RELENG_4_5:1.6.0.8
	RELENG_4_5_BP:1.6
	RELENG_4_4_0_RELEASE:1.6
	RELENG_4_4:1.6.0.6
	RELENG_4_4_BP:1.6
	KSE_MILESTONE_2:1.10
	KSE_PRE_MILESTONE_2:1.9
	RELENG_4_3_0_RELEASE:1.6
	RELENG_4_3:1.6.0.4
	RELENG_4_3_BP:1.6
	RELENG_4_2_0_RELEASE:1.6
	RELENG_4_1_1_RELEASE:1.6
	PRE_SMPNG:1.6
	RELENG_4_1_0_RELEASE:1.6
	RELENG_3_5_0_RELEASE:1.2.2.1
	RELENG_4_0_0_RELEASE:1.6
	RELENG_4:1.6.0.2
	RELENG_4_BP:1.6
	RELENG_3_4_0_RELEASE:1.2.2.1
	RELENG_3_3_0_RELEASE:1.2.2.1
	RELENG_3_2_PAO:1.2.2.1.0.2
	RELENG_3_2_PAO_BP:1.2.2.1
	RELENG_3_2_0_RELEASE:1.2.2.1
	POST_VFS_BIO_NFS_PATCH:1.3
	PRE_VFS_BIO_NFS_PATCH:1.3
	POST_SMP_VMSHARE:1.3
	PRE_SMP_VMSHARE:1.3
	POST_NEWBUS:1.3
	PRE_NEWBUS:1.3
	RELENG_3_1_0_RELEASE:1.2.2.1
	RELENG_3:1.2.0.2
	RELENG_3_BP:1.2
	RELENG_3_0_0_RELEASE:1.1.1.1
	initial:1.1.1.1
	MSMITH:1.1.1;
locks; strict;
comment	@# @;


1.46
date	2012.11.17.01.51.13;	author svnexp;	state Exp;
branches
	1.46.2.1;
next	1.45;

1.45
date	2011.06.25.16.01.45;	author marius;	state Exp;
branches
	1.45.2.1;
next	1.44;

1.44
date	2011.05.14.01.53.38;	author attilio;	state Exp;
branches;
next	1.43;

1.43
date	2010.08.23.01.48.07;	author imp;	state Exp;
branches;
next	1.42;

1.42
date	2010.07.12.00.49.22;	author nwhitehorn;	state Exp;
branches;
next	1.41;

1.41
date	2010.05.25.15.32.07;	author raj;	state Exp;
branches;
next	1.40;

1.40
date	2009.11.23.16.00.16;	author rnoland;	state Exp;
branches;
next	1.39;

1.39
date	2009.02.19.18.53.08;	author imp;	state Exp;
branches
	1.39.2.1;
next	1.38;

1.38
date	2008.12.14.02.57.41;	author nyan;	state Exp;
branches;
next	1.37;

1.37
date	2008.11.17.20.49.29;	author pjd;	state Exp;
branches;
next	1.36;

1.36
date	2008.10.14.10.11.14;	author raj;	state Exp;
branches;
next	1.35;

1.35
date	2008.09.18.15.25.35;	author obrien;	state Exp;
branches;
next	1.34;

1.34
date	2008.07.23.07.23.33;	author imp;	state Exp;
branches;
next	1.33;

1.33
date	2008.02.17.20.34.35;	author marcel;	state Exp;
branches;
next	1.32;

1.32
date	2006.11.05.22.03.02;	author marcel;	state Exp;
branches
	1.32.2.1
	1.32.6.1;
next	1.31;

1.31
date	2006.10.09.04.43.06;	author kmacy;	state Exp;
branches;
next	1.30;

1.30
date	2006.08.10.06.29.43;	author imp;	state Exp;
branches;
next	1.29;

1.29
date	2006.06.18.17.44.40;	author imp;	state Exp;
branches;
next	1.28;

1.28
date	2006.05.12.04.09.52;	author jhb;	state Exp;
branches;
next	1.27;

1.27
date	2006.03.17.18.54.34;	author ru;	state Exp;
branches;
next	1.26;

1.26
date	2004.12.21.12.32.13;	author ru;	state Exp;
branches
	1.26.2.1
	1.26.12.1;
next	1.25;

1.25
date	2004.11.23.05.52.00;	author marcel;	state Exp;
branches;
next	1.24;

1.24
date	2004.08.16.15.45.24;	author marius;	state Exp;
branches;
next	1.23;

1.23
date	2004.05.16.00.19.12;	author cognet;	state Exp;
branches;
next	1.22;

1.22
date	2004.05.14.13.34.53;	author cognet;	state Exp;
branches;
next	1.21;

1.21
date	2004.02.07.08.10.06;	author ru;	state Exp;
branches;
next	1.20;

1.20
date	2004.01.27.22.15.03;	author schweikh;	state Exp;
branches;
next	1.19;

1.19
date	2003.12.10.09.18.42;	author grehan;	state Exp;
branches;
next	1.18;

1.18
date	2003.08.16.02.48.20;	author obrien;	state Exp;
branches;
next	1.17;

1.17
date	2003.06.26.03.51.56;	author peter;	state Exp;
branches;
next	1.16;

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

1.15
date	2003.02.13.04.35.04;	author benno;	state Exp;
branches;
next	1.14;

1.14
date	2002.07.07.18.10.38;	author jake;	state Exp;
branches;
next	1.13;

1.13
date	2002.05.09.20.33.22;	author obrien;	state Exp;
branches;
next	1.12;

1.12
date	2002.03.28.01.37.10;	author obrien;	state Exp;
branches;
next	1.11;

1.11
date	2001.10.25.09.05.47;	author ru;	state Exp;
branches;
next	1.10;

1.10
date	2001.09.12.08.35.05;	author dfr;	state Exp;
branches;
next	1.9;

1.9
date	2001.06.09.16.49.48;	author dfr;	state Exp;
branches;
next	1.8;

1.8
date	2001.03.25.23.07.44;	author obrien;	state Exp;
branches;
next	1.7;

1.7
date	2000.11.10.06.29.42;	author benno;	state Exp;
branches;
next	1.6;

1.6
date	99.11.15.08.31.14;	author marcel;	state Exp;
branches
	1.6.2.1;
next	1.5;

1.5
date	99.11.14.13.54.39;	author marcel;	state Exp;
branches;
next	1.4;

1.4
date	99.07.28.20.32.44;	author se;	state Exp;
branches;
next	1.3;

1.3
date	99.02.03.08.39.07;	author kato;	state Exp;
branches;
next	1.2;

1.2
date	98.11.03.06.11.28;	author msmith;	state Exp;
branches
	1.2.2.1;
next	1.1;

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

1.46.2.1
date	2012.11.17.01.51.13;	author svnexp;	state dead;
branches;
next	1.46.2.2;

1.46.2.2
date	2013.03.28.13.04.00;	author svnexp;	state Exp;
branches;
next	;

1.45.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.45.2.1.2.1
	1.45.2.1.4.1;
next	1.45.2.2;

1.45.2.2
date	2012.11.17.11.36.46;	author svnexp;	state Exp;
branches;
next	;

1.45.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.45.2.1.2.2;

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

1.45.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.45.2.1.4.2;

1.45.2.1.4.2
date	2012.11.17.08.47.35;	author svnexp;	state Exp;
branches;
next	;

1.39.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.39.2.1.2.1;
next	1.39.2.2;

1.39.2.2
date	2009.12.07.16.37.02;	author rnoland;	state Exp;
branches
	1.39.2.2.2.1
	1.39.2.2.4.1
	1.39.2.2.6.1;
next	1.39.2.3;

1.39.2.3
date	2012.06.29.13.02.46;	author avg;	state Exp;
branches;
next	1.39.2.4;

1.39.2.4
date	2012.11.17.10.36.26;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.39.2.2.6.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.39.2.2.6.2;

1.39.2.2.6.2
date	2012.11.17.08.25.06;	author svnexp;	state Exp;
branches;
next	;

1.32.2.1
date	2009.03.19.13.02.37;	author nyan;	state Exp;
branches
	1.32.2.1.2.1;
next	1.32.2.2;

1.32.2.2
date	2009.05.23.19.54.18;	author kmacy;	state Exp;
branches;
next	1.32.2.3;

1.32.2.3
date	2009.06.05.12.00.55;	author kmacy;	state Exp;
branches;
next	1.32.2.4;

1.32.2.4
date	2009.06.05.12.14.43;	author kmacy;	state Exp;
branches;
next	1.32.2.5;

1.32.2.5
date	2009.06.10.09.06.42;	author kmacy;	state Exp;
branches;
next	1.32.2.6;

1.32.2.6
date	2009.12.07.17.15.36;	author rnoland;	state Exp;
branches
	1.32.2.6.2.1
	1.32.2.6.4.1;
next	1.32.2.7;

1.32.2.7
date	2012.11.17.08.04.47;	author svnexp;	state Exp;
branches;
next	;

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

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

1.32.2.6.4.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.32.2.6.4.2;

1.32.2.6.4.2
date	2012.11.17.08.17.04;	author svnexp;	state Exp;
branches;
next	;

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

1.26.2.1
date	2012.11.17.07.42.31;	author svnexp;	state Exp;
branches;
next	;

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

1.6.2.1
date	2002.07.17.14.23.14;	author ru;	state Exp;
branches;
next	1.6.2.2;

1.6.2.2
date	2012.11.17.07.25.17;	author svnexp;	state Exp;
branches;
next	;

1.2.2.1
date	99.02.06.07.38.33;	author kato;	state Exp;
branches;
next	;

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


desc
@@


1.46
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/sys/boot/Makefile 223539 2011-06-25 16:01:45Z marius $

.include <bsd.own.mk>
.include <bsd.arch.inc.mk>

.if ${MK_FORTH} != "no"
# Build the add-in FORTH interpreter.
SUBDIR+=		ficl
.endif

# Pick the machine-dependent subdir based on the target architecture.
ADIR=			${MACHINE:S/amd64/i386/:S/powerpc64/powerpc/}
.if exists(${.CURDIR}/${ADIR}/.)
SUBDIR+=		${ADIR}
.endif

.include <bsd.subdir.mk>
@


1.46.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:04:00 +0000
@
text
@d1 17
@


1.46.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 35
# $FreeBSD: releng/8.4/sys/boot/Makefile 237779 2012-06-29 13:02:46Z avg $

.include <bsd.own.mk>

.if ${MK_FORTH} != "no"
# Build the add-in FORTH interpreter.
SUBDIR+=		ficl
.endif

# Build EFI library.
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE} == "i386" || ${MACHINE_ARCH} == "ia64"
SUBDIR+=		efi
.endif

# Build Open Firmware library.
.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc64"
SUBDIR+=		ofw
.endif

# Build U-Boot library.
.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "arm"
SUBDIR+=		uboot
.endif

.if ${MACHINE_ARCH} == "amd64" || ${MACHINE} == "i386" || ${MACHINE_ARCH} == "sparc64"
SUBDIR+=		zfs
.endif

# Pick the machine-dependent subdir based on the target architecture.
ADIR=			${MACHINE:S/amd64/i386/:S/sun4v/sparc64/}
.if exists(${.CURDIR}/${ADIR}/.)
SUBDIR+=		${ADIR}
.endif

.include <bsd.subdir.mk>
@


1.45
log
@SVN rev 223539 on 2011-06-25 16:01:45Z by marius

As with EFI, OFW and U-Boot etc only compile FDT support on those
architectures that actually use it.
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.45.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.45.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/Makefile 223539 2011-06-25 16:01:45Z marius $
@


1.45.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.45.2.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/sys/boot/Makefile 223539 2011-06-25 16:01:45Z marius $
@


1.45.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.45.2.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/sys/boot/Makefile 223539 2011-06-25 16:01:45Z marius $
@


1.44
log
@SVN rev 221869 on 2011-05-14 01:53:38Z by attilio

Disconnect sun4v architecture from the three.

Some files keep the SUN4V tags as a code reference, for the future,
if any rewamped sun4v support wants to be added again.

Reviewed by:	marius
Tested by:	sbruno
Approved by:	re
@
text
@a10 4
.if ${MK_FDT} != "no"
SUBDIR+=		fdt
.endif

@


1.43
log
@SVN rev 211679 on 2010-08-23 01:48:07Z by imp

MF tbemd: move to using specific architecture makefiles
@
text
@d16 1
a16 1
ADIR=			${MACHINE:S/amd64/i386/:S/sun4v/sparc64/:S/powerpc64/powerpc/}
@


1.42
log
@SVN rev 209920 on 2010-07-12 00:49:22Z by nwhitehorn

Provide support in loader for booting 64-bit PowerPC kernels. Like amd64,
64-bit PowerPC kernels are loaded by a 32-bit loader, since nearly all
powerpc64 firmwares execute in 32-bit mode.
@
text
@d4 1
a10 19
# Build EFI library.
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE} == "i386" || ${MACHINE_ARCH} == "ia64"
SUBDIR+=		efi
.endif

# Build Open Firmware library.
.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "sparc64"
SUBDIR+=		ofw
.endif

# Build U-Boot library.
.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "arm"
SUBDIR+=		uboot
.endif

.if ${MACHINE_ARCH} == "amd64" || ${MACHINE} == "i386"
SUBDIR+=		zfs
.endif

@


1.41
log
@SVN rev 208539 on 2010-05-25 15:32:07Z by raj

Bring a missing FDT piece (omitted in the previous commit).
@
text
@d16 1
a16 1
.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc64"
d21 1
a21 1
.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "arm"
d34 1
a34 1
ADIR=			${MACHINE:S/amd64/i386/:S/sun4v/sparc64/}
@


1.40
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
@d29 4
@


1.39
log
@SVN rev 188825 on 2009-02-19 18:53:08Z by imp

Enable building of ficl on MIPS.  It compiles, but needs more testing.
@
text
@d25 1
a25 1
.if defined(LOADER_ZFS_SUPPORT)
@


1.39.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.39.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
@d25 1
a25 1
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE} == "i386"
@


1.39.2.3
log
@SVN rev 237779 on 2012-06-29 13:02:46Z by avg

fix a mismerge in r237765

sys/boot stable/8 doesn't have Makefile.spac64, instead it has
spar64-specific blocks in Makefile.
This is a direct commit.

Pointyhat to:	avg
@
text
@d25 1
a25 1
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE} == "i386" || ${MACHINE_ARCH} == "sparc64"
@


1.39.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/Makefile 237779 2012-06-29 13:02:46Z avg $
@


1.39.2.2.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.39.2.2.6.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/sys/boot/Makefile 200220 2009-12-07 16:37:02Z rnoland $
@


1.39.2.2.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.39.2.2.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.39.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.38
log
@SVN rev 186073 on 2008-12-14 02:57:41Z by nyan

Disconnect the efi from pc98.  It's not needed.
@
text
@a4 4
.if ${MACHINE_ARCH} == "mips"
MK_FORTH=no	# not yet
.endif

@


1.37
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
@d15 1
a15 1
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "ia64"
@


1.36
log
@SVN rev 183878 on 2008-10-14 10:11:14Z by raj

Initial support of loader(8) for ARM machines running U-Boot.

This uses the common U-Boot support lib (sys/boot/uboot, already used on
FreeBSD/powerpc), and assumes the underlying firmware has the modern API for
stand-alone apps enabled in the config (CONFIG_API).

Only netbooting is supported at the moment.

Obtained from:	Marvell, Semihalf
@
text
@d29 4
@


1.35
log
@SVN rev 183149 on 2008-09-18 15:25:35Z by obrien

No FORTH for MIPS.
@
text
@d25 1
a25 1
.if ${MACHINE_ARCH} == "powerpc"
@


1.34
log
@SVN rev 180733 on 2008-07-23 07:23:33Z by imp

Only descend into the boot directory for the architecture if it
actually exists and is a directory or symlink to a directory.
@
text
@d5 4
@


1.33
log
@Hook the U-Boot library up to the build.
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/boot/Makefile,v 1.32 2006/11/05 22:03:02 marcel Exp $
d26 4
a29 1
SUBDIR+=		${MACHINE:S/amd64/i386/:S/sun4v/sparc64/}
@


1.32
log
@Major rework of the ia64 loaders. The two primary objectives are:
1. Make libefi portable by removing ia64 specific code and build
   it on i386 and amd64 by default to prevent regressions. These
   changes include fixes and improvements over previous code to
   establish or improve APIs where none existed or when the amount
   of kluging was unacceptably high.
2. Increase the amount of sharing between the efi and ski loaders
   to improve maintainability of the loaders and simplify making
   changes to the loader-kernel handshaking in the future.

The version of the efi and ski loaders are now both changed to 1.2
as user visible improvements and changes have been made.
@
text
@d1 1
a1 1
# $FreeBSD$
d20 5
@


1.32.2.1
log
@SVN rev 190035 on 2009-03-19 13:02:37Z by nyan

MFC: r186073

  Disconnect the efi from pc98.
@
text
@d11 1
a11 1
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE} == "i386" || ${MACHINE_ARCH} == "ia64"
@


1.32.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
@a19 4
.if defined(LOADER_ZFS_SUPPORT)
SUBDIR+=		zfs
.endif

@


1.32.2.3
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
@d20 1
a20 1
.if ${MK_ZFS} != "no"
@


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

reverse previous commit ...
@
text
@d20 1
a20 1
.if defined(LOADER_ZFS_SUPPORT)
@


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

fix loader for default settings case
@
text
@d20 1
a20 1
.if ${MK_ZFS} != "no"
@


1.32.2.6
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
@d20 1
a20 1
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE} == "i386"
@


1.32.2.7
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/sys/boot/Makefile 200221 2009-12-07 17:15:36Z rnoland $
@


1.32.2.6.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.32.2.6.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/sys/boot/Makefile 200221 2009-12-07 17:15:36Z rnoland $
@


1.32.2.6.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.32.2.1.2.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.32.6.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.31
log
@add sun4v support to the sparc64 boot loader

Approved by: rwatson (mentor)
Reviewed by: jmg
Tested by: kris, dwhite, and jmg
@
text
@d11 1
a11 1
.if ${MACHINE_ARCH} == "ia64"
@


1.30
log
@Don't need to special case arm here anymore
@
text
@d21 1
a21 1
SUBDIR+=		${MACHINE:S/amd64/i386/}
@


1.29
log
@Don't descend into ${MACHINE} on the arm platforms.
@
text
@a19 1
.if ${MACHINE_ARCH} != "arm"
a21 1
.endif
@


1.28
log
@Remove more Alpha bits from the boot code including fixing several
stale comments.
@
text
@d20 1
d23 1
@


1.27
log
@Reimplementation of world/kernel build options.  For details, see:

http://lists.freebsd.org/pipermail/freebsd-current/2006-March/061725.html

The src.conf(5) manpage is to follow in a few days.

Brought to you by:	imp, jhb, kris, phk, ru (all bugs are mine)
@
text
@a22 6
# Build ARC / AlphaBIOS executable on the Alpha
# (this is a WIP (work in progress)).
#.if ${MACHINE_ARCH} == "alpha"
#SUBDIR+=		arc
#.endif

@


1.26
log
@NOFORTH -> NO_FORTH
@
text
@d3 3
a5 1
.if !defined(NO_FORTH)
@


1.26.2.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/sys/boot/Makefile 139123 2004-12-21 12:32:15Z ru $
@


1.26.12.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.25
log
@Visit the efi subdirectory before we visit the machine-specific
subdirectory so that the library built there can be used by the
machine specific boot code.
@
text
@d3 1
a3 1
.if !defined(NOFORTH)
@


1.24
log
@Instead of "OpenFirmware", "openfirmware", etc. use the official spelling
"Open Firmware" from IEEE 1275 and OpenFirmware.org (no pun intended).

Ok'ed by:	tmm
@
text
@d8 5
a26 5
# Build EFI executable on ia64.
.if ${MACHINE_ARCH} == "ia64"
SUBDIR+=		efi
.endif

@


1.23
log
@Try harder not to compile anything in sys/boot for arm.
I wonder how buildworld ever worked for me...
@
text
@d8 1
a8 1
# Build OpenFirmware library.
@


1.22
log
@Do not attempt to build anything in sys/boot for arm.
@
text
@a13 1
.if ${MACHINE_ARCH} != "arm"
a14 1
.endif
@


1.21
log
@Untangle building of AMD64 boot code.

Tested on:	amd64 (sledge)
@
text
@d14 1
d16 1
@


1.20
log
@Sync with Oxford Dictionary. Style (add missing full stops) while I'm here.
@
text
@a2 4
.if ${MACHINE_ARCH} == "amd64"
.MAKEFLAGS:  MACHINE_ARCH=i386 MACHINE=i386 REALLY_AMD64=true
.endif

d14 1
a14 1
SUBDIR+=		${MACHINE}
@


1.19
log
@Enable FICL build on powerpc
@
text
@d8 1
a8 1
# Build the add-in FORTH interpreter
d12 1
a12 1
# Build OpenFirmware library
d17 1
a17 1
# Pick the machine-dependant subdir based on the target architecture.
d21 1
a21 1
# (this is a WIP (work in progress))
d26 1
a26 1
# Build EFI executable on ia64
@


1.18
log
@FICL doesn't build on PowerPC yet, so disable.
@
text
@d7 1
a7 1
.if !defined(NOFORTH) && ${MACHINE_ARCH} != "powerpc"
@


1.17
log
@Build on amd64.  Yes, I know this isn't particularly nice.
@
text
@d7 1
a7 1
.if !defined(NOFORTH)
@


1.16
log
@We use i386 boot code on AMD64.
@
text
@d4 1
a4 2
MACHINE_ARCH=i386
MACHINE=i386
@


1.15
log
@Don't bother to build ficl if NOFORTH is defined.
@
text
@d3 5
@


1.14
log
@Build ficl on sparc64 fwiw.  It doesn't work.
@
text
@d3 1
d6 1
@


1.13
log
@Ficl doesn't build on sparc64.
@
text
@a3 1
.if ${MACHINE_ARCH} != "sparc64"
a4 1
.endif
@


1.12
log
@sparc64 is an ofw consumer.
@
text
@d4 1
d6 1
@


1.11
log
@Just use ${MACHINE}, it's already special-casing pc98.
@
text
@d6 2
a7 2
# Build OpenFirmware library on PowerPC
.if ${MACHINE_ARCH} == "powerpc"
@


1.10
log
@Build ficl on all architectures.
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/boot/Makefile,v 1.9 2001/06/09 16:49:48 dfr Exp $
a11 2
# XXX pc98 is basicly a special i386 with MACHINE_ARCH=i386 and MACHINE=pc98.
.if ${MACHINE_ARCH} == "i386" && ${MACHINE} == "pc98"
a12 3
.else
SUBDIR+=		${MACHINE_ARCH}
.endif
@


1.9
log
@First approximation of an ia64 EFI loader. Not functional.
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/boot/Makefile,v 1.8 2001/03/25 23:07:44 obrien Exp $
a3 1
.if ${MACHINE_ARCH} != "ia64"
a4 1
.endif
@


1.8
log
@Turn off building the ARC loader.  I don't know of anyone currently working
on advancing this WIP.
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/boot/Makefile,v 1.7 2000/11/10 06:29:42 benno Exp $
d4 1
d6 1
d26 5
@


1.7
log
@OpenFirmware/PowerPC loader, part 2.
This brings the loader up to the point where I can compile it under
NetBSD/macppc and have it boot, interact and talk to NFS servers.

sys/boot/ofw/libofw/main.c has been deleted (it has no revision history) and
replaced with sys/boot/ofw/common/main.c

Reviewed by:	obrien
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/boot/Makefile,v 1.6 1999/11/15 08:31:14 marcel Exp $
d20 4
a23 3
.if ${MACHINE_ARCH} == "alpha"
SUBDIR+=		arc
.endif
@


1.6
log
@PC-98 has MACHINE_ARCH=i386 and MACHINE=pc98. Make it a special case.
This should fix the breakage reported by nyan.
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/boot/Makefile,v 1.5 1999/11/14 13:54:39 marcel Exp $
d5 5
@


1.6.2.1
log
@MFC: 1.11: Just use ${MACHINE}, it's already special-casing pc98.
@
text
@d1 1
a1 1
# $FreeBSD$
d7 2
d10 3
@


1.6.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/4/sys/boot/Makefile 100243 2002-07-17 14:23:14Z ru $
@


1.5
log
@${MACHINE} -> ${MACHINE_ARCH}

All Makefiles now use MACHINE_ARCH for the target architecture.
Unification is required for cross-building.

Tags added to:
	sys/boot/Makefile
	sys/boot/arc/loader/Makefile
	sys/kern/Makefile
	usr.bin/cpp/Makefile
	usr.bin/gcore/Makefile
	usr.bin/truss/Makefile

usr.bin/gcore/Makefile:
	fixed typo: MACHINDE -> MACHINE_ARCH
@
text
@d1 1
a1 1
# $FreeBSD$
d7 4
d12 1
@


1.4
log
@Activate "arc" (ARC / AlphaBIOS loader) on Alpha.
@
text
@d1 2
d7 1
a7 1
SUBDIR+=		${MACHINE}
d10 1
a10 1
.if ${MACHINE} == "alpha"
@


1.3
log
@PC98 version of new boot loader.  Because boot2 has not yet ported,
files in boot2 directory are copies from legacy biosboot.

Submitted by:	IMAI Takeshi <take-i@@ceres.dti.ne.jp>
@
text
@d7 5
@


1.2
log
@Add the Ficl (Forth Inspired Command Language) interpreter.  If all goes well,
this will allow us to manage bloat in the loader by using a bytecoded HLL
rather than lots of C code.  It also offers an opportunity for vendors
or others with special applications to significantly customise the boot
process without having to commit to a divergent code branch.

This early commit is to allow others to experiment with the most effective
mechanisms for integrating FICL with the loader as it currently stands.

Ficl is distributed with the following license conditions:

"Ficl is freeware.  Use it in any way that you like, with the understanding
 that the code is not supported."

All source files contain authorship attributions.

Obtained from:	John Sadler (john_sadler@@alum.mit.edu)
@
text
@d5 1
a5 1
SUBDIR+=		${MACHINE_ARCH}
@


1.2.2.1
log
@MFC: activate boot loader for PC98.

Approved by:	jkh
@
text
@d5 1
a5 1
SUBDIR+=		${MACHINE}
@


1.1
log
@Initial revision
@
text
@d1 5
a5 2
# Pick the subdir based on the target architecture.
SUBDIR=		${MACHINE_ARCH}
@


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
@@
