head	1.30;
access;
symbols
	RELENG_8_4:1.30.0.2
	RELENG_9_1_0_RELEASE:1.27.2.2.2.2
	RELENG_9_1:1.27.2.2.0.2
	RELENG_9_1_BP:1.27.2.2
	RELENG_8_3_0_RELEASE:1.26.2.2.6.1
	RELENG_8_3:1.26.2.2.0.6
	RELENG_8_3_BP:1.26.2.2
	RELENG_9_0_0_RELEASE:1.27.2.1.2.1
	RELENG_9_0:1.27.2.1.0.2
	RELENG_9_0_BP:1.27.2.1
	RELENG_9:1.27.0.2
	RELENG_9_BP:1.27
	RELENG_7_4_0_RELEASE:1.24.2.1.4.1
	RELENG_8_2_0_RELEASE:1.26.2.2.4.1
	RELENG_7_4:1.24.2.1.0.4
	RELENG_7_4_BP:1.24.2.1
	RELENG_8_2:1.26.2.2.0.4
	RELENG_8_2_BP:1.26.2.2
	RELENG_8_1_0_RELEASE:1.26.2.2.2.1
	RELENG_8_1:1.26.2.2.0.2
	RELENG_8_1_BP:1.26.2.2
	RELENG_7_3_0_RELEASE:1.24.2.1.2.1
	RELENG_7_3:1.24.2.1.0.2
	RELENG_7_3_BP:1.24.2.1
	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.24.8.1
	RELENG_7_2:1.24.0.8
	RELENG_7_2_BP:1.24
	RELENG_7_1_0_RELEASE:1.24.6.1
	RELENG_6_4_0_RELEASE:1.22.2.1.6.1
	RELENG_7_1:1.24.0.6
	RELENG_7_1_BP:1.24
	RELENG_6_4:1.22.2.1.0.6
	RELENG_6_4_BP:1.22.2.1
	RELENG_7_0_0_RELEASE:1.24
	RELENG_6_3_0_RELEASE:1.22.2.1
	RELENG_7_0:1.24.0.4
	RELENG_7_0_BP:1.24
	RELENG_6_3:1.22.2.1.0.4
	RELENG_6_3_BP:1.22.2.1
	RELENG_7:1.24.0.2
	RELENG_7_BP:1.24
	RELENG_6_2_0_RELEASE:1.22.2.1
	RELENG_6_2:1.22.2.1.0.2
	RELENG_6_2_BP:1.22.2.1
	RELENG_5_5_0_RELEASE:1.20.2.1
	RELENG_5_5:1.20.2.1.0.4
	RELENG_5_5_BP:1.20.2.1
	RELENG_6_1_0_RELEASE:1.22
	RELENG_6_1:1.22.0.6
	RELENG_6_1_BP:1.22
	RELENG_6_0_0_RELEASE:1.22
	RELENG_6_0:1.22.0.4
	RELENG_6_0_BP:1.22
	RELENG_6:1.22.0.2
	RELENG_6_BP:1.22
	RELENG_5_4_0_RELEASE:1.20.2.1
	RELENG_5_4:1.20.2.1.0.2
	RELENG_5_4_BP:1.20.2.1
	RELENG_4_11_0_RELEASE:1.3.2.5
	RELENG_4_11:1.3.2.5.0.10
	RELENG_4_11_BP:1.3.2.5
	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.3.2.5
	RELENG_4_10:1.3.2.5.0.8
	RELENG_4_10_BP:1.3.2.5
	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.3.2.5
	RELENG_4_9:1.3.2.5.0.6
	RELENG_4_9_BP:1.3.2.5
	RELENG_5_1_0_RELEASE:1.14
	RELENG_5_1:1.14.0.2
	RELENG_5_1_BP:1.14
	RELENG_4_8_0_RELEASE:1.3.2.5
	RELENG_4_8:1.3.2.5.0.4
	RELENG_4_8_BP:1.3.2.5
	RELENG_5_0_0_RELEASE:1.13
	RELENG_5_0:1.13.0.2
	RELENG_5_0_BP:1.13
	RELENG_4_7_0_RELEASE:1.3.2.5
	RELENG_4_7:1.3.2.5.0.2
	RELENG_4_7_BP:1.3.2.5
	RELENG_4_6_2_RELEASE:1.3.2.4
	RELENG_4_6_1_RELEASE:1.3.2.4
	RELENG_4_6_0_RELEASE:1.3.2.4
	RELENG_4_6:1.3.2.4.0.4
	RELENG_4_6_BP:1.3.2.4
	RELENG_4_5_0_RELEASE:1.3.2.4
	RELENG_4_5:1.3.2.4.0.2
	RELENG_4_5_BP:1.3.2.4
	RELENG_4_4_0_RELEASE:1.3.2.3
	RELENG_4_4:1.3.2.3.0.4
	RELENG_4_4_BP:1.3.2.3
	KSE_MILESTONE_2:1.5
	KSE_PRE_MILESTONE_2:1.5
	RELENG_4_3_0_RELEASE:1.3.2.3
	RELENG_4_3:1.3.2.3.0.2
	RELENG_4_3_BP:1.3.2.3
	RELENG_4_2_0_RELEASE:1.3.2.2
	RELENG_4_1_1_RELEASE:1.3.2.2
	PRE_SMPNG:1.4
	RELENG_4_1_0_RELEASE:1.3.2.1
	RELENG_3_5_0_RELEASE:1.1.2.2
	RELENG_4_0_0_RELEASE:1.3
	RELENG_4:1.3.0.2
	RELENG_4_BP:1.3
	RELENG_3_4_0_RELEASE:1.1.2.2
	RELENG_3_3_0_RELEASE:1.1.2.2
	RELENG_3_2_PAO:1.1.2.1.0.2
	RELENG_3_2_PAO_BP:1.1.2.1
	RELENG_3_2_0_RELEASE:1.1.2.1
	POST_VFS_BIO_NFS_PATCH:1.1
	PRE_VFS_BIO_NFS_PATCH:1.1
	POST_SMP_VMSHARE:1.1
	PRE_SMP_VMSHARE:1.1
	POST_NEWBUS:1.1
	PRE_NEWBUS:1.1
	RELENG_3_1_0_RELEASE:1.1.2.1
	RELENG_3:1.1.0.2;
