head	1.2;
access;
symbols
	netbsd-11-0-RC4:1.2
	netbsd-11-0-RC3:1.2
	netbsd-11-0-RC2:1.2
	netbsd-11-0-RC1:1.2
	perseant-exfatfs-base-20250801:1.2
	netbsd-11:1.2.0.28
	netbsd-11-base:1.2
	netbsd-10-1-RELEASE:1.2
	perseant-exfatfs-base-20240630:1.2
	perseant-exfatfs:1.2.0.26
	perseant-exfatfs-base:1.2
	netbsd-10-0-RELEASE:1.2
	netbsd-10-0-RC6:1.2
	netbsd-10-0-RC5:1.2
	netbsd-10-0-RC4:1.2
	netbsd-10-0-RC3:1.2
	netbsd-10-0-RC2:1.2
	thorpej-ifq:1.2.0.24
	thorpej-ifq-base:1.2
	thorpej-altq-separation:1.2.0.22
	thorpej-altq-separation-base:1.2
	netbsd-10-0-RC1:1.2
	netbsd-10:1.2.0.20
	netbsd-10-base:1.2
	bouyer-sunxi-drm:1.2.0.18
	bouyer-sunxi-drm-base:1.2
	thorpej-i2c-spi-conf2:1.2.0.16
	thorpej-i2c-spi-conf2-base:1.2
	thorpej-futex2:1.2.0.14
	thorpej-futex2-base:1.2
	thorpej-cfargs2:1.2.0.12
	thorpej-cfargs2-base:1.2
	cjep_sun2x-base1:1.2
	cjep_sun2x:1.2.0.10
	cjep_sun2x-base:1.2
	cjep_staticlib_x-base1:1.2
	cjep_staticlib_x:1.2.0.8
	cjep_staticlib_x-base:1.2
	thorpej-i2c-spi-conf:1.2.0.6
	thorpej-i2c-spi-conf-base:1.2
	thorpej-cfargs:1.2.0.4
	thorpej-cfargs-base:1.2
	thorpej-futex:1.2.0.2
	thorpej-futex-base:1.2
	bouyer-xenpvh-base2:1.1
	phil-wifi-20200421:1.1
	bouyer-xenpvh:1.1.0.4
	bouyer-xenpvh-base1:1.1
	phil-wifi:1.1.0.2
	phil-wifi-20200411:1.1;
locks; strict;
comment	@# @;


1.2
date	2020.04.25.15.26.16;	author bouyer;	state Exp;
branches;
next	1.1;
commitid	OlHyMKBWmojOpM5C;

1.1
date	2020.04.09.14.39.10;	author jdolecek;	state Exp;
branches
	1.1.2.1
	1.1.4.1;
next	;
commitid	WjYoS3zwqqs1FI3C;

1.1.2.1
date	2020.04.09.14.39.10;	author martin;	state dead;
branches;
next	1.1.2.2;
commitid	X01YhRUPVUDaec4C;

1.1.2.2
date	2020.04.13.08.03.52;	author martin;	state Exp;
branches;
next	;
commitid	X01YhRUPVUDaec4C;

1.1.4.1
date	2020.04.09.14.39.10;	author bouyer;	state dead;
branches;
next	1.1.4.2;
commitid	4WLfIgNPymVsg75C;

1.1.4.2
date	2020.04.20.11.28.57;	author bouyer;	state Exp;
branches;
next	1.1.4.3;
commitid	4WLfIgNPymVsg75C;

1.1.4.3
date	2020.04.20.19.38.54;	author bouyer;	state Exp;
branches;
next	;
commitid	VtSMSXk1unBPY95C;


desc
@@


1.2
log
@Merge the bouyer-xenpvh branch, bringing in Xen PV drivers support under HVM
guests in GENERIC.
Xen support can be disabled at runtime with
boot -c
disable hypervisor
@
text
@# $NetBSD: std.xen,v 1.1.4.3 2020/04/20 19:38:54 bouyer Exp $
# NetBSD: std.i386,v 1.24 2003/02/26 21:33:36 fvdl Exp 
#
# standard, required NetBSD/i386 'options'

machine xen i386 x86
include		"conf/std"	# MI standard options
include		"arch/xen/conf/files.xen.pv"

options 	XEN	#Xen support

include		"arch/xen/conf/std.xenversion"

