Module Name: src
Committed By: scole
Date: Mon Jan 7 01:44:59 UTC 2019
Modified Files:
src/sys/arch/macppc/conf: GENERIC_601 GENERIC_MD INSTALL INSTALL_601
Log Message:
increase MEMORY_DISK_ROOT_SIZE slightly to avoid running out of space
when doing some sysinst options.
Add ahc and rtk options for my testing convenience. The 601 kernels
are still small enough for netbooting.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/macppc/conf/GENERIC_601
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/macppc/conf/GENERIC_MD
cvs rdiff -u -r1.128 -r1.129 src/sys/arch/macppc/conf/INSTALL
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/macppc/conf/INSTALL_601
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/macppc/conf/GENERIC_601
diff -u src/sys/arch/macppc/conf/GENERIC_601:1.22 src/sys/arch/macppc/conf/GENERIC_601:1.23
--- src/sys/arch/macppc/conf/GENERIC_601:1.22 Mon Nov 12 20:03:42 2018
+++ src/sys/arch/macppc/conf/GENERIC_601 Mon Jan 7 01:44:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_601,v 1.22 2018/11/12 20:03:42 scole Exp $
+# $NetBSD: GENERIC_601,v 1.23 2019/01/07 01:44:59 scole Exp $
#
# GENERIC machine description file
#
@@ -28,7 +28,7 @@ include "arch/macppc/conf/std.macppc.60
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "GENERIC-$Revision: 1.22 $"
+ident "GENERIC-$Revision: 1.23 $"
maxusers 32
@@ -207,7 +207,7 @@ pchb* at pci? dev ? function ? # PCI-Hos
ppb* at pci? dev ? function ? # PCI-PCI bridges
# PCI SCSI controllers
-#ahc* at pci? dev ? function ? # Adaptec 294x, aic78x0 SCSI
+ahc* at pci? dev ? function ? # Adaptec 294x, aic78x0 SCSI
# Display devices
#
@@ -371,8 +371,8 @@ pseudo-device drvctl
#options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
-#rlphy* at mii? phy ? # Realtek 8139/8201L PHYs
-#rtk* at pci? dev ? function ? # Realtek 8129/8139
+rlphy* at mii? phy ? # Realtek 8139/8201L PHYs
+rtk* at pci? dev ? function ? # Realtek 8129/8139
#rgephy* at mii? phy ? # Realtek 8169S/8110S internal PHYs
#ral* at pci? dev ? function ? # Ralink Technology RT25x0 802.11a/b/g
Index: src/sys/arch/macppc/conf/GENERIC_MD
diff -u src/sys/arch/macppc/conf/GENERIC_MD:1.16 src/sys/arch/macppc/conf/GENERIC_MD:1.17
--- src/sys/arch/macppc/conf/GENERIC_MD:1.16 Sun Aug 10 17:58:51 2014
+++ src/sys/arch/macppc/conf/GENERIC_MD Mon Jan 7 01:44:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_MD,v 1.16 2014/08/10 17:58:51 joerg Exp $
+# $NetBSD: GENERIC_MD,v 1.17 2019/01/07 01:44:59 scole Exp $
#
# GENERIC_MD config file
#
@@ -8,5 +8,5 @@ include "arch/macppc/conf/GENERIC"
# Enable the hooks used for initializing the ram-disk.
options MEMORY_DISK_HOOKS
options MEMORY_DISK_IS_ROOT # Force root on ram-disk
-options MEMORY_DISK_ROOT_SIZE=5120 # 2560 KiB
+options MEMORY_DISK_ROOT_SIZE=5760 # 2880 KiB
options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
Index: src/sys/arch/macppc/conf/INSTALL
diff -u src/sys/arch/macppc/conf/INSTALL:1.128 src/sys/arch/macppc/conf/INSTALL:1.129
--- src/sys/arch/macppc/conf/INSTALL:1.128 Fri Aug 31 18:11:20 2018
+++ src/sys/arch/macppc/conf/INSTALL Mon Jan 7 01:44:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.128 2018/08/31 18:11:20 sevan Exp $
+# $NetBSD: INSTALL,v 1.129 2019/01/07 01:44:59 scole Exp $
#
# config file for INSTALL FLOPPY
#
@@ -17,7 +17,7 @@ options RTC_OFFSET=0 # hardware clock i
options MEMORY_DISK_HOOKS
options MEMORY_DISK_IS_ROOT # Force root on ram-disk
options MEMORY_DISK_SERVER=0 # no userspace memory disk support
-options MEMORY_DISK_ROOT_SIZE=5120 # 2560 KiB
+options MEMORY_DISK_ROOT_SIZE=5760 # 2880 KiB
options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
options USERCONF # userconf(4) support
Index: src/sys/arch/macppc/conf/INSTALL_601
diff -u src/sys/arch/macppc/conf/INSTALL_601:1.1 src/sys/arch/macppc/conf/INSTALL_601:1.2
--- src/sys/arch/macppc/conf/INSTALL_601:1.1 Mon Nov 12 20:07:47 2018
+++ src/sys/arch/macppc/conf/INSTALL_601 Mon Jan 7 01:44:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_601,v 1.1 2018/11/12 20:07:47 scole Exp $
+# $NetBSD: INSTALL_601,v 1.2 2019/01/07 01:44:59 scole Exp $
#
# config file for INSTALL
#
@@ -19,7 +19,7 @@ options RTC_OFFSET=0 # hardware clock i
options MEMORY_DISK_HOOKS
options MEMORY_DISK_IS_ROOT # Force root on ram-disk
options MEMORY_DISK_SERVER=0 # no userspace memory disk support
-options MEMORY_DISK_ROOT_SIZE=5120 # 2560 KiB
+options MEMORY_DISK_ROOT_SIZE=5760 # 2880 KiB
options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
options USERCONF # userconf(4) support
@@ -72,6 +72,9 @@ pci* at ppb? bus ?
pchb* at pci? dev ? function ? # PCI-Host bridges
ppb* at pci? dev ? function ? # PCI-PCI bridges
+# PCI SCSI controllers
+ahc* at pci? dev ? function ? # Adaptec 294x, aic78x0 SCSI
+
# Display devices
#
# The 7200's onboard video is unsupported by OF so we need either a
@@ -171,3 +174,8 @@ pseudo-device openfirm # /dev/openfirm
#pseudo-device raid # RAIDframe disk driver
#options RAID_AUTOCONFIG # auto-configuration of RAID components
+rlphy* at mii? phy ? # Realtek 8139/8201L PHYs
+rtk* at pci? dev ? function ? # Realtek 8129/8139
+
+#rgephy* at mii? phy ? # Realtek 8169S/8110S internal PHYs
+#ral* at pci? dev ? function ? # Ralink Technology RT25x0 802.11a/b/g
