head	1.17;
access;
symbols
	RELENG_8_4:1.17.0.2
	RELENG_9_1_0_RELEASE:1.14.2.3.2.2
	RELENG_9_1:1.14.2.3.0.2
	RELENG_9_1_BP:1.14.2.3
	RELENG_8_3_0_RELEASE:1.13.22.1.8.1
	RELENG_8_3:1.13.22.1.0.8
	RELENG_8_3_BP:1.13.22.1
	RELENG_9_0_0_RELEASE:1.14.2.1.2.1
	RELENG_9_0:1.14.2.1.0.2
	RELENG_9_0_BP:1.14.2.1
	RELENG_9:1.14.0.2
	RELENG_9_BP:1.14
	RELENG_7_4_0_RELEASE:1.13.26.1
	RELENG_8_2_0_RELEASE:1.13.22.1.6.1
	RELENG_7_4:1.13.0.26
	RELENG_7_4_BP:1.13
	RELENG_8_2:1.13.22.1.0.6
	RELENG_8_2_BP:1.13.22.1
	RELENG_8_1_0_RELEASE:1.13.22.1.4.1
	RELENG_8_1:1.13.22.1.0.4
	RELENG_8_1_BP:1.13.22.1
	RELENG_7_3_0_RELEASE:1.13.24.1
	RELENG_7_3:1.13.0.24
	RELENG_7_3_BP:1.13
	RELENG_8_0_0_RELEASE:1.13.22.1.2.1
	RELENG_8_0:1.13.22.1.0.2
	RELENG_8_0_BP:1.13.22.1
	RELENG_8:1.13.0.22
	RELENG_8_BP:1.13
	RELENG_7_2_0_RELEASE:1.13.20.1
	RELENG_7_2:1.13.0.20
	RELENG_7_2_BP:1.13
	RELENG_7_1_0_RELEASE:1.13.18.1
	RELENG_6_4_0_RELEASE:1.13.16.1
	RELENG_7_1:1.13.0.18
	RELENG_7_1_BP:1.13
	RELENG_6_4:1.13.0.16
	RELENG_6_4_BP:1.13
	RELENG_7_0_0_RELEASE:1.13
	RELENG_6_3_0_RELEASE:1.13
	RELENG_7_0:1.13.0.14
	RELENG_7_0_BP:1.13
	RELENG_6_3:1.13.0.12
	RELENG_6_3_BP:1.13
	RELENG_7:1.13.0.10
	RELENG_7_BP:1.13
	RELENG_6_2_0_RELEASE:1.13
	RELENG_6_2:1.13.0.8
	RELENG_6_2_BP:1.13
	RELENG_5_5_0_RELEASE:1.12
	RELENG_5_5:1.12.0.8
	RELENG_5_5_BP:1.12
	RELENG_6_1_0_RELEASE:1.13
	RELENG_6_1:1.13.0.6
	RELENG_6_1_BP:1.13
	RELENG_6_0_0_RELEASE:1.13
	RELENG_6_0:1.13.0.4
	RELENG_6_0_BP:1.13
	RELENG_6:1.13.0.2
	RELENG_6_BP:1.13
	RELENG_5_4_0_RELEASE:1.12
	RELENG_5_4:1.12.0.6
	RELENG_5_4_BP:1.12
	RELENG_4_11_0_RELEASE:1.4.2.1
	RELENG_4_11:1.4.2.1.0.14
	RELENG_4_11_BP:1.4.2.1
	RELENG_5_3_0_RELEASE:1.12
	RELENG_5_3:1.12.0.4
	RELENG_5_3_BP:1.12
	RELENG_5:1.12.0.2
	RELENG_5_BP:1.12
	RELENG_4_10_0_RELEASE:1.4.2.1
	RELENG_4_10:1.4.2.1.0.12
	RELENG_4_10_BP:1.4.2.1
	RELENG_5_2_1_RELEASE:1.5
	RELENG_5_2_0_RELEASE:1.5
	RELENG_5_2:1.5.0.6
	RELENG_5_2_BP:1.5
	RELENG_4_9_0_RELEASE:1.4.2.1
	RELENG_4_9:1.4.2.1.0.10
	RELENG_4_9_BP:1.4.2.1
	RELENG_5_1_0_RELEASE:1.5
	RELENG_5_1:1.5.0.4
	RELENG_5_1_BP:1.5
	RELENG_4_8_0_RELEASE:1.4.2.1
	RELENG_4_8:1.4.2.1.0.8
	RELENG_4_8_BP:1.4.2.1
	RELENG_5_0_0_RELEASE:1.5
	RELENG_5_0:1.5.0.2
	RELENG_5_0_BP:1.5
	RELENG_4_7_0_RELEASE:1.4.2.1
	RELENG_4_7:1.4.2.1.0.6
	RELENG_4_7_BP:1.4.2.1
	RELENG_4_6_2_RELEASE:1.4.2.1
	RELENG_4_6_1_RELEASE:1.4.2.1
	RELENG_4_6_0_RELEASE:1.4.2.1
	RELENG_4_6:1.4.2.1.0.4
	RELENG_4_6_BP:1.4.2.1
	RELENG_4_5_0_RELEASE:1.4.2.1
	RELENG_4_5:1.4.2.1.0.2
	RELENG_4_5_BP:1.4.2.1
	RELENG_4:1.4.0.2
	old_RELENG_4_4_0_RELEASE:1.1.2.2
	old_RELENG_4_4:1.1.2.2.0.4
	old_RELENG_4_4_BP:1.1.2.2
	old_KSE_MILESTONE_2:1.3
	old_KSE_PRE_MILESTONE_2:1.3
	old_RELENG_4_3_0_RELEASE:1.1.2.2
	old_RELENG_4_3:1.1.2.2.0.2
	old_RELENG_4_3_BP:1.1.2.2
	old_RELENG_4_2_0_RELEASE:1.1.2.2
	old_RELENG_4_1_1_RELEASE:1.1.2.2
	old_PRE_SMPNG:1.3
	old_RELENG_4_1_0_RELEASE:1.1.2.2
	old_RELENG_4_0_0_RELEASE:1.1
	old_RELENG_4:1.1.0.2
	old_RELENG_4_BP:1.1;