options 	EXEC_AOUT	# exec a.out binaries
options 	EXEC_ELF32	# exec ELF binaries
options 	EXEC_SCRIPT	# exec #! scripts

options 	CPU_IN_CKSUM
#options 	CRYPTO_MD_DES_ENC	# machine-dependent code for DES
#options 	CRYPTO_MD_DES_CBC	# machine-dependent DES CBC code
#options 	CRYPTO_MD_BF_ENC	# machine-dependent code for BF_encrypt
#options 	CRYPTO_MD_BF_CBC	# careful: uses bswapl, requires 486

options 	CHILD_MAX=1024	# 160 is too few
options 	OPEN_MAX=1024	# 128 is too few

# Atheros HAL options
include "external/isc/atheros_hal/conf/std.ath_hal"
@


1.1
log
@move xen/conf/std.xen to i386/conf/std.xen, it's i386-specific

split off __XEN_INTERFACE_VERSION__ to new xen/conf/std.xenversion
and use from both i386/conf/std.xen and amd64/conf/stf.xen, so that
there is single place for the definition
@
text
@d1 1
a1 1
# $NetBSD: std.xen,v 1.10 2019/02/04 18:14:53 cherry Exp $
d6 1
a6 1
machine xen i386
d8 3
@


1.1.4.1
log
@file std.xen was added on branch bouyer-xenpvh on 2020-04-20 11:28:57 +0000
@
text
@d1 25
@


1.1.4.2
log
@Sync with HEAD
@
text
@a0 25
# $NetBSD: std.xen,v 1.1 2020/04/09 14:39:10 jdolecek Exp $
# NetBSD: std.i386,v 1.24 2003/02/26 21:33:36 fvdl Exp 
#
# standard, required NetBSD/i386 'options'

machine xen i386
include		"conf/std"	# MI standard options

include		"arch/xen/conf/std.xenversion"

options 	EXEC_AOUT	# exec a.out binaries
options 	EXEC_ELF32	# exec ELF binaries
options 	EXEC_SCRIPT	# exec #! scripts

options 	CPU_IN_CKSUM
#options 	CRYPTO_MD_DES_ENC	# machine-dependent code for DES
#options 	CRYPTO_MD_DES_CBC	# machine-dependent DES CBC code
#options 	CRYPTO_MD_BF_ENC	# machine-dependent code for BF_encrypt
#options 	CRYPTO_MD_BF_CBC	# careful: uses bswapl, requires 486

options 	CHILD_MAX=1024	# 160 is too few
options 	OPEN_MAX=1024	# 128 is too few

# Atheros HAL options
include "external/isc/atheros_hal/conf/std.ath_hal"
@


1.1.4.3
log
@Fix build after merge
@
text
@d1 1
a1 1
# $NetBSD: std.xen,v 1.1.4.2 2020/04/20 11:28:57 bouyer Exp $
d6 1
a6 1
machine xen i386 x86
a7 3
include		"arch/xen/conf/files.xen.pv"

options 	XEN	#Xen support
@


1.1.2.1
log
@file std.xen was added on branch phil-wifi on 2020-04-13 08:03:52 +0000
@
text
@d1 25
@


1.1.2.2
log
@Mostly merge changes from HEAD upto 20200411
@
text
@a0 25
# $NetBSD$
# NetBSD: std.i386,v 1.24 2003/02/26 21:33:36 fvdl Exp 
#
# standard, required NetBSD/i386 'options'

machine xen i386
include		"conf/std"	# MI standard options

include		"arch/xen/conf/std.xenversion"

options 	EXEC_AOUT	# exec a.out binaries
options 	EXEC_ELF32	# exec ELF binaries
options 	EXEC_SCRIPT	# exec #! scripts

options 	CPU_IN_CKSUM
#options 	CRYPTO_MD_DES_ENC	# machine-dependent code for DES
#options 	CRYPTO_MD_DES_CBC	# machine-dependent DES CBC code
#options 	CRYPTO_MD_BF_ENC	# machine-dependent code for BF_encrypt
#options 	CRYPTO_MD_BF_CBC	# careful: uses bswapl, requires 486

options 	CHILD_MAX=1024	# 160 is too few
options 	OPEN_MAX=1024	# 128 is too few

# Atheros HAL options
include "external/isc/atheros_hal/conf/std.ath_hal"
@