head	1.21;
access;
symbols
	RELENG_8_4:1.21.0.2
	RELENG_9_1_0_RELEASE:1.18.2.3.2.2
	RELENG_9_1:1.18.2.3.0.2
	RELENG_9_1_BP:1.18.2.3
	RELENG_8_3_0_RELEASE:1.16.30.1.8.1
	RELENG_8_3:1.16.30.1.0.8
	RELENG_8_3_BP:1.16.30.1
	RELENG_9_0_0_RELEASE:1.18.2.1.2.1
	RELENG_9_0:1.18.2.1.0.2
	RELENG_9_0_BP:1.18.2.1
	RELENG_9:1.18.0.2
	RELENG_9_BP:1.18
	RELENG_7_4_0_RELEASE:1.16.34.1
	RELENG_8_2_0_RELEASE:1.16.30.1.6.1
	RELENG_7_4:1.16.0.34
	RELENG_7_4_BP:1.16
	RELENG_8_2:1.16.30.1.0.6
	RELENG_8_2_BP:1.16.30.1
	RELENG_8_1_0_RELEASE:1.16.30.1.4.1
	RELENG_8_1:1.16.30.1.0.4
	RELENG_8_1_BP:1.16.30.1
	RELENG_7_3_0_RELEASE:1.16.32.1
	RELENG_7_3:1.16.0.32
	RELENG_7_3_BP:1.16
	RELENG_8_0_0_RELEASE:1.16.30.1.2.1
	RELENG_8_0:1.16.30.1.0.2
	RELENG_8_0_BP:1.16.30.1
	RELENG_8:1.16.0.30
	RELENG_8_BP:1.16
	RELENG_7_2_0_RELEASE:1.16.28.1
	RELENG_7_2:1.16.0.28
	RELENG_7_2_BP:1.16
	RELENG_7_1_0_RELEASE:1.16.26.1
	RELENG_6_4_0_RELEASE:1.16.24.1
	RELENG_7_1:1.16.0.26
	RELENG_7_1_BP:1.16
	RELENG_6_4:1.16.0.24
	RELENG_6_4_BP:1.16
	RELENG_7_0_0_RELEASE:1.16
	RELENG_6_3_0_RELEASE:1.16
	RELENG_7_0:1.16.0.22
	RELENG_7_0_BP:1.16
	RELENG_6_3:1.16.0.20
	RELENG_6_3_BP:1.16
	RELENG_7:1.16.0.18
	RELENG_7_BP:1.16
	RELENG_6_2_0_RELEASE:1.16
	RELENG_6_2:1.16.0.16
	RELENG_6_2_BP:1.16
	RELENG_5_5_0_RELEASE:1.16
	RELENG_5_5:1.16.0.14
	RELENG_5_5_BP:1.16
	RELENG_6_1_0_RELEASE:1.16
	RELENG_6_1:1.16.0.12
	RELENG_6_1_BP:1.16
	RELENG_6_0_0_RELEASE:1.16
	RELENG_6_0:1.16.0.10
	RELENG_6_0_BP:1.16
	RELENG_6:1.16.0.8
	RELENG_6_BP:1.16
	RELENG_5_4_0_RELEASE:1.16
	RELENG_5_4:1.16.0.6
	RELENG_5_4_BP:1.16
	RELENG_4_11_0_RELEASE:1.1.2.5
	RELENG_4_11:1.1.2.5.0.16
	RELENG_4_11_BP:1.1.2.5
	RELENG_5_3_0_RELEASE:1.16
	RELENG_5_3:1.16.0.4
	RELENG_5_3_BP:1.16
	RELENG_5:1.16.0.2
	RELENG_5_BP:1.16
	RELENG_4_10_0_RELEASE:1.1.2.5
	RELENG_4_10:1.1.2.5.0.14
	RELENG_4_10_BP:1.1.2.5
	RELENG_5_2_1_RELEASE:1.9
	RELENG_5_2_0_RELEASE:1.9
	RELENG_5_2:1.9.0.2
	RELENG_5_2_BP:1.9
	RELENG_4_9_0_RELEASE:1.1.2.5
	RELENG_4_9:1.1.2.5.0.12
	RELENG_4_9_BP:1.1.2.5
	RELENG_5_1_0_RELEASE:1.8
	RELENG_5_1:1.8.0.4
	RELENG_5_1_BP:1.8
	RELENG_4_8_0_RELEASE:1.1.2.5
	RELENG_4_8:1.1.2.5.0.10
	RELENG_4_8_BP:1.1.2.5
	RELENG_5_0_0_RELEASE:1.8
	RELENG_5_0:1.8.0.2
	RELENG_5_0_BP:1.8
	RELENG_4_7_0_RELEASE:1.1.2.5
	RELENG_4_7:1.1.2.5.0.8
	RELENG_4_7_BP:1.1.2.5
	RELENG_4_6_2_RELEASE:1.1.2.5
	RELENG_4_6_1_RELEASE:1.1.2.5
	RELENG_4_6_0_RELEASE:1.1.2.5
	RELENG_4_6:1.1.2.5.0.6
	RELENG_4_6_BP:1.1.2.5
	RELENG_4_5_0_RELEASE:1.1.2.5
	RELENG_4_5:1.1.2.5.0.4
	RELENG_4_5_BP:1.1.2.5
	RELENG_4_4_0_RELEASE:1.1.2.5
	RELENG_4_4:1.1.2.5.0.2
	RELENG_4_4_BP:1.1.2.5
	KSE_MILESTONE_2:1.6
	KSE_PRE_MILESTONE_2:1.6
	RELENG_4_3_0_RELEASE:1.1.2.4
	RELENG_4_3:1.1.2.4.0.2
	RELENG_4_3_BP:1.1.2.4
	RELENG_4_2_0_RELEASE:1.1.2.3
	RELENG_4_1_1_RELEASE:1.1.2.3
	PRE_SMPNG:1.4
	RELENG_4_1_0_RELEASE:1.1.2.3
	RELENG_4:1.1.0.2;
