Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/sgimips/conf Add INSTALL and GENERIC kernel configu...



details:   https://anonhg.NetBSD.org/src/rev/03a395d5689a
branches:  trunk
changeset: 571176:03a395d5689a
user:      sekiya <sekiya%NetBSD.org@localhost>
date:      Sat Nov 13 03:20:37 2004 +0000

description:
Add INSTALL and GENERIC kernel configuration wrappers for IP12 family.

Note that devices are defined in the IP2x configuration file; the IP12 is
99.5% the same as the IP20/22/24.  Indeed, the only reason to have a separate
config file for IP12 is to sort out the MIPS1/MIPS3 locore bits.

To that end, the wrappers include the IP2x GENERIC config, undefine a few
directives, and define the appropriate bits for IP12.

diffstat:

 sys/arch/sgimips/conf/GENERIC32_IP12 |  19 +++++++++++++++++++
 sys/arch/sgimips/conf/GENERIC32_IP2x |  14 +++++++++-----
 sys/arch/sgimips/conf/INSTALL32_IP12 |  14 ++++++++++++++
 3 files changed, 42 insertions(+), 5 deletions(-)

diffs (83 lines):

diff -r fb2c786cd55f -r 03a395d5689a sys/arch/sgimips/conf/GENERIC32_IP12
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/sgimips/conf/GENERIC32_IP12      Sat Nov 13 03:20:37 2004 +0000
@@ -0,0 +1,19 @@
+#
+# sgimips GENERIC kernel for IP12
+#
+# The IP12 is very, very similar to the IP2x, with one important difference:
+# it is MIPS1.  This means that we cannot produce a kernel that works on both
+# architectures.
+#
+# To keep things simple, include the IP2x kernel config and "no option" the
+# offending bits.
+
+# Pull in standard `install' config
+include        "arch/sgimips/conf/GENERIC32_IP2x"
+
+no options     MIPS3
+options                MIPS1
+no options     INDY_R4600_CACHE
+
+no makeoptions TEXTADDR
+makeoptions    TEXTADDR=0x80002000
diff -r fb2c786cd55f -r 03a395d5689a sys/arch/sgimips/conf/GENERIC32_IP2x
--- a/sys/arch/sgimips/conf/GENERIC32_IP2x      Sat Nov 13 00:11:03 2004 +0000
+++ b/sys/arch/sgimips/conf/GENERIC32_IP2x      Sat Nov 13 03:20:37 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: GENERIC32_IP2x,v 1.23 2004/11/10 17:54:07 christos Exp $
+#      $NetBSD: GENERIC32_IP2x,v 1.24 2004/11/13 03:20:37 sekiya Exp $
 #
 # GENERIC32_IP2x machine description file
 # 
@@ -29,7 +29,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "GENERIC32-IP2x-$Revision: 1.23 $"
+#ident         "GENERIC32-IP2x-$Revision: 1.24 $"
 
 maxusers       32
 
@@ -205,6 +205,10 @@
 ses*    at scsibus? target ? lun ?     # SCSI SES/SAF-TE devices
 uk*     at scsibus? target ? lun ?     # unknown SCSI
 
+# Personal Iris / Indigo R3k
+pic0           at mainbus0 addr 0x1fa00000
+gio0           at pic0
+
 # Indy / Indigo^2
 imc0           at mainbus0 addr 0x1fa00000
 gio0           at imc0
@@ -224,9 +228,9 @@
 # HPC devices
 sq*            at hpc0 offset ?
 wdsc*          at hpc0 offset ?
-dpclock*       at hpc0 offset ?        # IP20
-dsclock*       at hpc0 offset ?        # IP22/24
-haltwo*         at hpc0 offset ?
+dpclock*       at hpc0 offset ?        # IP12 / IP20
+dsclock*       at hpc0 offset ?        # IP22 / 24
+haltwo*         at hpc0 offset ?       # IP22 / 24
 pckbc*         at hpc0 offset ?
 
 pckbd*         at pckbc?
diff -r fb2c786cd55f -r 03a395d5689a sys/arch/sgimips/conf/INSTALL32_IP12
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/sgimips/conf/INSTALL32_IP12      Sat Nov 13 03:20:37 2004 +0000
@@ -0,0 +1,14 @@
+#
+# sgimips install kernel with ramdisk added.
+#
+
+# Pull in standard `install' config
+include        "arch/sgimips/conf/GENERIC32_IP12"
+
+makeoptions    COPTS="-Os"
+
+# 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
+options                MEMORY_DISK_ROOT_SIZE=6144# size of memory disk, in blocks (3MB)



Home | Main Index | Thread Index | Old Index