locks; strict;
comment	@# @;


1.17
date	2012.11.17.01.51.17;	author svnexp;	state Exp;
branches
	1.17.2.1;
next	1.16;

1.16
date	2012.05.11.18.07.23;	author dim;	state Exp;
branches;
next	1.15;

1.15
date	2012.05.10.09.47.04;	author avg;	state Exp;
branches;
next	1.14;

1.14
date	2010.06.03.17.42.32;	author ed;	state Exp;
branches
	1.14.2.1;
next	1.13;

1.13
date	2004.12.21.08.47.14;	author ru;	state Exp;
branches
	1.13.2.1
	1.13.10.1
	1.13.16.1
	1.13.18.1
	1.13.20.1
	1.13.22.1
	1.13.24.1
	1.13.26.1;
next	1.12;

1.12
date	2004.04.28.21.31.20;	author ru;	state Exp;
branches;
next	1.11;

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

1.10
date	2004.04.25.20.36.44;	author obrien;	state Exp;
branches;
next	1.9;

1.9
date	2004.04.25.19.50.20;	author obrien;	state Exp;
branches;
next	1.8;

1.8
date	2004.02.09.14.11.57;	author ru;	state Exp;
branches;
next	1.7;

1.7
date	2004.02.06.21.58.31;	author ru;	state Exp;
branches;
next	1.6;

1.6
date	2004.02.06.12.58.31;	author ru;	state Exp;
branches;
next	1.5;

1.5
date	2002.09.17.01.48.55;	author peter;	state Exp;
branches;
next	1.4;

1.4
date	2001.11.04.03.24.16;	author jhb;	state Exp;
branches
	1.4.2.1;
next	1.3;

1.3
date	2000.05.23.12.31.32;	author jhb;	state Exp;
branches;
next	1.2;

1.2
date	2000.03.28.01.19.47;	author jhb;	state Exp;
branches;
next	1.1;

1.1
date	2000.01.27.21.21.00;	author jhb;	state Exp;
branches
	1.1.2.1;
next	;

1.17.2.1
date	2012.11.17.01.51.17;	author svnexp;	state dead;
branches;
next	1.17.2.2;

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