locks; strict;
comment	@# @;


1.30
date	2012.11.17.01.51.19;	author svnexp;	state Exp;
branches
	1.30.2.1;
next	1.29;

1.29
date	2012.08.05.14.48.55;	author nyan;	state Exp;
branches;
next	1.28;

1.28
date	2012.05.13.11.34.05;	author avg;	state Exp;
branches;
next	1.27;

1.27
date	2009.12.31.12.05.48;	author nyan;	state Exp;
branches
	1.27.2.1;
next	1.26;

1.26
date	2009.03.19.13.53.42;	author nyan;	state Exp;
branches
	1.26.2.1;
next	1.25;

1.25
date	2008.02.29.05.06.06;	author nyan;	state Exp;
branches;
next	1.24;

1.24
date	2006.04.11.20.11.30;	author jhb;	state Exp;
branches
	1.24.2.1
	1.24.6.1
	1.24.8.1;
next	1.23;

1.23
date	2005.12.20.08.54.30;	author sobomax;	state Exp;
branches;
next	1.22;

1.22
date	2005.05.08.14.17.28;	author nyan;	state Exp;
branches
	1.22.2.1;
next	1.21;

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

1.20
date	2004.02.07.14.35.33;	author ru;	state Exp;
branches
	1.20.2.1;
next	1.19;

1.19
date	2004.02.07.12.19.44;	author nyan;	state Exp;
branches;
next	1.18;

1.18
date	2003.07.02.12.45.45;	author ru;	state Exp;
branches;
next	1.17;

1.17
date	2003.06.08.03.16.59;	author nyan;	state Exp;
branches;
next	1.16;

1.16
date	2003.06.07.17.42.26;	author obrien;	state Exp;
branches;
next	1.15;

1.15
date	2003.06.07.08.23.42;	author nyan;	state Exp;
branches;
next	1.14;

1.14
date	2003.05.01.13.17.06;	author nyan;	state Exp;
branches;
next	1.13;

1.13
date	2002.08.29.02.02.28;	author peter;	state Exp;
branches;
next	1.12;

1.12
date	2002.05.21.09.44.52;	author nyan;	state Exp;
branches;
next	1.11;

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

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

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

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