locks; strict;
comment	@# @;


1.21
date	2012.11.17.01.51.18;	author svnexp;	state Exp;
branches
	1.21.2.1;
next	1.20;

1.20
date	2012.05.10.09.47.04;	author avg;	state Exp;
branches;
next	1.19;

1.19
date	2012.02.28.18.30.18;	author dim;	state Exp;
branches;
next	1.18;

1.18
date	2011.02.20.19.33.47;	author dim;	state Exp;
branches
	1.18.2.1;
next	1.17;

1.17
date	2010.06.14.17.02.19;	author rdivacky;	state Exp;
branches;
next	1.16;

1.16
date	2004.04.27.19.45.16;	author ru;	state Exp;
branches
	1.16.8.1
	1.16.18.1
	1.16.24.1
	1.16.26.1
	1.16.28.1
	1.16.30.1
	1.16.32.1
	1.16.34.1;
next	1.15;

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

1.14
date	2004.04.25.19.50.20;	author obrien;	state Exp;
branches;
next	1.13;

1.13
date	2004.02.11.08.42.38;	author ru;	state Exp;
branches;
next	1.12;

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

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

1.10
date	2004.02.06.12.58.32;	author ru;	state Exp;
branches;
next	1.9;

1.9
date	2003.09.03.08.12.20;	author phk;	state Exp;
branches;
next	1.8;

1.8
date	2002.09.17.01.48.56;	author peter;	state Exp;
branches;
next	1.7;

1.7
date	2002.08.29.23.37.44;	author peter;	state Exp;
branches;
next	1.6;

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

1.5
date	2000.11.30.14.55.10;	author ps;	state Exp;
branches;
next	1.4;

1.4
date	2000.07.07.20.37.11;	author jhb;	state Exp;
branches;
next	1.3;

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

1.2
date	2000.05.02.05.01.37;	author dwhite;	state Exp;
branches;
next	1.1;

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

1.21.2.1
date	2012.11.17.01.51.18;	author svnexp;	state dead;
branches;
next	1.21.2.2;