1.14.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.14.2.1.2.1;
next	1.14.2.2;

1.14.2.2
date	2012.06.29.10.10.16;	author avg;	state Exp;
branches;
next	1.14.2.3;

1.14.2.3
date	2012.06.29.18.09.39;	author dim;	state Exp;
branches
	1.14.2.3.2.1;
next	1.14.2.4;

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

1.14.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.14.2.1.2.2;

1.14.2.1.2.2
date	2012.11.17.08.36.46;	author svnexp;	state Exp;
branches;
next	;

1.14.2.3.2.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.14.2.3.2.2;

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

1.13.2.1
date	2012.11.17.07.42.38;	author svnexp;	state Exp;
branches;
next	;

1.13.10.1
date	2012.11.17.08.04.53;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.13.22.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.13.22.1.2.1
	1.13.22.1.4.1
	1.13.22.1.6.1
	1.13.22.1.8.1;
next	1.13.22.2;

1.13.22.2
date	2012.06.29.10.10.43;	author avg;	state Exp;
branches;
next	1.13.22.3;

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

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

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

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

1.13.22.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.13.22.1.8.2;

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

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

1.13.26.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.13.26.2;

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

1.4.2.1
date	2001.12.21.21.01.41;	author jhb;	state Exp;
branches;
next	1.4.2.2;

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

1.1.2.1
date	2000.04.15.03.09.42;	author ps;	state Exp;
branches;
next	1.1.2.2;

1.1.2.2
date	2000.07.07.21.12.33;	author jhb;	state Exp;
branches;
next	;


desc
@@


1.17
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/sys/boot/i386/cdboot/Makefile 235281 2012-05-11 18:07:23Z dim $

PROG=	cdboot
STRIP=
BINMODE=${NOBINMODE}
NO_MAN=
SRCS=	${PROG}.S

CFLAGS+=-I${.CURDIR}/../common

ORG=	0x7c00

LDFLAGS=-e start -Ttext ${ORG} -Wl,-N,-S,--oformat,binary

.include <bsd.prog.mk>

# XXX: clang integrated-as doesn't grok .codeNN directives yet
CFLAGS.cdboot.S=	${CLANG_NO_IAS}
CFLAGS+=		${CFLAGS.${.IMPSRC:T}}
@


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


1.17.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/cdboot/Makefile 237762 2012-06-29 10:10:43Z avg $

PROG=	cdboot
STRIP=
BINMODE=${NOBINMODE}
NO_MAN=
SRCS=	${PROG}.S

CFLAGS+=-I${.CURDIR}/../common

ORG=	0x7c00

LDFLAGS=-N -e start -Ttext ${ORG} -Wl,-S,--oformat,binary

.include <bsd.prog.mk>
@


1.16
log
@SVN rev 235281 on 2012-05-11 18:07:23Z by dim

Fix sys/boot/i386/cdboot/cdboot.S compilation with clang after r235219.
This file uses .code16 directives, which are not yet supported by
clang's integrated assembler.

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


1.15
log
@SVN rev 235219 on 2012-05-10 09:47:04Z by avg

cdboot, pxeldr: make use of bootargs.h instead of redefining flag constants

Reviewed by:	jhb
MFC after:	1 month
@
text
@d16 4
@


1.14
log
@SVN rev 208789 on 2010-06-03 17:42:32Z by ed

Use -Wl,-N instead of the undocumented -N option for GCC.

GCC forwards the -N flag directly to ld. This flag is not documented and
not supported by (for example) Clang. Just use -Wl,-N.

Submitted by:	Pawel Worach
@
text
@d7 3
a9 1
SRCS=	${PROG}.s
@


1.14.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.14.2.2
log
@SVN rev 237761 on 2012-06-29 10:10:16Z by avg

MFC r235219: cdboot, pxeldr: make use of bootargs.h instead of
redefining flag constants
@
text
@d7 1
a7 3
SRCS=	${PROG}.S

CFLAGS+=-I${.CURDIR}/../common
@


1.14.2.3
log
@SVN rev 237812 on 2012-06-29 18:09:39Z by dim

MFC r235281:

Fix sys/boot/i386/cdboot/cdboot.S compilation with clang after r235219.
This file uses .code16 directives, which are not yet supported by
clang's integrated assembler.
@
text
@a15 4

# XXX: clang integrated-as doesn't grok .codeNN directives yet
CFLAGS.cdboot.S=	${CLANG_NO_IAS}
CFLAGS+=		${CFLAGS.${.IMPSRC:T}}
@


1.14.2.4
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/cdboot/Makefile 237812 2012-06-29 18:09:39Z dim $
@


1.14.2.3.2.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.14.2.3.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/sys/boot/i386/cdboot/Makefile 237812 2012-06-29 18:09:39Z dim $
@


1.14.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.14.2.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/sys/boot/i386/cdboot/Makefile 208789 2010-06-03 17:42:32Z ed $
@


1.13
log
@Start the dreaded NOFOO -> NO_FOO conversion.

OK'ed by:	core
@
text
@d11 1
a11 1
LDFLAGS=-N -e start -Ttext ${ORG} -Wl,-S,--oformat,binary
@


1.13.10.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/sys/boot/i386/cdboot/Makefile 139103 2004-12-21 08:47:35Z ru $
@


1.13.2.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/sys/boot/i386/cdboot/Makefile 139103 2004-12-21 08:47:35Z ru $
@


1.13.26.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.13.26.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/sys/boot/i386/cdboot/Makefile 139103 2004-12-21 08:47:35Z ru $
@


1.13.24.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.13.22.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.13.22.2
log
@SVN rev 237762 on 2012-06-29 10:10:43Z by avg

MFC r235219: cdboot, pxeldr: make use of bootargs.h instead of
redefining flag constants
@
text
@d7 1
a7 3
SRCS=	${PROG}.S

CFLAGS+=-I${.CURDIR}/../common
@


1.13.22.3
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/cdboot/Makefile 237762 2012-06-29 10:10:43Z avg $
@


1.13.22.1.8.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.13.22.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/sys/boot/i386/cdboot/Makefile 139103 2004-12-21 08:47:35Z ru $
@


1.13.22.1.6.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.13.22.1.4.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.13.22.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.13.20.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.13.18.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.13.16.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.12
log
@Thanks to David's patches, we can now simplify these makefiles
further, and just use PROG directly (without FILES).

Suggested by:	bde
@
text
@d6 1
a6 1
NOMAN=
@


1.11
log
@Removed now redundant CLEANFILES assignments.

Not read enough of my patch by:	obrien ;)
@
text
@d3 3
a5 3
PROG=	${BOOT}
INTERNALPROG=
FILES=	${BOOT}
d7 1
a7 1
SRCS=	${BOOT}.s
a8 1
BOOT=	cdboot
@


1.10
log
@Use a more compact syntax for passing the "binary" options to 'ld'.
@
text
@a7 1
CLEANFILES= ${BOOT}
@


1.9
log
@Simplify the building of our i386 'binary' boot components by directly
producing them using 'ld' options rather than post-processing with 'objcopy'.

Idea by:	Ryan Sommers <ryans@@gamersimpact.com>
@
text
@d13 1
a13 1
LDFLAGS=-N -e start -Ttext ${ORG} -Wl,-S -Wl,--oformat -Wl,binary
@


1.8
log
@- Factor out -nostdlib to an upper level Makefile.inc.

- Now that bsd.prog.mk deals with programs linked with -nostdlib
  better, and has a notion of an "internal" program, use PROG
  where possible.  This has a good impact on the contents of
  .depend files and causes programs to be linked with cc(1).

XXX: boot2 couldn't be converted as it's actually two programs.

Tested on:	i386, amd64
@
text
@d3 1
a3 1
PROG=	${BOOT}.out
d13 1
a13 4
${BOOT}: ${BOOT}.out
	objcopy -S -O binary ${BOOT}.out ${.TARGET}

LDFLAGS=-N -e start -Ttext ${ORG}
@


1.7
log
@First round of cleanups to sys/boot/ makefiles:

- do not use PROG for what's not a real C program,
- use sys.mk transformation rules where possible,
- only create the "machine" symlink on AMD64,
- removed MAINTAINER lines in individual makefiles,
- added the LIBSTAND defitinion to <bsd.libnames.mk>,
- somewhat better contents in .depend files.