1.7
date	2001.11.06.12.31.05;	author nyan;	state Exp;
branches;
next	1.6;

1.6
date	2001.09.16.05.22.27;	author nyan;	state Exp;
branches;
next	1.5;

1.5
date	2000.09.22.12.49.15;	author kato;	state Exp;
branches;
next	1.4;

1.4
date	2000.04.23.09.33.30;	author nyan;	state Exp;
branches;
next	1.3;

1.3
date	99.11.03.08.23.57;	author nyan;	state Exp;
branches
	1.3.2.1;
next	1.2;

1.2
date	99.08.28.00.40.34;	author peter;	state Exp;
branches;
next	1.1;

1.1
date	99.02.03.08.39.09;	author kato;	state Exp;
branches
	1.1.2.1;
next	;

1.30.2.1
date	2012.11.17.01.51.19;	author svnexp;	state dead;
branches;
next	1.30.2.2;

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

1.27.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.27.2.1.2.1;
next	1.27.2.2;

1.27.2.2
date	2012.06.29.10.28.46;	author avg;	state Exp;
branches
	1.27.2.2.2.1;
next	1.27.2.3;

1.27.2.3
date	2012.11.17.11.36.48;	author svnexp;	state Exp;
branches;
next	1.27.2.4;

1.27.2.4
date	2012.11.23.13.39.52;	author svnexp;	state Exp;
branches;
next	;

1.27.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.27.2.1.2.2;

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

1.27.2.2.2.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.27.2.2.2.2;

1.27.2.2.2.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	2010.01.15.11.26.20;	author nyan;	state Exp;
branches
	1.26.2.2.2.1
	1.26.2.2.4.1
	1.26.2.2.6.1;
next	1.26.2.3;

1.26.2.3
date	2012.06.29.10.28.40;	author avg;	state Exp;
branches;
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.5;

1.26.2.5
date	2012.11.23.13.38.49;	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.2.2.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

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

1.26.2.2.6.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.26.2.2.6.2;

1.26.2.2.6.2
date	2012.11.17.08.25.08;	author svnexp;	state Exp;
branches;
next	;

1.24.2.1
date	2010.01.15.11.28.36;	author nyan;	state Exp;
branches
	1.24.2.1.2.1
	1.24.2.1.4.1;
next	1.24.2.2;

1.24.2.2
date	2012.11.17.08.04.55;	author svnexp;	state Exp;
branches;
next	;

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

1.24.2.1.4.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.24.2.1.4.2;

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

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

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

1.22.2.1
date	2006.10.01.12.07.07;	author ru;	state Exp;
branches
	1.22.2.1.6.1;
next	1.22.2.2;

1.22.2.2
date	2010.01.15.11.32.52;	author nyan;	state Exp;
branches;
next	1.22.2.3;

1.22.2.3
date	2012.11.17.07.42.41;	author svnexp;	state Exp;
branches;
next	;

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

1.20.2.1
date	2005.02.13.07.23.31;	author obrien;	state Exp;
branches;
next	;

1.3.2.1
date	2000.05.05.08.59.03;	author nyan;	state Exp;
branches;
next	1.3.2.2;

1.3.2.2
date	2000.09.23.01.42.58;	author nyan;	state Exp;
branches;
next	1.3.2.3;

1.3.2.3
date	2000.12.30.12.01.06;	author nyan;	state Exp;
branches;
next	1.3.2.4;

1.3.2.4
date	2001.12.22.15.08.07;	author nyan;	state Exp;
branches;
next	1.3.2.5;

1.3.2.5
date	2002.07.19.18.46.29;	author ru;	state Exp;
branches;
next	1.3.2.6;

1.3.2.6
date	2012.11.17.07.25.23;	author svnexp;	state Exp;
branches;
next	;

1.1.2.1
date	99.02.06.07.37.14;	author kato;	state Exp;
branches;
next	1.1.2.2;

1.1.2.2
date	99.08.29.16.21.27;	author peter;	state Exp;
branches;
next	;


desc
@@


1.30
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/sys/boot/pc98/libpc98/Makefile 239069 2012-08-05 14:48:55Z nyan $
#
LIB=			pc98
INTERNALLIB=

.PATH:	${.CURDIR}/../../i386/libi386