1.21.2.2
date	2013.03.28.13.04.02;	author svnexp;	state Exp;
branches;
next	;

1.18.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.18.2.1.2.1;
next	1.18.2.2;

1.18.2.2
date	2012.03.13.18.39.57;	author dim;	state Exp;
branches;
next	1.18.2.3;

1.18.2.3
date	2012.06.29.10.10.16;	author avg;	state Exp;
branches
	1.18.2.3.2.1;
next	1.18.2.4;

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

1.18.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.18.2.1.2.2;

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

1.18.2.3.2.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.18.2.3.2.2;

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

1.16.8.1
date	2012.11.17.07.42.39;	author svnexp;	state Exp;
branches;
next	;

1.16.18.1
date	2012.11.17.08.04.54;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.16.30.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.16.30.1.2.1
	1.16.30.1.4.1
	1.16.30.1.6.1
	1.16.30.1.8.1;
next	1.16.30.2;

1.16.30.2
date	2012.06.29.10.10.43;	author avg;	state Exp;
branches;
next	1.16.30.3;

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

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

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

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

1.16.30.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.16.30.1.8.2;

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

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

1.16.34.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.16.34.2;

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

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

1.1.2.2
date	2000.05.09.16.32.58;	author ps;	state Exp;
branches;
next	1.1.2.3;

1.1.2.3
date	2000.07.06.23.54.54;	author obrien;	state Exp;
branches;
next	1.1.2.4;

1.1.2.4
date	2000.12.22.06.59.23;	author ps;	state Exp;
branches;
next	1.1.2.5;

1.1.2.5
date	2001.04.25.11.24.01;	author ru;	state Exp;
branches;
next	1.1.2.6;

1.1.2.6
date	2012.11.17.07.25.21;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.21
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/sys/boot/i386/pxeldr/Makefile 235219 2012-05-10 09:47:04Z avg $

# Pick up ../Makefile.inc early.
.include <bsd.init.mk>

PROG=	${LDR}
INTERNALPROG=
FILES=	${BOOT}
MAN=	${BOOT}.8
SRCS=	${LDR}.S
CLEANFILES= ${BOOT}

BOOT=	pxeboot
LDR=	pxeldr
ORG=	0x7c00
LOADER=	loader

.if defined(BOOT_PXELDR_PROBE_KEYBOARD)
CFLAGS+=-DPROBE_KEYBOARD
.endif

.if defined(BOOT_PXELDR_ALWAYS_SERIAL)
CFLAGS+=-DALWAYS_SERIAL
.endif

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

LOADERBIN= ${.OBJDIR}/../loader/loader.bin

CLEANFILES+= ${BOOT}.tmp

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

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

CLEANFILES+= ${LOADER}

${LOADER}: ${LOADERBIN} ${BTXLDR} ${BTXKERN}
	btxld -v -f aout -e ${LOADER_ADDRESS} -o ${.TARGET} -l ${BTXLDR} \
	    -b ${BTXKERN} ${LOADERBIN}

.include <bsd.prog.mk>

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


1.21.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:04:02 +0000
@
text
@d1 49
@


1.21.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 45
# $FreeBSD: releng/8.4/sys/boot/i386/pxeldr/Makefile 237762 2012-06-29 10:10:43Z avg $

# Pick up ../Makefile.inc early.
.include <bsd.init.mk>

PROG=	${LDR}
INTERNALPROG=
FILES=	${BOOT}
MAN=	${BOOT}.8
SRCS=	${LDR}.S
CLEANFILES= ${BOOT}

BOOT=	pxeboot
LDR=	pxeldr
ORG=	0x7c00
LOADER=	loader

.if defined(BOOT_PXELDR_PROBE_KEYBOARD)
CFLAGS+=-DPROBE_KEYBOARD
.endif

.if defined(BOOT_PXELDR_ALWAYS_SERIAL)
CFLAGS+=-DALWAYS_SERIAL
.endif

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

LOADERBIN= ${.OBJDIR}/../loader/loader.bin

