NetBSD-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: port-macppc/53549 ppc601 machines need their own INSTALL kernel
The following reply was made to PR port-macppc/53549; it has been noted by GNATS.
From: scole_mail <scole_mail%gmx.com@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc:
Subject: Re: port-macppc/53549 ppc601 machines need their own INSTALL kernel
Date: Thu, 30 Aug 2018 08:56:22 -0700
I was planning to commit this in a week or so unless there are
suggestions or objections.
These patches create separate iso and boot floppy images for
macppc/ppc601 machines. The default macppc install media won't boot as
the 601 kernel needs to be compiled with different flags and #define's.
So the new iso and floppies should be the same as the original macppc,
except for the kernel.
I don't have working hardware to test these; it's getting hard to find
working ~25 year old floppy and cdrom drives...
I plan to update the INSTALL docs once these are checked in.
Thanks
Summary of changes: (A/? = New, R/D = Removed, M = Modified)
=============================================================
? cdroms/installcd601/
? cdroms/installcd601/Makefile
? floppies/bootfloppy-common/
? floppies/bootfloppy-common/Makefile.inc
? floppies/bootfloppy_601/
? floppies/bootfloppy_601/Makefile
M cdroms/Makefile
M floppies/Makefile
M floppies/bootfloppy/Makefile
M floppies/md-kernel/Makefile
M floppies/ramdisk/Makefile
Apply patch with "cd .../src/distrib/macppc ; patch -s -p0 < .../patchfile"
--- /dev/null 2018-08-30 08:13:52.796702781 -0700
+++ cdroms/installcd601/Makefile 2018-08-29 12:31:03.648360761 -0700
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2018/08/29 12:17:50 scole Exp $
+CDBASE= macppc-601 # gives ${CDBASE}.iso
+CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDKERNELS= netbsd-INSTALL_601.gz netbsd
+CDINSTKERNEL= ../../floppies/md-kernel
+CDBUILDEXTRA= ${DESTDIR}/usr/mdec/ofwboot.xcf
+
+.include "${.CURDIR}/../../../common/Makefile.bootcd"
--- /dev/null 2018-08-30 08:13:52.796702781 -0700
+++ floppies/bootfloppy-common/Makefile.inc 2018-08-29 13:46:42.129488532 -0700
@@ -0,0 +1,24 @@
+# $NetBSD: Makefile.inc,v 1.1 2018/08/29 13:46:24 scole Exp $
+
+.include <bsd.own.mk>
+.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
+
+# Required variables:
+# FLOPPY_NETBSD
+
+FLOPPYBASE= boot
+FLOPPYSIZE= 2880
+FLOPPYFILES= boot netbsd
+FLOPPYMAX= 3
+FLOPPYSUFFIX= .fs
+
+FLOPPY_RELEASEDIR= installation/floppy
+
+MDEC= ${DESTDIR}/usr/mdec
+KERNOBJ!= cd ${.CURDIR}/../md-kernel && ${PRINTOBJDIR}
+FLOPPY_BOOT= ${MDEC}/ofwboot
+FLOPPYINSTBOOT= "${TOOL_INSTALLBOOT} -v -m ${MACHINE} -t raw -B 17 @IMAGE@ ${MDEC}/bootxx ${FLOPPY_BOOT}"
+
+.include "${DISTRIBDIR}/common/Makefile.tarfloppy"
+
+.include <bsd.prog.mk>
--- /dev/null 2018-08-30 08:13:52.796702781 -0700
+++ floppies/bootfloppy_601/Makefile 2018-08-29 13:43:14.145518418 -0700
@@ -0,0 +1,7 @@
+# $NetBSD: Makefile,v 1.1 2018/08/29 13:43:08 scole Exp $
+
+FLOPPY_NETBSD= ${KERNOBJ}/netbsd-INSTALL_601.gz
+
+.include <bsd.own.mk>
+
+.include "../bootfloppy-common/Makefile.inc"
Index: cdroms/Makefile
===================================================================
RCS file: /cvsroot/src/distrib/macppc/cdroms/Makefile,v
retrieving revision 1.1
diff -b -u -r1.1 Makefile
--- cdroms/Makefile 6 Mar 2007 21:57:06 -0000 1.1
+++ cdroms/Makefile 30 Aug 2018 15:14:34 -0000
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:06 bouyer Exp $
-SUBDIR= installcd
+SUBDIR= installcd installcd601
TARGETS+= release iso_image
.include <bsd.subdir.mk>
Index: floppies/Makefile
===================================================================
RCS file: /cvsroot/src/distrib/macppc/floppies/Makefile,v
retrieving revision 1.5
diff -b -u -r1.5 Makefile
--- floppies/Makefile 12 Apr 2002 02:19:30 -0000 1.5
+++ floppies/Makefile 30 Aug 2018 15:14:36 -0000
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.5 2002/04/12 02:19:30 lukem Exp $
-SUBDIR= ramdisk .WAIT md-kernel .WAIT bootfloppy
+SUBDIR= ramdisk .WAIT md-kernel .WAIT bootfloppy bootfloppy_601
TARGETS+=release
.include <bsd.subdir.mk>
Index: floppies/bootfloppy/Makefile
===================================================================
RCS file: /cvsroot/src/distrib/macppc/floppies/bootfloppy/Makefile,v
retrieving revision 1.28
diff -b -u -r1.28 Makefile
--- floppies/bootfloppy/Makefile 29 Jan 2015 20:47:12 -0000 1.28
+++ floppies/bootfloppy/Makefile 30 Aug 2018 15:14:37 -0000
@@ -1,22 +1,7 @@
# $NetBSD: Makefile,v 1.28 2015/01/29 20:47:12 joerg Exp $
-.include <bsd.own.mk>
-.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
-
-FLOPPYBASE= boot
-FLOPPYSIZE= 2880
-FLOPPYFILES= boot netbsd
-FLOPPYMAX= 3
-FLOPPYSUFFIX= .fs
-
-FLOPPY_RELEASEDIR= installation/floppy
-
-MDEC= ${DESTDIR}/usr/mdec
-KERNOBJ!= cd ${.CURDIR}/../md-kernel && ${PRINTOBJDIR}
FLOPPY_NETBSD= ${KERNOBJ}/netbsd-INSTALL.gz
-FLOPPY_BOOT= ${MDEC}/ofwboot
-FLOPPYINSTBOOT= "${TOOL_INSTALLBOOT} -v -m ${MACHINE} -t raw -B 17 @IMAGE@ ${MDEC}/bootxx ${FLOPPY_BOOT}"
-.include "${DISTRIBDIR}/common/Makefile.tarfloppy"
+.include <bsd.own.mk>
-.include <bsd.prog.mk>
+.include "../bootfloppy-common/Makefile.inc"
Index: floppies/md-kernel/Makefile
===================================================================
RCS file: /cvsroot/src/distrib/macppc/floppies/md-kernel/Makefile,v
retrieving revision 1.11
diff -b -u -r1.11 Makefile
--- floppies/md-kernel/Makefile 8 May 2002 21:44:56 -0000 1.11
+++ floppies/md-kernel/Makefile 30 Aug 2018 15:14:38 -0000
@@ -7,6 +7,7 @@
RAMDISK= ${RAMDISKDIR}/ramdisk.fs
MDSETTARGETS= INSTALL ${RAMDISK} - \
+ INSTALL_601 ${RAMDISK} - \
GENERIC_MD ${RAMDISK} -
MDSET_RELEASEDIR= binary/kernel
Index: floppies/ramdisk/Makefile
===================================================================
RCS file: /cvsroot/src/distrib/macppc/floppies/ramdisk/Makefile,v
retrieving revision 1.48
diff -b -u -r1.48 Makefile
--- floppies/ramdisk/Makefile 24 Jan 2017 18:04:03 -0000 1.48
+++ floppies/ramdisk/Makefile 30 Aug 2018 15:14:39 -0000
@@ -5,8 +5,9 @@
IMAGE= ramdisk.fs
# This must be kept in sync with config option MEMORY_DISK_ROOT_SIZE
-# in both
+# in
# src/sys/arch/macppc/conf/INSTALL
+# src/sys/arch/macppc/conf/INSTALL_601
# src/sys/arch/macppc/conf/GENERIC_MD
IMAGESIZE= 2560k
MAKEFS_FLAGS+= -f 15
Summary of changes: (A/? = New, R/D = Removed, M = Modified)
=============================================================
M Makefile.inc
Apply patch with "cd .../src/etc/etc.macppc ; patch -s -p0 < .../patchfile"
Index: Makefile.inc
===================================================================
RCS file: /cvsroot/src/etc/etc.macppc/Makefile.inc,v
retrieving revision 1.9
diff -b -u -r1.9 Makefile.inc
--- Makefile.inc 20 Jul 2014 14:52:29 -0000 1.9
+++ Makefile.inc 30 Aug 2018 15:17:36 -0000
@@ -8,6 +8,6 @@
KERNEL_SETS= GENERIC GENERIC.MP GENERIC_601
-BUILD_KERNELS+= INSTALL GENERIC_MD
+BUILD_KERNELS+= INSTALL INSTALL_601 GENERIC_MD
INSTALLATION_DIRS+= installation/floppy
Summary of changes: (A/? = New, R/D = Removed, M = Modified)
=============================================================
A INSTALL_601
Apply patch with "cd .../src/sys/arch/macppc/conf ; patch -s -p0 < .../patchfile"
--- /dev/null 2018-08-30 08:17:09.002386777 -0700
+++ INSTALL_601 2018-08-30 07:35:11.662157791 -0700
@@ -0,0 +1,173 @@
+# $NetBSD: INSTALL_601,v 1.1 2018/08/28 13:37:00 scole Exp $
+#
+# config file for INSTALL FLOPPY
+#
+# this config more or less matches a Power Macintosh 7200 with a USB card,
+# and platinumfb
+
+include "arch/macppc/conf/std.macppc.601"
+
+#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
+
+makeoptions COPTS="-Os" # Reduce size.
+
+maxusers 12
+
+options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT
+
+# 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_SERVER=0 # no userspace memory disk support
+options MEMORY_DISK_ROOT_SIZE=5120 # 2560 KiB
+options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
+
+options USERCONF # userconf(4) support
+options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
+#options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
+
+# Compatibility options
+include "conf/compat_netbsd13.config"
+
+# File systems
+file-system FFS # UFS
+file-system MFS # memory file system
+file-system NFS # Network File System client
+file-system CD9660 # ISO 9660 + Rock Ridge file system
+file-system MSDOSFS # MS-DOS file system
+#file-system PTYFS # /dev/pts/N support
+
+# Filesystem options
+options NFS_V2_ONLY # Exclude NFS3 code to save space
+options APPLE_UFS # Apple UFS support in FFS
+#options FFS_NO_SNAPSHOT # No FFS snapshot support
+options WAPBL # File system journaling support
+
+# Networking options
+options INET # IP + ICMP + TCP + UDP
+options INET6 # IPV6
+options NFS_BOOT_DHCP # Support DHCP NFS root
+
+options WSEMUL_VT100 # VT100 / VT220 emulation
+options WSDISPLAY_DEFAULTSCREENS=1
+#options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
+options FONT_GALLANT12x22 # big, Sun-like font
+options FONT_QVSS8x15 # a smaller font for lower resolutions
+
+# Kernel root file system and dump configuration.
+config netbsd root on ? type ?
+
+#
+# Device configuration
+#
+
+mainbus* at root
+
+cpu* at mainbus?
+bandit* at mainbus?
+
+pci* at bandit? bus ?
+pci* at ppb? bus ?
+
+pchb* at pci? dev ? function ? # PCI-Host bridges
+ppb* at pci? dev ? function ? # PCI-PCI bridges
+
+# Display devices
+#
+# The 7200's onboard video is unsupported by OF so we need either a
+# graphics card that works as OF console or a serial console.
+# The only cards known to work ( so far ) are PCI Voodoo3s flashed with the
+# official Macintosh firmware from 3Dfx. The others should work but are
+# untested with OF 1.0.5
+# this will take over the console if output-device is set to 'screen' or
+# 'platinum'. It will provide a NetBSD console, but still won't work with OF
+#platinumfb0 at mainbus?
+
+#gffb* at pci? function ? # NVIDIA GeForce2 MX
+#machfb* at pci? function ? # ATI Mach 64, Rage, Rage Pro
+#r128fb* at pci? function ? # ATI Rage 128
+voodoofb* at pci? function ? # 3Dfx Voodoo3
+
+# ATI Radeon. Still has problems on some hardware
+#radeonfb* at pci? function ?
+
+# generic PCI framebuffer, should work with everything supported by OF
+genfb* at pci? function ?
+
+# make sure the console display is always wsdisplay0
+wsdisplay0 at wsemuldisplaydev? console 1
+wsdisplay* at wsemuldisplaydev? console 0
+
+obio* at pci? dev ? function ?
+
+mc* at obio? # MACE ethernet
+esp* at obio? flags 0x00ff # 53c9x SCSI
+# the 7200 has no mesh but other PMacs with 601 cards may
+mesh* at obio? flags 0xffff # MESH SCSI
+nvram* at obio? # nvram
+
+# the new, improved ADB subsystem
+
+cuda* at obio? # CUDA, for Old World PowerMacs
+nadb* at adb_bus? # ADB bus enumerator, at cuda or pmu
+adbkbd* at nadb? # ADB keyboard
+adbms* at nadb? # ADB mice and touchpads
+
+wskbd* at wskbddev? console ?
+wsmouse* at wsmousedev?
+
+iic0 at cuda0 # CUDA's IIC bus
+
+zsc* at obio?
+zstty* at zsc? channel ?
+mediabay* at obio?
+wdc* at mediabay? flags 0
+
+# Cryptographic Devices
+
+# PCI cryptographic devices
+# (disabled, requires opencrypto framework which requires generic softints
+#hifn* at pci? dev ? function ? # Hifn 7755/7811/795x
+#ubsec* at pci? dev ? function ? # Broadcom 5501/5601/580x/582x
+
+scsibus* at scsi?
+
+sd* at scsibus? target ? lun ? # SCSI disks
+cd* at scsibus? target ? lun ? # SCSI CD-ROM drives
+
+wdc* at obio? flags 0x1
+atabus* at ata?
+wd* at atabus? drive ? flags 0x0000
+
+atapibus* at atapi?
+
+# PCI USB controllers
+ohci* at pci? dev ? function ? # USB Open Host Controller
+#ehci* at pci? dev ? function ? # USB Enhanced Host Controller
+
+uhci* at pci? dev ? function ?
+usb* at uhci?
+
+#usb* at ehci? # USB bus support
+usb* at ohci? # USB bus support
+uhub* at usb? # USB Hubs
+uhub* at uhub? port ?
+uhidev* at uhub? port ? configuration ? interface ? # USB HID device
+
+ums* at uhidev? reportid ? # USB Mice
+wsmouse* at ums? mux 0
+ukbd* at uhidev? reportid ? # USB Keyboards
+uhid* at uhidev? reportid ? # USB Generic HID
+
+umass* at uhub? port ? configuration ? interface ? # USB Mass Storage
+
+pseudo-device md # memory disk
+#pseudo-device fss # file system snapshot device
+pseudo-device loop # network loopback
+pseudo-device pty # pseudo-terminals
+
+pseudo-device wsmux # mouse and keyboard multiplexor
+pseudo-device openfirm # /dev/openfirm
+
+pseudo-device raid # RAIDframe disk driver
+options RAID_AUTOCONFIG # auto-configuration of RAID components
Home |
Main Index |
Thread Index |
Old Index