SRCS=	bioscd.c biosdisk.c biosmem.c biospnp.c \
	biospci.c biossmap.c bootinfo.c bootinfo32.c \
	comconsole.c devicename.c elf32_freebsd.c \
	i386_copy.c i386_module.c nullconsole.c pc98_sys.c pxe.c pxetramp.s \
	time.c vidconsole.c
.PATH:	${.CURDIR}/../../zfs
SRCS+=	devicename_stubs.c

# Enable PXE TFTP or NFS support, not both.
.if defined(LOADER_TFTP_SUPPORT)
CFLAGS+=	-DLOADER_TFTP_SUPPORT
.else
CFLAGS+=	-DLOADER_NFS_SUPPORT
.endif

BOOT_COMCONSOLE_PORT?= 0x238
CFLAGS+=	-DCOMPORT=${BOOT_COMCONSOLE_PORT}

BOOT_COMCONSOLE_SPEED?= 9600
CFLAGS+=	-DCOMSPEED=${BOOT_COMCONSOLE_SPEED}

.ifdef(BOOT_BIOSDISK_DEBUG)
# Make the disk code more talkative
CFLAGS+= -DDISK_DEBUG
.endif

# Include simple terminal emulation (cons25-compatible)
CFLAGS+= -DTERM_EMU

# XXX: make alloca() useable
CFLAGS+= -Dalloca=__builtin_alloca

CFLAGS+=	-I${.CURDIR}/../../common \
		-I${.CURDIR}/../btx/lib \
		-I${.CURDIR}/../../i386/libi386 \
		-I${.CURDIR}/../../.. -I.
# the location of libstand
CFLAGS+=	-I${.CURDIR}/../../../../lib/libstand/

.include <bsd.lib.mk>
@


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


1.30.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 47
# $FreeBSD: releng/8.4/sys/boot/pc98/libpc98/Makefile 243449 2012-11-23 13:36:09Z nyan $
#
LIB=			pc98
INTERNALLIB=

.PATH:	${.CURDIR}/../../i386/libi386

SRCS=	bioscd.c biosdisk.c biosmem.c biospnp.c \
	biospci.c biossmap.c bootinfo.c bootinfo32.c \
	comconsole.c devicename.c elf32_freebsd.c \
	i386_copy.c i386_module.c nullconsole.c pc98_sys.c pxe.c pxetramp.s \
	time.c vidconsole.c
.PATH:	${.CURDIR}/../../zfs
SRCS+=	devicename_stubs.c

# Enable PXE TFTP or NFS support, not both.
.if defined(LOADER_TFTP_SUPPORT)
CFLAGS+=	-DLOADER_TFTP_SUPPORT
.else
CFLAGS+=	-DLOADER_NFS_SUPPORT
.endif

BOOT_COMCONSOLE_PORT?= 0x238
CFLAGS+=	-DCOMPORT=${BOOT_COMCONSOLE_PORT}

BOOT_COMCONSOLE_SPEED?= 9600
CFLAGS+=	-DCOMSPEED=${BOOT_COMCONSOLE_SPEED}

.ifdef(BOOT_BIOSDISK_DEBUG)
# Make the disk code more talkative
CFLAGS+= -DDISK_DEBUG
.endif

# Include simple terminal emulation (cons25-compatible)
CFLAGS+= -DTERM_EMU

# XXX: make alloca() useable
CFLAGS+= -Dalloca=__builtin_alloca

CFLAGS+=	-I${.CURDIR}/../../common \
		-I${.CURDIR}/../btx/lib \
		-I${.CURDIR}/../../i386/libi386 \
		-I${.CURDIR}/../../.. -I.
# the location of libstand
CFLAGS+=	-I${.CURDIR}/../../../../lib/libstand/

.include <bsd.lib.mk>
@


1.29
log
@SVN rev 239069 on 2012-08-05 14:48:55Z by nyan

Reduce diffs against i386.
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.28
log
@SVN rev 235395 on 2012-05-13 11:34:05Z by avg

libpc98: unbreak after zfs-related changes in libi386 code

Pointyhat to:	avg
MFC after:	1 month
@
text
@d40 2
a41 1
CFLAGS+=	-I${.CURDIR}/../../common -I${.CURDIR}/../btx/lib \
@


