Source-Changes-HG archive

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

[src/trunk]: src install kernel for ppc601 floppies and iso



details:   https://anonhg.NetBSD.org/src/rev/a5ad20a079e3
branches:  trunk
changeset: 836922:a5ad20a079e3
user:      scole <scole%NetBSD.org@localhost>
date:      Mon Nov 12 20:07:47 2018 +0000

description:
install kernel for ppc601 floppies and iso

diffstat:

 distrib/macppc/floppies/Makefile                       |    4 +-
 distrib/macppc/floppies/bootfloppy-601/Makefile        |    8 +
 distrib/macppc/floppies/bootfloppy-common/Makefile.inc |   24 ++
 distrib/macppc/floppies/bootfloppy/Makefile            |   24 +-
 distrib/macppc/floppies/md-kernel/Makefile             |    3 +-
 distrib/macppc/floppies/ramdisk/Makefile               |    6 +-
 etc/etc.macppc/Makefile.inc                            |    4 +-
 sys/arch/macppc/conf/INSTALL_601                       |  173 +++++++++++++++++
 8 files changed, 219 insertions(+), 27 deletions(-)

diffs (truncated from 313 to 300 lines):

diff -r 43e750912862 -r a5ad20a079e3 distrib/macppc/floppies/Makefile
--- a/distrib/macppc/floppies/Makefile  Mon Nov 12 20:03:42 2018 +0000
+++ b/distrib/macppc/floppies/Makefile  Mon Nov 12 20:07:47 2018 +0000
@@ -1,6 +1,6 @@
-#      $NetBSD: Makefile,v 1.5 2002/04/12 02:19:30 lukem Exp $
+#      $NetBSD: Makefile,v 1.6 2018/11/12 20:11:39 scole Exp $
 
-SUBDIR=        ramdisk .WAIT md-kernel .WAIT bootfloppy
+SUBDIR=        ramdisk .WAIT md-kernel .WAIT bootfloppy .WAIT bootfloppy-601
 TARGETS+=release
 
 .include <bsd.subdir.mk>
diff -r 43e750912862 -r a5ad20a079e3 distrib/macppc/floppies/bootfloppy-601/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/macppc/floppies/bootfloppy-601/Makefile   Mon Nov 12 20:07:47 2018 +0000
@@ -0,0 +1,8 @@
+#      $NetBSD: Makefile,v 1.1 2018/11/12 20:16:46 scole Exp $
+
+FLOPPY_NETBSD= ${KERNOBJ}/netbsd-INSTALL_601.gz
+FLOPPYBASE=    boot601_
+
+.include <bsd.own.mk>
+
+.include "../bootfloppy-common/Makefile.inc"
diff -r 43e750912862 -r a5ad20a079e3 distrib/macppc/floppies/bootfloppy-common/Makefile.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/macppc/floppies/bootfloppy-common/Makefile.inc    Mon Nov 12 20:07:47 2018 +0000
@@ -0,0 +1,24 @@
+#      $NetBSD: Makefile.inc,v 1.1 2018/11/12 20:16:46 scole Exp $
+
+.include <bsd.own.mk>
+.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
+
+# Required variables:
+#  FLOPPY_NETBSD
+#  FLOPPYBASE
+
+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>
diff -r 43e750912862 -r a5ad20a079e3 distrib/macppc/floppies/bootfloppy/Makefile
--- a/distrib/macppc/floppies/bootfloppy/Makefile       Mon Nov 12 20:03:42 2018 +0000
+++ b/distrib/macppc/floppies/bootfloppy/Makefile       Mon Nov 12 20:07:47 2018 +0000
@@ -1,22 +1,8 @@
-#      $NetBSD: Makefile,v 1.28 2015/01/29 20:47:12 joerg Exp $
+#      $NetBSD: Makefile,v 1.29 2018/11/12 20:11:39 scole Exp $
+
+FLOPPY_NETBSD= ${KERNOBJ}/netbsd-INSTALL.gz
+FLOPPYBASE=    boot
 
 .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.prog.mk>
+.include "../bootfloppy-common/Makefile.inc"
diff -r 43e750912862 -r a5ad20a079e3 distrib/macppc/floppies/md-kernel/Makefile
--- a/distrib/macppc/floppies/md-kernel/Makefile        Mon Nov 12 20:03:42 2018 +0000
+++ b/distrib/macppc/floppies/md-kernel/Makefile        Mon Nov 12 20:07:47 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.11 2002/05/08 21:44:56 lukem Exp $
+#      $NetBSD: Makefile,v 1.12 2018/11/12 20:11:39 scole Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -7,6 +7,7 @@
 RAMDISK=       ${RAMDISKDIR}/ramdisk.fs
 
 MDSETTARGETS=          INSTALL         ${RAMDISK}      -       \
+                       INSTALL_601     ${RAMDISK}      -       \
                        GENERIC_MD      ${RAMDISK}      -
 MDSET_RELEASEDIR=      binary/kernel
 
diff -r 43e750912862 -r a5ad20a079e3 distrib/macppc/floppies/ramdisk/Makefile
--- a/distrib/macppc/floppies/ramdisk/Makefile  Mon Nov 12 20:03:42 2018 +0000
+++ b/distrib/macppc/floppies/ramdisk/Makefile  Mon Nov 12 20:07:47 2018 +0000
@@ -1,12 +1,12 @@
-#      $NetBSD: Makefile,v 1.48 2017/01/24 18:04:03 christos Exp $
+#      $NetBSD: Makefile,v 1.49 2018/11/12 20:11:39 scole Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
 
 IMAGE=         ramdisk.fs
-# This must be kept in sync with config option MEMORY_DISK_ROOT_SIZE
-# in both
+# This must be kept in sync with config option MEMORY_DISK_ROOT_SIZE 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
diff -r 43e750912862 -r a5ad20a079e3 etc/etc.macppc/Makefile.inc
--- a/etc/etc.macppc/Makefile.inc       Mon Nov 12 20:03:42 2018 +0000
+++ b/etc/etc.macppc/Makefile.inc       Mon Nov 12 20:07:47 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.9 2014/07/20 14:52:29 macallan Exp $
+#      $NetBSD: Makefile.inc,v 1.10 2018/11/12 20:09:07 scole Exp $
 #
 #      etc.macppc/Makefile.inc -- macppc-specific etc Makefile targets
 #
@@ -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
diff -r 43e750912862 -r a5ad20a079e3 sys/arch/macppc/conf/INSTALL_601
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/macppc/conf/INSTALL_601  Mon Nov 12 20:07:47 2018 +0000
@@ -0,0 +1,173 @@
+#      $NetBSD: INSTALL_601,v 1.1 2018/11/12 20:07:47 scole Exp $
+#
+# config file for INSTALL
+#
+# 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



Home | Main Index | Thread Index | Old Index