Tested on:	i386, amd64
Prodded by:	bde
@
text
@d3 2
d6 3
a8 1
CLEANFILES= ${BOOT} ${BOOT}.out ${BOOT}.o
d16 1
a16 2
${BOOT}.out: ${BOOT}.o
	${LD} -N -e start -Ttext ${ORG} -o ${.TARGET} ${BOOT}.o
@


1.6
log
@Inherit BINDIR from a parent Makefile.inc.
@
text
@d3 2
a4 1
MAINTAINER=jhb@@FreeBSD.org
d6 2
a7 1
ORG=		0x7c00
d9 2
a10 3
PROG=		cdboot
NOMAN=
STRIP=
d12 2
a13 5
${PROG}: ${PROG}.o
	${LD} -N -e start -Ttext ${ORG} -o ${PROG}.out ${PROG}.o
	objcopy -S -O binary ${PROG}.out ${.TARGET}

CLEANFILES+=	${PROG}.o ${PROG}.out
@


1.5
log
@Initiate deorbit burn for the i386-only a.out related support.  Moves are
under way to move the remnants of the a.out toolchain to ports.  As the
comment in src/Makefile said, this stuff is deprecated and one should not
expect this to remain beyond 4.0-REL.  It has already lasted WAY beyond
that.

Notable exceptions:
gcc - I have not touched the a.out generation stuff there.
ldd/ldconfig - still have some code to interface with a.out rtld.
old as/ld/etc - I have not removed these yet, pending their move to ports.
some includes - necessary for ldd/ldconfig for now.

Tested on: i386 (extensively), alpha
@
text
@a9 1
BINDIR?=	/boot
@


1.4
log
@This is a new CD bootstrap utility designed to replace cdldr.  According
to the El Torito standard for CD booting, a CD may boot in "No emulation"
mode without using a floppy image.  In this mode, the BIOS loads a program
off of the CD into memory and creates a BIOS device using 2048 byte sectors
for the CD.  According to the standard, this program can be up to 0xFFFF
virtual (512-byte) sectors long.  The old cdldr depended on this by having
the BIOS load the entire loader and the small cdldr stub as one binary
similar to pxeboot so that cdldr didn't have to read the CD to find the
loader.  However, the NT no emulation loader just uses 1 disk sector
(4 virtual sectors), so it seems that at least some BIOS writers just did
enough to get NT to boot by only loading 1 sector and ignoring the sector
count.  Thus, while cdldr should have worked in theory, it doesn't in
practice.  This replacment fits entirely in 1 sector and includes simple
ISO 9660 support.  It looks for /boot/loader on the CD and loads it up
using the BIOS.  This allows us to not have to depend on the limited size
of floppy images but use a full GENERIC kernel for CD-ROM installs in the
future, among other things.

This version of cdboot is a bit bloated as it includes some useful
debugging routines that people can pull to use in other x86 assembly
modules.  Even with all the debugging cruft, we still have 272 bytes to
spare.
@
text
@a12 4
.if ${OBJFORMAT} == aout
	${LD} -nostdlib -N -s -T ${ORG} -o ${PROG}.out ${PROG}.o
	dd if=${PROG}.out of=${.TARGET} ibs=32 skip=1
.else
a14 1
.endif
@


1.4.2.1
log
@MFC the new cdboot replacement for cdldr.

Approved by:	re
@
text
@@


1.4.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/4/sys/boot/i386/cdboot/Makefile 88365 2001-12-21 21:01:41Z jhb $
@


1.3
log
@Grrr, fix a silly 'movl' -> 'movw' typo in both pxeldr and cdldr.  Also,
remove unnecessary cruft from the Makefiles for both.
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/boot/i386/cdldr/Makefile,v 1.2 2000/03/28 01:19:47 jhb Exp $
d7 1
a7 3
LDR=		cdldr
BOOT=		cdboot
PROG=		${BOOT}
d12 1
a12 13

.if exists(${.OBJDIR}/../loader)
LOADER=	${.OBJDIR}/../loader/loader
.else
LOADER=	${.CURDIR}/../loader/loader
.endif