1.27
log
@SVN rev 201339 on 2009-12-31 12:05:48Z by nyan

Add setting machine type support to the loader.

MFC after:	2 week
@
text
@d13 2
@


1.27.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.27.2.2
log
@SVN rev 237770 on 2012-06-29 10:28:46Z by avg

MFC r235392,235394,235395: fixes and cleanups for zfs boot MFC
@
text
@a12 2
.PATH:	${.CURDIR}/../../zfs
SRCS+=	devicename_stubs.c
@


1.27.2.3
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/pc98/libpc98/Makefile 237770 2012-06-29 10:28:46Z avg $
@


1.27.2.4
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 243448
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r243448 | nyan | 2012-11-23 13:35:17 +0000 (Fri, 23 Nov 2012) | 7 lines
## SVN ##
## SVN ## MFC: r239063, r239064, r239069, r240852, r240854
## SVN ##
## SVN ##   - boot2: bunch of variables are turned into uint8_t.
## SVN ##   - boot2: Remove unnecessary initializations.
## SVN ##   - loader: replace ugly inb/outb re-implementations with cpufunc.h.
## SVN ##   - Reduce diffs against i386.
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/sys/boot/pc98/libpc98/Makefile 243448 2012-11-23 13:35:17Z nyan $
d40 1
a40 2
CFLAGS+=	-I${.CURDIR}/../../common \
		-I${.CURDIR}/../btx/lib \
@


1.27.2.2.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.27.2.2.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/sys/boot/pc98/libpc98/Makefile 237770 2012-06-29 10:28:46Z avg $
@


1.27.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.27.2.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/sys/boot/pc98/libpc98/Makefile 201339 2009-12-31 12:05:48Z nyan $
@


1.26
log
@SVN rev 190046 on 2009-03-19 13:53:42Z by nyan

Reduce diffs against i386.
@
text
@d11 1
a11 1
	i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \
@


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 202343 on 2010-01-15 11:26:20Z by nyan

MFC: revision 201339 and 201340

  - Add setting machine type support to the loader.
  - Don't use 15M-16M area on pc98.  It's reserved for some devices.
@
text
@d11 1
a11 1
	i386_copy.c i386_module.c nullconsole.c pc98_sys.c pxe.c pxetramp.s \
@


1.26.2.3
log
@SVN rev 237769 on 2012-06-29 10:28:40Z by avg

MFC r235392,235394,235395: fixes and cleanups for zfs boot MFC
@
text
@a12 2
.PATH:	${.CURDIR}/../../zfs
SRCS+=	devicename_stubs.c
@


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/pc98/libpc98/Makefile 237769 2012-06-29 10:28:40Z avg $
@


1.26.2.5
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 243449
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r243449 | nyan | 2012-11-23 13:36:09 +0000 (Fri, 23 Nov 2012) | 7 lines
## SVN ##
## SVN ## MFC: r239063, r239064, r239069, r240852, r240854
## SVN ##
## SVN ##   - boot2: bunch of variables are turned into uint8_t.
## SVN ##   - boot2: Remove unnecessary initializations.
## SVN ##   - loader: replace ugly inb/outb re-implementations with cpufunc.h.
## SVN ##   - Reduce diffs against i386.
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/8/sys/boot/pc98/libpc98/Makefile 243449 2012-11-23 13:36:09Z nyan $
d40 1
a40 2
CFLAGS+=	-I${.CURDIR}/../../common \
		-I${.CURDIR}/../btx/lib \
@


1.26.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.26.2.2.6.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/sys/boot/pc98/libpc98/Makefile 202343 2010-01-15 11:26:20Z nyan $
@


1.26.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.26.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.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
@MFi386: revision 1.43

  Do not attempt to make an NFS rpc call if using tftp
@
text
@d8 3
a10 2
SRCS=	bioscd.c biosdisk.c biosmem.c biospnp.c biospci.c biossmap.c \
	bootinfo.c bootinfo32.c comconsole.c devicename.c elf32_freebsd.c \
@


1.24
log
@Drop the gateA20() function in the loader as it is unused.  All the other
boot loaders that load the loader already handle A20.  In fact, they are
required to do so in order to setup the environment that btxldr expects.
@
text
@d13 7
@