CLEANFILES+= ${BOOT}.tmp

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

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

CLEANFILES+= ${LOADER}

${LOADER}: ${LOADERBIN} ${BTXLDR} ${BTXKERN}
	btxld -v -f aout -e ${LOADER_ADDRESS} -o ${.TARGET} -l ${BTXLDR} \
	    -b ${BTXKERN} ${LOADERBIN}

.include <bsd.prog.mk>
@


1.20
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
@d1 1
a1 1
# $FreeBSD$
@


1.19
log
@SVN rev 232263 on 2012-02-28 18:30:18Z by dim

Define several extra macros in bsd.sys.mk and sys/conf/kern.pre.mk, to
get rid of testing explicitly for clang (using ${CC:T:Mclang}) in
individual Makefiles.

Instead, use the following extra macros, for use with clang:
- NO_WERROR.clang       (disables -Werror)
- NO_WCAST_ALIGN.clang  (disables -Wcast-align)
- NO_WFORMAT.clang	(disables -Wformat and friends)
- CLANG_NO_IAS		(disables integrated assembler)
- CLANG_OPT_SMALL	(adds flags for extra small size optimizations)

As a side effect, this enables setting CC/CXX/CPP in src.conf instead of
make.conf!  For clang, use the following:

CC=clang
CXX=clang++
CPP=clang-cpp

MFC after:	2 weeks
@
text
@d26 2
@


1.18
log
@SVN rev 218893 on 2011-02-20 19:33:47Z by dim

Upgrade our copy of llvm/clang to r126079, from upstream's trunk.

This contains many improvements, primarily better C++ support, an
integrated assembler for x86 and support for -pg.
@
text
@a25 5
.if ${CC:T:Mclang} == "clang"
# XXX: clang integrated-as doesn't grok .codeNN directives yet
CFLAGS+=${.IMPSRC:T:Mpxeldr.S:C/^.+$/-no-integrated-as/}
.endif

d44 4
@


1.18.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.18.2.2
log
@SVN rev 232930 on 2012-03-13 18:39:57Z by dim

MFC r232263:

Define several extra macros in bsd.sys.mk and sys/conf/kern.pre.mk, to
get rid of testing explicitly for clang (using ${CC:T:Mclang}) in
individual Makefiles.

Instead, use the following extra macros, for use with clang:
- NO_WERROR.clang       (disables -Werror)
- NO_WCAST_ALIGN.clang  (disables -Wcast-align)
- NO_WFORMAT.clang	(disables -Wformat and friends)
- CLANG_NO_IAS		(disables integrated assembler)
- CLANG_OPT_SMALL	(adds flags for extra small size optimizations)

As a side effect, this enables setting CC/CXX/CPP in src.conf instead of
make.conf!  For clang, use the following:

CC=clang
CXX=clang++
CPP=clang-cpp
@
text
@d26 5
a48 4

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


1.18.2.3
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
@a25 2
CFLAGS+=-I${.CURDIR}/../common

@


1.18.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/pxeldr/Makefile 237761 2012-06-29 10:10:16Z avg $
@


1.18.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.18.2.3.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/sys/boot/i386/pxeldr/Makefile 237761 2012-06-29 10:10:16Z avg $
@


1.18.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.18.2.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/sys/boot/i386/pxeldr/Makefile 218893 2011-02-20 19:33:47Z dim $
@


1.17
log
@SVN rev 209162 on 2010-06-14 17:02:19Z by rdivacky

Pass the -N flag to linked via -Wl.

Approved by:	ed (mentor)
@
text
@d26 5
@


1.16
log
@Removed now redundant CLEANFILES assignments.

Not read enough of my patch by:	obrien ;)
@
text
@d35 1
a35 1
LDFLAGS+= -N -e start -Ttext ${ORG} -Wl,-S,--oformat,binary
@


1.16.18.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/sys/boot/i386/pxeldr/Makefile 128694 2004-04-27 19:45:16Z ru $
@


