From 148464ad85158d20a35dfe58260ebbe03ca54373 Mon Sep 17 00:00:00 2001 From: kiyohara Date: Wed, 20 Oct 2010 02:39:19 +0000 Subject: [PATCH] Move PCI_NETBSD_CONFIGURE to std.bebox. It is MUST REQUIRED. --- sys/arch/bebox/conf/GENERIC | 5 ++--- sys/arch/bebox/conf/std.bebox | 4 +++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/arch/bebox/conf/GENERIC b/sys/arch/bebox/conf/GENERIC index 0de5aeea18b1..910b04250f1e 100644 --- a/sys/arch/bebox/conf/GENERIC +++ b/sys/arch/bebox/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.121 2010/10/16 05:49:03 kiyohara Exp $ +# $NetBSD: GENERIC,v 1.122 2010/10/20 02:39:19 kiyohara Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/bebox/conf/std.bebox" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.121 $" +#ident "GENERIC-$Revision: 1.122 $" maxusers 32 @@ -149,7 +149,6 @@ options IPFILTER_COMPAT # Compat for IP-Filter options PCIVERBOSE # verbose PCI device autoconfig messages options MIIVERBOSE # verbose PHY autoconfig messages #options PCI_CONFIG_DUMP # verbosely dump PCI config space -options PCI_NETBSD_CONFIGURE options SCSIVERBOSE # human readable SCSI error messages #options NFS_BOOT_BOOTPARAM,NFS_BOOT_BOOTP diff --git a/sys/arch/bebox/conf/std.bebox b/sys/arch/bebox/conf/std.bebox index 6fc40a7f7cbe..c47925ce81f0 100644 --- a/sys/arch/bebox/conf/std.bebox +++ b/sys/arch/bebox/conf/std.bebox @@ -1,4 +1,4 @@ -# $NetBSD: std.bebox,v 1.16 2008/03/16 17:37:09 kiyohara Exp $ +# $NetBSD: std.bebox,v 1.17 2010/10/20 02:39:19 kiyohara Exp $ # # standard, required NetBSD/bebox 'options' @@ -8,6 +8,8 @@ include "conf/std" # MI standard options options PPC_OEA # BeBox uses Motorola PPC60x CPUs makeoptions PPCDIR="oea" # Tell Makefile.powerpc what dir to use +options PCI_NETBSD_CONFIGURE # MUST REQUIRED + options EXEC_ELF32 # exec ELF binaries options EXEC_SCRIPT # exec #! scripts