Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/evbppc/conf Use a standard INSTALL.inc instead of d...
details: https://anonhg.NetBSD.org/src/rev/c5e33d607fec
branches: trunk
changeset: 765854:c5e33d607fec
user: matt <matt%NetBSD.org@localhost>
date: Wed Jun 08 05:03:43 2011 +0000
description:
Use a standard INSTALL.inc instead of duplicating it. Make INSTALL
variants of mpc85xx kernels.
diffstat:
sys/arch/evbppc/conf/INSTALL.inc | 21 ++++++++++++++++
sys/arch/evbppc/conf/INSTALL_MPC8536DS | 9 ++++++
sys/arch/evbppc/conf/INSTALL_MPC8548CDS | 9 ++++++
sys/arch/evbppc/conf/INSTALL_OPENBLOCKS266 | 23 +++-------------
sys/arch/evbppc/conf/INSTALL_P2020DS | 10 +++++++
sys/arch/evbppc/conf/INSTALL_P2020RDB | 9 ++++++
sys/arch/evbppc/conf/INSTALL_PMPPC | 24 ++----------------
sys/arch/evbppc/conf/INSTALL_WALNUT | 17 +++----------
sys/arch/evbppc/conf/MPC8536DS | 17 ++++--------
sys/arch/evbppc/conf/MPC8548CDS | 17 ++++--------
sys/arch/evbppc/conf/P2020DS | 39 ++++++++++++-----------------
sys/arch/evbppc/conf/P2020RDB | 15 +++-------
sys/arch/evbppc/conf/RB800 | 16 +++---------
sys/arch/evbppc/conf/WALNUT | 3 +-
sys/arch/evbppc/conf/std.mpc85xx | 3 +-
15 files changed, 109 insertions(+), 123 deletions(-)
diffs (truncated from 510 to 300 lines):
diff -r a418be9c6ea9 -r c5e33d607fec sys/arch/evbppc/conf/INSTALL.inc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/evbppc/conf/INSTALL.inc Wed Jun 08 05:03:43 2011 +0000
@@ -0,0 +1,21 @@
+# $NetBSD: INSTALL.inc,v 1.1 2011/06/08 05:03:43 matt Exp $
+
+# DEBUG options turned on:
+
+options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
+
+pseudo-device md
+
+makeoptions NEED_MDSETIMAGE="yes"
+
+no config netbsd
+config netbsd root on md0a
+
+# Enable the hooks used for initializing the root memory-disk.
+options MEMORY_DISK_HOOKS
+options MEMORY_DISK_IS_ROOT # force root on memory disk
+options MEMORY_DISK_SERVER=0 # no userspace memory disk support
+## The ramdisk size must be kept in sync manually with the size of
+## the `ramdisk' image (which is built in distrib/evbppc/ramdisk/ramdisk).
+options MEMORY_DISK_ROOT_SIZE=6144 # size of memory disk, in blocks
+options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
diff -r a418be9c6ea9 -r c5e33d607fec sys/arch/evbppc/conf/INSTALL_MPC8536DS
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/evbppc/conf/INSTALL_MPC8536DS Wed Jun 08 05:03:43 2011 +0000
@@ -0,0 +1,9 @@
+# $NetBSD: INSTALL_MPC8536DS,v 1.1 2011/06/08 05:03:43 matt Exp $
+
+include "arch/evbppc/conf/MPC8536DS"
+
+#ident "INSTALL_MPC8536DS-$Revision: 1.1 $"
+
+include "arch/evbppc/conf/INSTALL.inc"
+
+no config nfsnetbsd
diff -r a418be9c6ea9 -r c5e33d607fec sys/arch/evbppc/conf/INSTALL_MPC8548CDS
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/evbppc/conf/INSTALL_MPC8548CDS Wed Jun 08 05:03:43 2011 +0000
@@ -0,0 +1,9 @@
+# $NetBSD: INSTALL_MPC8548CDS,v 1.1 2011/06/08 05:03:43 matt Exp $
+
+include "arch/evbppc/conf/MPC8548CDS"
+
+#ident "INSTALL_MPC8548CDS-$Revision: 1.1 $"
+
+include "arch/evbppc/conf/INSTALL.inc"
+
+no config nfsnetbsd
diff -r a418be9c6ea9 -r c5e33d607fec sys/arch/evbppc/conf/INSTALL_OPENBLOCKS266
--- a/sys/arch/evbppc/conf/INSTALL_OPENBLOCKS266 Tue Jun 07 22:51:32 2011 +0000
+++ b/sys/arch/evbppc/conf/INSTALL_OPENBLOCKS266 Wed Jun 08 05:03:43 2011 +0000
@@ -1,8 +1,10 @@
-# $NetBSD: INSTALL_OPENBLOCKS266,v 1.6 2010/11/23 11:13:57 hannken Exp $
+# $NetBSD: INSTALL_OPENBLOCKS266,v 1.7 2011/06/08 05:03:43 matt Exp $
+
+include "arch/evbppc/conf/OPENBLOCKS266"
-include "arch/evbppc/conf/OPENBLOCKS266"
+#ident "INSTALL_OPENBLOCKS266-$Revision: 1.7 $"
-#ident "INSTALL_OPENBLOCKS266-$Revision: 1.6 $"
+include "arch/evbppc/conf/INSTALL.inc"
#
# DEBUG options turned on:
@@ -12,18 +14,3 @@
#options LOCKDEBUG
#options SYSCALL_DEBUG
options DIAGNOSTIC
-options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
-
-#
-# Enable the hooks used for initializing the root memory-disk.
-# The ramdisk size must be kept in sync manually with the size of
-# the `ramdisk' image (which is built in distrib/walnut/ramdisk/ramdisk).
-#
-options MEMORY_DISK_HOOKS
-options MEMORY_DISK_IS_ROOT # force root on memory disk
-options MEMORY_DISK_SERVER=0 # no userspace memory disk
-#options MEMORY_DISK_ROOT_SIZE=8192 # size of memory disk, in blocks
-options MEMORY_DISK_ROOT_SIZE=4096 # size of memory disk, in blocks
-options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
-
-pseudo-device md # memory disk device
diff -r a418be9c6ea9 -r c5e33d607fec sys/arch/evbppc/conf/INSTALL_P2020DS
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/evbppc/conf/INSTALL_P2020DS Wed Jun 08 05:03:43 2011 +0000
@@ -0,0 +1,10 @@
+# $NetBSD: INSTALL_P2020DS,v 1.1 2011/06/08 05:03:43 matt Exp $
+
+include "arch/evbppc/conf/P2020DS"
+
+#ident "INSTALL_P2020DS-$Revision: 1.1 $"
+
+include "arch/evbppc/conf/INSTALL.inc"
+
+no config nfsnetbsd
+no config netbsd-esata
diff -r a418be9c6ea9 -r c5e33d607fec sys/arch/evbppc/conf/INSTALL_P2020RDB
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/evbppc/conf/INSTALL_P2020RDB Wed Jun 08 05:03:43 2011 +0000
@@ -0,0 +1,9 @@
+# $NetBSD: INSTALL_P2020RDB,v 1.1 2011/06/08 05:03:43 matt Exp $
+
+include "arch/evbppc/conf/P2020RDB"
+
+#ident "INSTALL_P2020RDB-$Revision: 1.1 $"
+
+include "arch/evbppc/conf/INSTALL.inc"
+
+no config nfsnetbsd
diff -r a418be9c6ea9 -r c5e33d607fec sys/arch/evbppc/conf/INSTALL_PMPPC
--- a/sys/arch/evbppc/conf/INSTALL_PMPPC Tue Jun 07 22:51:32 2011 +0000
+++ b/sys/arch/evbppc/conf/INSTALL_PMPPC Wed Jun 08 05:03:43 2011 +0000
@@ -1,25 +1,7 @@
-# $NetBSD: INSTALL_PMPPC,v 1.3 2011/06/05 16:52:23 matt Exp $
+# $NetBSD: INSTALL_PMPPC,v 1.4 2011/06/08 05:03:43 matt Exp $
include "arch/evbppc/conf/PMPPC"
-#ident "INSTALL_PMPPC-$Revision: 1.3 $"
-
-# DEBUG options turned on:
-
-options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
-
-pseudo-device md
-
-makeoptions NEED_MDSETIMAGE="yes"
+#ident "INSTALL_PMPPC-$Revision: 1.4 $"
-no config netbsd
-config netbsd root on md0a
-
-# Enable the hooks used for initializing the root memory-disk.
-options MEMORY_DISK_HOOKS
-options MEMORY_DISK_IS_ROOT # force root on memory disk
-options MEMORY_DISK_SERVER=0 # no userspace memory disk support
-## The ramdisk size must be kept in sync manually with the size of
-## the `ramdisk' image (which is built in distrib/evbppc/ramdisk/ramdisk).
-options MEMORY_DISK_ROOT_SIZE=6144 # size of memory disk, in blocks
-options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
+include "arch/evbppc/conf/INSTALL.inc"
diff -r a418be9c6ea9 -r c5e33d607fec sys/arch/evbppc/conf/INSTALL_WALNUT
--- a/sys/arch/evbppc/conf/INSTALL_WALNUT Tue Jun 07 22:51:32 2011 +0000
+++ b/sys/arch/evbppc/conf/INSTALL_WALNUT Wed Jun 08 05:03:43 2011 +0000
@@ -1,8 +1,10 @@
-# $NetBSD: INSTALL_WALNUT,v 1.8 2009/02/06 18:50:27 jym Exp $
+# $NetBSD: INSTALL_WALNUT,v 1.9 2011/06/08 05:03:43 matt Exp $
include "arch/evbppc/conf/WALNUT"
-#ident "INSTALL_WALNUT-$Revision: 1.8 $"
+#ident "INSTALL_WALNUT-$Revision: 1.9 $"
+
+include "arch/evbppc/conf/INSTALL.inc"
# DEBUG options turned on:
@@ -11,14 +13,3 @@
#makeoptions DEBUG="-g"
#options DEBUG
#options SYSCALL_DEBUG
-options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
-
-# Enable the hooks used for initializing the root memory-disk.
-options MEMORY_DISK_HOOKS
-options MEMORY_DISK_IS_ROOT # force root on memory disk
-options MEMORY_DISK_SERVER=0 # no userspace memory disk support
-## The ramdisk size must be kept in sync manually with the size of
-## the `ramdisk' image (which is built in distrib/walnut/ramdisk/ramdisk).
-options MEMORY_DISK_ROOT_SIZE=4096 # size of memory disk, in blocks
-options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
-
diff -r a418be9c6ea9 -r c5e33d607fec sys/arch/evbppc/conf/MPC8536DS
--- a/sys/arch/evbppc/conf/MPC8536DS Tue Jun 07 22:51:32 2011 +0000
+++ b/sys/arch/evbppc/conf/MPC8536DS Wed Jun 08 05:03:43 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: MPC8536DS,v 1.3 2011/03/06 17:08:23 bouyer Exp $
+# $NetBSD: MPC8536DS,v 1.4 2011/06/08 05:03:43 matt Exp $
#
# MPC8536DS -- everything that's currently supported
#
@@ -7,10 +7,13 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "MPC8536DS-$Revision: 1.3 $"
+ident "MPC8536DS-$Revision: 1.4 $"
maxusers 32
+makeoptions NEED_BINARY="yes"
+makeoptions NEED_UBOOTIMAGE="yes"
+
#options UVMHIST
#options UVMHIST_PRINT
@@ -21,13 +24,6 @@
options PIXIS
#options HZ=1000
-# Options for necessary to use MD
-options MEMORY_DISK_HOOKS
-options MEMORY_DISK_IS_ROOT # force root on memory disk
-options MEMORY_DISK_SERVER=0 # no userspace memory disk support
-options MEMORY_DISK_ROOT_SIZE=6144 # size of memory disk, in blocks
-
-
#options INSECURE # disable kernel security levels
#options NTP # NTP phase/frequency locked loop
options KTRACE # system call tracing via ktrace(1)
@@ -140,7 +136,7 @@
# Kernel root file system and dump configuration.
config netbsd root on ? type ?
-config netbsdnfs root on tsec0 type nfs
+config nfsnetbsd root on tsec0 type nfs
#
# Device configuration
@@ -218,7 +214,6 @@
makphy* at mii? phy ? # Marvell PHYs
#ukphy* at mii? phy ? # generic unknown PHYs
-pseudo-device md 1 # memory disk device
pseudo-device loop # network loopback
pseudo-device bpfilter # packet filter
pseudo-device rnd # /dev/random and in-kernel generator
diff -r a418be9c6ea9 -r c5e33d607fec sys/arch/evbppc/conf/MPC8548CDS
--- a/sys/arch/evbppc/conf/MPC8548CDS Tue Jun 07 22:51:32 2011 +0000
+++ b/sys/arch/evbppc/conf/MPC8548CDS Wed Jun 08 05:03:43 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: MPC8548CDS,v 1.3 2011/03/06 17:08:23 bouyer Exp $
+# $NetBSD: MPC8548CDS,v 1.4 2011/06/08 05:03:44 matt Exp $
#
# MPC8548CDS -- everything that's currently supported
#
@@ -7,10 +7,13 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "MPC8548CDS-$Revision: 1.3 $"
+ident "MPC8548CDS-$Revision: 1.4 $"
maxusers 32
+makeoptions NEED_BINARY="yes"
+makeoptions NEED_UBOOTIMAGE="yes"
+
#options UVMHIST
#options UVMHIST_PRINT
@@ -18,13 +21,6 @@
options CADMUS
#options HZ=1000
-# Options for necessary to use MD
-options MEMORY_DISK_HOOKS
-options MEMORY_DISK_IS_ROOT # force root on memory disk
-options MEMORY_DISK_SERVER=0 # no userspace memory disk support
-options MEMORY_DISK_ROOT_SIZE=6144 # size of memory disk, in blocks
-
-
#options INSECURE # disable kernel security levels
#options NTP # NTP phase/frequency locked loop
options KTRACE # system call tracing via ktrace(1)
@@ -137,7 +133,7 @@
# Kernel root file system and dump configuration.
config netbsd root on ? type ?
-config netbsdnfs root on tsec0 type nfs
+config nfsnetbsd root on tsec0 type nfs
#
# Device configuration
@@ -208,7 +204,6 @@
#makphy* at mii? phy ? # Level One LXT-970 PHYs
#ukphy* at mii? phy ? # generic unknown PHYs
-pseudo-device md 1 # memory disk device
pseudo-device loop # network loopback
pseudo-device bpfilter # packet filter
pseudo-device rnd # /dev/random and in-kernel generator
diff -r a418be9c6ea9 -r c5e33d607fec sys/arch/evbppc/conf/P2020DS
--- a/sys/arch/evbppc/conf/P2020DS Tue Jun 07 22:51:32 2011 +0000
+++ b/sys/arch/evbppc/conf/P2020DS Wed Jun 08 05:03:43 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: P2020DS,v 1.2 2011/05/28 05:58:16 matt Exp $
+# $NetBSD: P2020DS,v 1.3 2011/06/08 05:03:44 matt Exp $
#
# P2020DS -- everything that's currently supported
#
@@ -8,7 +8,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
Home |
Main Index |
Thread Index |
Old Index