1.16.8.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/sys/boot/i386/pxeldr/Makefile 128694 2004-04-27 19:45:16Z ru $
@


1.16.34.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.16.34.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/sys/boot/i386/pxeldr/Makefile 128694 2004-04-27 19:45:16Z ru $
@


1.16.32.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.16.30.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.16.30.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
@a25 2
CFLAGS+=-I${.CURDIR}/../common

@


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


1.16.30.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.16.30.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/sys/boot/i386/pxeldr/Makefile 128694 2004-04-27 19:45:16Z ru $
@


1.16.30.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.16.30.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.16.30.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.16.28.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.16.26.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.16.24.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.15
log
@Use a more compact syntax for passing the "binary" options to 'ld'.
@
text
@a34 2
CLEANFILES+= ${LDR}

@


1.14
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
@d37 1
a37 1
LDFLAGS+= -N -e start -Ttext ${ORG} -Wl,-S -Wl,--oformat -Wl,binary
@


1.13
log
@Get rid of unnecessary use of m4(1) by using cpp(1) instead.
(John tells me there were problems when trying this before,
but it appears to be safe these day.)

OK'ed by:	jhb
Repocopied by:	joe
@
text
@d6 1
a6 1
PROG=	${LDR}.out
d37 1
a37 4
${LDR}: ${LDR}.out
	objcopy -S -O binary ${LDR}.out ${.TARGET}

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


1.12
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
@d10 1
a10 1
SRCS=	${LDR}.s
a16 1
M4?=	m4
d19 1
a19 1
M4FLAGS+= -DPROBE_KEYBOARD
d23 1
a23 1
M4FLAGS+= -DALWAYS_SERIAL
a40 4

${LDR}.o: ${LDR}.s
	(cd ${.CURDIR}; ${M4} ${M4FLAGS} ${LDR}.s) | \
	    ${AS} ${AFLAGS} -o ${.TARGET}
@


1.11
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
@d6 2
d10 1
a26 1
.if exists(${.OBJDIR}/../loader)
a27 3
.else
LOADERBIN= ${.CURDIR}/../loader/loader.bin
.endif
d36 1
a36 1
CLEANFILES+= ${LDR} ${LDR}.out ${LDR}.o
d41 1
a41 2
${LDR}.out: ${LDR}.o
	${LD} -N -e start -Ttext ${ORG} -o ${.TARGET} ${LDR}.o
@


1.10
log
@Inherit BINDIR from a parent Makefile.inc.
@
text
@d3 2
a4 1
MAINTAINER=jhb@@FreeBSD.org
d6 9
a14 9
ORG=		0x7c00

LDR=		pxeldr
BOOT=		pxeboot
LOADER=		loader
PROG=		${BOOT}
MAN=		${BOOT}.8
STRIP=
M4?=		m4
d17 1
a17 1
M4FLAGS+=	-DPROBE_KEYBOARD
d21 1
a21 1
M4FLAGS+=	-DALWAYS_SERIAL
a23 1

d25 1
a25 1
LOADERBIN=	${.OBJDIR}/../loader/loader.bin
d27 1
a27 1
LOADERBIN=	${.CURDIR}/../loader/loader.bin
d30 1
a30 9
# BTX components
.if exists(${.OBJDIR}/../btx)
BTXDIR=		${.OBJDIR}/../btx
.else
BTXDIR=		${.CURDIR}/../btx
.endif
BTXLDR=		${BTXDIR}/btxldr/btxldr
BTXKERN=	${BTXDIR}/btx/btx
BTXCRT=		${BTXDIR}/lib/crt0.o
d37 1
a37 3
${LOADER}: ${LOADERBIN} ${BTXLDR} ${BTXKERN} ${BTXCRT}
	btxld -v -f aout -e ${LOADER_ADDRESS} -o ${.TARGET} -l ${BTXLDR} \
	    -b ${BTXKERN} ${LOADERBIN}
d39 1
a39 2
${LDR}: ${LDR}.o
	${LD} -N -e start -Ttext ${ORG} -o ${LDR}.out ${LDR}.o