1.24.2.1
log
@SVN rev 202344 on 2010-01-15 11:28:36Z by nyan

MFC: revision 201339 and 201340

  - Add setting machine type support to the loader.
  - Don't use 15M-16M area on pc98.  It's reserved for some devices.
@
text
@d10 1
a10 1
	i386_copy.c i386_module.c nullconsole.c pc98_sys.c pxe.c pxetramp.s \
@


1.24.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/sys/boot/pc98/libpc98/Makefile 202344 2010-01-15 11:28:36Z nyan $
@


1.24.2.1.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.24.2.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/sys/boot/pc98/libpc98/Makefile 202344 2010-01-15 11:28:36Z nyan $
@


1.24.2.1.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.24.8.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.24.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.23
log
@Unbreak pc98 after my last changes to i386.
@
text
@d10 1
a10 1
	gatea20.c i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \
@


1.22
log
@Remove ifdef PC98.
@
text
@d27 3
@


1.22.2.1
log
@MFC accumulated changes to sys/boot/.  Notable changes include:

- Make 4G of memory directly accesible to the i386 loader(8).  This
  allows using memory above first megabyte for heap if necessary.
  (by sobomax@@)

- If loader is compiled with LOADER_BZIP2_SUPPORT, allocate heap in
  the last 3MB of physical memory.  This provides enough room for
  decompression and is safe to use with PAE and amd64 kernels.  This
  makes bzip2 support practically useable.
  (by sobomax@@)

- Drop the gateA20() function in the loader as it is unused.
  (by jhb@@)

Approved by:	re (kensmith)

The following files/revisions have been merged:

src/sys/boot/common/loader.8		1.88
src/sys/boot/i386/boot2/boot1.S		1.31
src/sys/boot/i386/libi386/Makefile	1.39 1.42
src/sys/boot/i386/libi386/biosacpi.c	1.11
src/sys/boot/i386/libi386/biosdisk.c	1.46
src/sys/boot/i386/libi386/biosmem.c	1.8
src/sys/boot/i386/libi386/biospnp.c	1.10
src/sys/boot/i386/libi386/biossmap.c	1.4
src/sys/boot/i386/libi386/i386_copy.c	1.11 1.12
src/sys/boot/i386/libi386/libi386.h	1.23 1.25
src/sys/boot/i386/loader/main.c		1.34 1.36 1.37
src/sys/boot/pc98/libpc98/Makefile	1.23 1.24
src/sys/boot/pc98/libpc98/biosdisk.c	1.33
src/sys/boot/pc98/libpc98/biosmem.c	1.8
src/sys/boot/pc98/loader/main.c		1.22 1.23
@
text
@d10 1
a10 1
	i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \
a26 3
# XXX: make alloca() useable
CFLAGS+= -Dalloca=__builtin_alloca

@


1.22.2.2
log
@SVN rev 202345 on 2010-01-15 11:32:52Z by nyan

MFC: revision 201339 and 201340

  - Add setting machine type support to the loader.
  - Don't use 15M-16M area on pc98.  It's reserved for some devices.
@
text
@d10 1
a10 1
	i386_copy.c i386_module.c nullconsole.c pc98_sys.c pxe.c pxetramp.s \
@


1.22.2.3
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/sys/boot/pc98/libpc98/Makefile 202345 2010-01-15 11:32:52Z nyan $
@


1.22.2.1.6.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.21
log
@For variables that are only checked with defined(), don't provide
any fake value.
@
text
@a26 1
CFLAGS+=	-DPC98
@


1.20
log
@MFi386: Removed -elf and duplicate -ffreestanding.
@
text
@d4 1
a4 1
INTERNALLIB=		true
@


1.20.2.1
log
@MFC: For variables that are only checked with defined(), don't provide
     any fake value.
@
text
@d4 1
a4 1
INTERNALLIB=
@


1.19
log
@MFi386: Cleanups to sys/boot makefiles.
@
text
@a12 1
CFLAGS+=	-ffreestanding
@


1.18
log
@Revert non-style part of the recent two deltas that dealt with
using as(1) to compile plain assembler source files; bsd.lib.mk
has been fixed (in revision 1.147).
@
text
@a34 14
# Make "machine" required for all objects
# (based on the more complete case in sys/i386/boot/Makefile.inc)
${SRCS:M*.c:R:S/$/.o/g}: machine