${BOOT}: ${LDR} ${LOADER}
	cat ${LDR} ${LOADER} > ${.TARGET}.tmp
	dd if=${.TARGET}.tmp of=${.TARGET} obs=2k conv=osync
	rm ${.TARGET}.tmp

${LDR}: ${LDR}.o
d14 2
a15 2
	${LD} -nostdlib -N -s -T ${ORG} -o ${LDR}.out ${LDR}.o
	dd if=${LDR}.out of=${.TARGET} ibs=32 skip=1
d17 2
a18 2
	${LD} -N -e start -Ttext ${ORG} -o ${LDR}.out ${LDR}.o
	objcopy -S -O binary ${LDR}.out ${.TARGET}
d21 1
a21 1
CLEANFILES+= ${LDR} ${LDR}.out ${LDR}.o ${BOOT}.tmp
@


1.2
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/cdldr/Makefile,v 1.1 2000/01/27 21:21:00 jhb Exp $
a33 3

${LDR}.o: ${.CURDIR}/${LDR}.s
	${AS} ${AFLAGS} -o ${.TARGET} ${.CURDIR}/${LDR}.s
@


1.1
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$
d5 1
a5 1
ORG=0x00
d7 6
a12 1
all: cdldr
d14 13
a26 1
cdldr: cdldr.o
d28 2
a29 2
	${LD} -nostdlib -N -s -T ${ORG} -o cdldr.out cdldr.o
	dd if=cdldr.out of=${.TARGET} ibs=32 skip=1
d31 2
a32 2
	${LD} -N -e start -Ttext ${ORG} -o cdldr.out cdldr.o
	objcopy -S -O binary cdldr.out ${.TARGET}
d35 2
a36 2
cdldr.o: cdldr.s
	${AS} ${AFLAGS} -o ${.TARGET} ${.CURDIR}/cdldr.s
d38 1
a38 1
CLEANFILES+= cdldr cdldr.out cdldr.o
@


1.1.2.1
log
@MFC: sync up loader with current, including PXE.
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/boot/i386/cdldr/Makefile,v 1.1 2000/01/27 21:21:00 jhb Exp $
d5 1
a5 1
ORG=		0x7c00
d7 1
a7 6
LDR=		cdldr
BOOT=		cdboot
PROG=		${BOOT}
NOMAN=
STRIP=
BINDIR?=	/boot
d9 1
a9 13

.if exists(${.OBJDIR}/../loader)
LOADER=	${.OBJDIR}/../loader/loader
.else
LOADER=	${.CURDIR}/../loader/loader
.endif

${BOOT}: ${LDR} ${LOADER}
	cat ${LDR} ${LOADER} > ${.TARGET}.tmp
	dd if=${.TARGET}.tmp of=${.TARGET} obs=2k conv=osync
	rm ${.TARGET}.tmp

${LDR}: ${LDR}.o
d11 2
a12 2
	${LD} -nostdlib -N -s -T ${ORG} -o ${LDR}.out ${LDR}.o
	dd if=${LDR}.out of=${.TARGET} ibs=32 skip=1
d14 2
a15 2
	${LD} -N -e start -Ttext ${ORG} -o ${LDR}.out ${LDR}.o
	objcopy -S -O binary ${LDR}.out ${.TARGET}
d18 2
a19 2
${LDR}.o: ${.CURDIR}/${LDR}.s
	${AS} ${AFLAGS} -o ${.TARGET} ${.CURDIR}/${LDR}.s
d21 1
a21 1
CLEANFILES+= ${LDR} ${LDR}.out ${LDR}.o ${BOOT}.tmp
@


1.1.2.2
log
@MFC: Lots of bootstrap fixes and features:

- Add $FreeBSD$ to README
- Coment fix for the if_wx module in loader.conf
- Axe all the unneeded m4 files (yay!)
- EDD support in mbr, boot1 and boot2, and the loader
- inline functions in boot2 that are only used once to gain 68 bytes of
  free space
- emulate the WBINVD instruction in BTX
- remove cruft from the cdldr Makefile
- improve hard disk probe checking as well as lsdev enhancements in the
  loader
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/boot/i386/cdldr/Makefile,v 1.1.2.1 2000/04/15 03:09:42 ps Exp $
d34 3
@