d42 3
d47 3
a49 1
	   ${AS} ${AFLAGS} -o ${.TARGET}
d51 3
a53 1
CLEANFILES+= ${LDR} ${LDR}.out ${LDR}.o ${BOOT}.tmp ${LOADER}
@


1.9
log
@Add BOOT_PXELDR_ALWAYS_SERIAL option which forces serial console.
@
text
@a12 1
BINDIR?=	/boot
@


1.8
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
@d20 5
@


1.7
log
@Try #2 at having /boot/loader default to ELF.  Have pxeldr build its
own a.out version of loader.bin rather than depend on ../loader/loader
being a.out.
@
text
@a45 4
.if ${OBJFORMAT} == aout
	${LD} -nostdlib -N -s -T ${ORG} -o ${LDR}.out ${LDR}.o
	dd if=${LDR}.out of=${.TARGET} ibs=32 skip=1
.else
a47 1
.endif
@


1.6
log
@MAN[1-9] -> MAN.
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/boot/i386/pxeldr/Makefile,v 1.5 2000/11/30 14:55:10 ps Exp $
d9 1
d21 1
a21 1
LOADER=	${.OBJDIR}/../loader/loader
d23 1
a23 1
LOADER=	${.CURDIR}/../loader/loader
d26 10
d41 4
d58 1
a58 1
CLEANFILES+= ${LDR} ${LDR}.out ${LDR}.o ${BOOT}.tmp
@


1.5
log
@Add support for probing the keyboard from pxeboot which will behave
exactly the same as passing -P to boot2.

Submitted by:	jhb
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/boot/i386/pxeldr/Makefile,v 1.4 2000/07/07 20:37:11 jhb Exp $
d10 1
a10 1
MAN8=		${BOOT}.8
@


1.4
log
@Remove commented out NOMAN variable.
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/boot/i386/pxeldr/Makefile,v 1.3 2000/05/23 12:31:32 jhb Exp $
d13 1
d15 3
d38 4
@


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/pxeldr/Makefile,v 1.2 2000/05/02 05:01:37 dwhite Exp $
a10 1
# NOMAN=
@


1.2
log
@Add man page for pxeboot.

Reviewed By:	asmodai
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/boot/i386/pxeldr/Makefile,v 1.1 2000/03/28 01:19:52 jhb Exp $
a34 3

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


1.1
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$
d10 2
a11 1
NOMAN=
@


1.1.2.1
log
@MFC: sync up loader with current, including PXE.
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/boot/i386/pxeldr/Makefile,v 1.1 2000/03/28 01:19:52 jhb Exp $
@


1.1.2.2
log
@MFC: Install the pxeboot manpage
@
text
@d1 1
a1 1
# $FreeBSD$
d10 1
a10 2
MAN8=		${BOOT}.8
# NOMAN=
@


1.1.2.3
log
@MFC: rev 1.3 (clean up cruft)
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/boot/i386/pxeldr/Makefile,v 1.1.2.2 2000/05/09 16:32:58 ps Exp $
d11 1
d35 3
@


1.1.2.4
log
@MFC: Add support for probing the keyboard from pxeboot.
@
text
@d1 1
a1 1
# $FreeBSD$
a12 1
M4?=		m4
a13 3
.if defined(BOOT_PXELDR_PROBE_KEYBOARD)
M4FLAGS+=	-DPROBE_KEYBOARD
.endif
a33 4

${LDR}.o: ${LDR}.s
	(cd ${.CURDIR}; ${M4} ${M4FLAGS} ${LDR}.s) | \
	   ${AS} ${AFLAGS} -o ${.TARGET}
@


1.1.2.5
log
@MFC: MAN[1-9] -> MAN.
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/boot/i386/pxeldr/Makefile,v 1.1.2.4 2000/12/22 06:59:23 ps Exp $
d10 1
a10 1
MAN=		${BOOT}.8
@


1.1.2.6
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/4/sys/boot/i386/pxeldr/Makefile 75957 2001-04-25 11:29:51Z ru $
@