# If it's not there, don't consider it a target
.if exists(${.CURDIR}/../../../i386/include)
beforedepend ${OBJS}: machine

CLEANFILES+=	machine
machine:
	ln -sf ${.CURDIR}/../../../i386/include machine

.endif

@


1.17
log
@Don't load the acpi module.
@
text
@d10 1
a10 1
	gatea20.c i386_copy.c i386_module.c nullconsole.c pxe.c \
a47 4

OBJS+=	pxetramp.o
pxetramp.o: pxetramp.s
	${AS} ${AFLAGS} -o ${.TARGET} ${.ALLSRC:M*pxetramp*}
@


1.16
log
@Add ${AFLAGS} to 'as' invocation.
@
text
@a30 1
		-I${.CURDIR}/../../../contrib/dev/acpica \
@


1.15
log
@MFi386: revision 1.30.
@
text
@d52 1
a52 1
	as -o ${.TARGET} ${.ALLSRC:M*pxetramp*}
@


1.14
log
@Fix to build pc98 boot loader after support amd64.
@
text
@d10 1
a10 1
	gatea20.c i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \
d44 1
d50 3
a52 1
CLEANFILES+=	machine
@


1.13
log
@Initiate deorbit burn of i386 a.out kld "support" in loader.  Note that
this was quite broken, it never was updated for metadata support.
The a.out kld file support was never really used, as it wasn't necessary.
You could always load elf kld's, even in an a.out kernel.
@
text
@d8 3
a10 3
SRCS=	biosacpi.c bioscd.c biosdisk.c biosmem.c biospnp.c \
	biospci.c bootinfo.c comconsole.c devicename.c elf_freebsd.c gatea20.c \
	i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \
@


1.12
log
@MFi386: revision 1.22
@
text
@d8 1
a8 1
SRCS=	aout_freebsd.c biosacpi.c bioscd.c biosdisk.c biosmem.c biospnp.c \
@


1.11
log
@Removed now unused INTERNALSTATICLIB.
INTERNALLIB now implies NOPIC and NOPROFILE.
Removed gratuitous NOMAN.
@
text
@a13 6
CFLAGS+=	-I${.CURDIR}/../../common -I${.CURDIR}/../btx/lib \
		-I${.CURDIR}/../../i386/libi386 \
		-I${.CURDIR}/../../../contrib/dev/acpica \
		-I${.CURDIR}/../../.. -I.
CFLAGS+=	-DPC98

a19 3
# the location of libstand
CFLAGS+=	-I${.CURDIR}/../../../../lib/libstand/

d27 8
@


1.10
log
@Back out last commit.  I expect our bsd.*.mk gods to remove the need for
defining so many extra things in addition to INTERNALLIB.  We don't like
repetitive C code and we shouldn't for make code either.
@
text
@a3 2
NOPIC=
NOPROFILE=
a4 1
INTERNALSTATICLIB=	true
@


1.9
log
@NOPIC, NOPROFILE, NOMAN, and INTERNALSTATICLIB are redundant when using
INTERNALLIB now.
@
text
@d4 2
d7 1
@


1.8
log
@-ffreestanding is the word.
(also resort some CFLAGS such that the more "important" value are first so
they are easier to see)
@
text
@a3 2
NOPIC=
NOPROFILE=
a4 1
INTERNALSTATICLIB=	true
@


1.7
log
@MFi386: sys/boot/i386/libi386/Makefile revision 1.21
@
text
@d16 1
@


1.6
log
@MFi386: sys/boot/i386/libi386/Makefile revision 1.20.
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/boot/pc98/libpc98/Makefile,v 1.5 2000/09/22 12:49:15 kato Exp $
d11 2
a12 2
SRCS=	aout_freebsd.c biosacpi.c biosdisk.c biosmem.c biospnp.c biospci.c \
	bootinfo.c comconsole.c devicename.c elf_freebsd.c gatea20.c \
@


1.5
log
@Merged from sys/boot/i386/libi386/Makefile revision 1.19.
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/boot/pc98/libpc98/Makefile,v 1.4 2000/04/23 09:33:30 nyan Exp $
d9 3
a11 1
SRCS=	aout_freebsd.c biosdisk.c biosmem.c biospnp.c biospci.c \
d16 4
a19 2
.PATH:	${.CURDIR}/../../i386/libi386

a21 3
CFLAGS+=	-I${.CURDIR}/../../common -I${.CURDIR}/../btx/lib \
		-I${.CURDIR}/../../.. -I. -I${.CURDIR}/../../i386/libi386

d31 1
d33 2
a34 1
#CFLAGS+= -DDISK_DEBUG
@


1.4
log
@Sync with the following changes.

sys/boot/i386/libi386/Makefile	1.16 and 1.17
sys/boot/i386/loader/Makefile	1.44
sys/boot/i386/loader/main.c	1.20
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/boot/pc98/libpc98/Makefile,v 1.3 1999/11/03 08:23:57 nyan Exp $
d11 3
a13 1
	i386_copy.c i386_module.c time.c vidconsole.c pxe.c pxetramp.s
@


1.3
log
@Sync with sys/boot/i386/libi386/Makefile revision 1.15.
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/boot/pc98/libpc98/Makefile,v 1.2 1999/08/28 00:40:34 peter Exp $
d11 1
a11 1
	i386_copy.c i386_module.c time.c vidconsole.c
d24 3
@


1.3.2.1
log
@Sync with the following changes.

 Revision File
 1.15.2.1 src/sys/boot/i386/libi386/Makefile
 1.26.2.3 src/sys/boot/i386/libi386/biosdisk.c
 1.41.2.2 src/sys/boot/i386/loader/Makefile
 1.17.2.2 src/sys/boot/i386/loader/main.c
@
text
@d1 1
a1 1
# $FreeBSD$
d11 1
a11 1
	i386_copy.c i386_module.c time.c vidconsole.c pxe.c pxetramp.s
a23 3

# the location of libstand
CFLAGS+=	-I${.CURDIR}/../../../../lib/libstand/
@


1.3.2.2
log
@Merged from sys/boot/i386/libi386/Makefile revision 1.15.2.2.
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/boot/pc98/libpc98/Makefile,v 1.3.2.1 2000/05/05 08:59:03 nyan Exp $
d11 1
a11 3
	i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \
	time.c vidconsole.c

@


1.3.2.3
log
@Merged from the following changes.

sys/boot/i386/Makefile.inc             1.1.2.2
sys/boot/i386/btx/btx/Makefile         1.7.2.2
sys/boot/i386/btx/btx/btx.s            1.15.2.4
sys/boot/i386/libi386/Makefile         1.15.2.3
sys/boot/i386/libi386/biosdisk.c       1.26.2.6
sys/boot/i386/libi386/biosmem.c        1.4.2.1
sys/boot/i386/libi386/comconsole.c     1.7.2.1
sys/boot/i386/libi386/gatea20.c        1.2.2.1
sys/boot/i386/libi386/time.c           1.3.2.1
sys/boot/i386/libi386/vidconsole.c     1.12.2.1
sys/boot/i386/loader/main.c            1.17.2.5
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/boot/pc98/libpc98/Makefile,v 1.3.2.2 2000/09/23 01:42:58 nyan Exp $
a29 1
.ifdef(BOOT_BIOSDISK_DEBUG)
d31 1
a31 2
CFLAGS+= -DDISK_DEBUG
.endif
@


1.3.2.4
log
@MFi386: revision 1.15.2.4

Approved by:	re
@
text
@d1 1
a1 1
# $FreeBSD$
d9 1
a9 1
SRCS=	aout_freebsd.c bioscd.c biosdisk.c biosmem.c biospnp.c biospci.c \
@


1.3.2.5
log
@MFC: new bsd.lib.mk API.
@
text
@d4 2
d7 1
@


1.3.2.6
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/4/sys/boot/pc98/libpc98/Makefile 100377 2002-07-19 18:46:30Z ru $
@


1.2
log
@$Id$ -> $FreeBSD$
@
text
@d1 1
a1 1
# $FreeBSD$
d30 4
@


1.1
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
@d1 1
a1 1
# $Id: Makefile,v 1.13 1999/01/10 14:48:04 rnordier Exp $
@


1.1.2.1
log
@MFC: added boot loader for PC98.

Approved by:	jkh
@
text
@d1 1
a1 1
#	$Id$
@


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