Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Remove INSTWDCPCM, because for a while now, GENERIC (and INS...
details: https://anonhg.NetBSD.org/src/rev/ce62b288eb22
branches: trunk
changeset: 522050:ce62b288eb22
user: is <is%NetBSD.org@localhost>
date: Sun Feb 10 20:43:33 2002 +0000
description:
Remove INSTWDCPCM, because for a while now, GENERIC (and INSTALL) have
included both pcmcia support, and wdc instead of idesc as the driver for
the Amiga internal ATA connector.
diffstat:
distrib/notes/amiga/install | 6 +-
distrib/notes/common/contents | 6 +-
etc/etc.amiga/Makefile.inc | 4 +-
sys/arch/amiga/conf/INSTWDCPCM | 337 -----------------------------------------
4 files changed, 4 insertions(+), 349 deletions(-)
diffs (truncated from 398 to 300 lines):
diff -r e3d2a6268a29 -r ce62b288eb22 distrib/notes/amiga/install
--- a/distrib/notes/amiga/install Sun Feb 10 19:30:41 2002 +0000
+++ b/distrib/notes/amiga/install Sun Feb 10 20:43:33 2002 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: install,v 1.28 2001/02/11 11:30:54 is Exp $
+.\" $NetBSD: install,v 1.29 2002/02/10 20:43:33 is Exp $
.\"
.\" Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -326,10 +326,6 @@
.Pp
If you did install the kern.tgz kernel, you normally should answer "n".
.Pp
-(In both cases, if you used the INSTWDCPCM kernel for the installation, you
-should replace the installed kernel by netbsd.INSTWDCPCM manually lateron,
-and you need to use netbsd.INSTWDCPCM to run the system.)
-.Pp
Finally, the installer ask you if you want to install the bootblock
code on your root disk. This is a matter of personal choice and can
also be done from a running
diff -r e3d2a6268a29 -r ce62b288eb22 distrib/notes/common/contents
--- a/distrib/notes/common/contents Sun Feb 10 19:30:41 2002 +0000
+++ b/distrib/notes/common/contents Sun Feb 10 20:43:33 2002 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: contents,v 1.40 2001/12/17 21:39:51 fredette Exp $
+.\" $NetBSD: contents,v 1.41 2002/02/10 20:43:34 is Exp $
.\"
.\" Copyright (c) 1999-2001 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -66,10 +66,6 @@
A somewhat smaller kernel, which you can use to boot the system
using loadbsd for installation on memory-tight systems. This is the
same kernel as present on the miniroot.
-. It Pa netbsd.INSTWDCPCM.gz
-As above, but with the (still somewhat experimental) PCMCIA support, and
-with the wdc driver instead of the older idesc driver. If you install using
-this kernel on an A1200, you have to use it lateron, too!
.\}
.
.if r_arm26 \{\
diff -r e3d2a6268a29 -r ce62b288eb22 etc/etc.amiga/Makefile.inc
--- a/etc/etc.amiga/Makefile.inc Sun Feb 10 19:30:41 2002 +0000
+++ b/etc/etc.amiga/Makefile.inc Sun Feb 10 20:43:33 2002 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.inc,v 1.15 2001/11/29 22:45:54 thorpej Exp $
+# $NetBSD: Makefile.inc,v 1.16 2002/02/10 20:43:34 is Exp $
#
# etc.amiga/Makefile.inc -- amiga-specific etc Makefile targets
#
KERNEL_SETS= GENERIC
-EXTRA_KERNELS= INSTALL INSTWDCPCM
+EXTRA_KERNELS= INSTALL
INSTALLATION_DIRS+= installation/miniroot \
installation/misc
diff -r e3d2a6268a29 -r ce62b288eb22 sys/arch/amiga/conf/INSTWDCPCM
--- a/sys/arch/amiga/conf/INSTWDCPCM Sun Feb 10 19:30:41 2002 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,337 +0,0 @@
-# $NetBSD: INSTWDCPCM,v 1.9 2002/01/27 13:23:11 jdolecek Exp $
-#
-# This file was automatically created. Changes will be
-# lost when running make in this directory.
-#
-# Created from:
-#$ NetBSD: GENERIC,v 1.151 2000/10/04 20:38:11 is Exp $
-
-include "arch/amiga/conf/std.amiga"
-
-#ident "GENERIC-$Revision: 1.9 $"
-
-makeoptions COPTS="-Os"
-
-maxusers 8
-options RTC_OFFSET=0
-
-#mainboards to support (in addition to Amiga)
-
-options DRACO
-
-options BB060STUPIDROM # You need this, if you have a non-DraCo
- # MC68060 with an OS ROM up to (at least)
- # V40 (OS3.1) and want to boot with the
- # bootblock.
- # You do not need this if you have a DraCo,
- # have no 68060 or NEVER use the bootblock
-options P5PPC68KBOARD # Phase5 PPC/68K board support
-
-#processors this kernel should support
-
-options M68060 # support for 060
-options M060SP # MC68060 software support (Required for 060)
-
-options M68040 # support for 040
-options FPSP # MC68040 floating point support
-options M68030 # support for 030
-options M68020 # support for 020/851
-options FPU_EMULATE # FPU emulation
-
-#Networking options
-
-options INET # IP networking support (Required)
-options INET6 # IPV6
-#options IPSEC # IP security
-#options IPSEC_ESP # IP security (encryption part; define w/IPSEC)
-#options IPSEC_DEBUG # debug for IP security
-#options GATEWAY # Packet forwarding
-#options DIRECTED_BROADCAST # Broadcast across subnets
-
-options PPP_BSDCOMP # BSD-Compress compression support for PPP
-options PPP_DEFLATE # Deflate compression support for PPP
-options PPP_FILTER # Active filter support for PPP (requires bpf)
-options PFIL_HOOKS # pfil(9) packet filter hooks
-options IPFILTER_LOG # ipmon(8) log support
-
-file-system FFS # Berkeley fast file system
-file-system EXT2FS # second extended file system (linux)
-#file-system LFS # log-structured filesystem (experimental)
-
-file-system NFS # Network File System client side code
-file-system ADOSFS # AmigaDOS file system
-file-system CD9660 # ISO 9660 + Rock Ridge filesystem
-file-system MSDOSFS # MS-DOS filesystem
-
-file-system KERNFS # kernel data-structure filesystem
-
-#Filesystem options
-
-#options FFS_EI # FFS Endian Independant support
-
-#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
- # immutable) behave as system flags.
-
-#Compatibility options for various existing systems
-
-#Support for various kernel options
-
-#options INSECURE # disable kernel security levels
-options SCSIVERBOSE # human readable SCSI error messages
-#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
-
-#Misc. debugging options
-
-options DDB # Kernel debugger
-#options DDB_HISTORY_SIZE=100 # Enable history editing in DDB
-options DIAGNOSTIC # Extra kernel sanity checks
-#options DEBUG # Enable misc. kernel debugging code
-#options SYSCALL_DEBUG # debug all syscalls.
-#options SCSIDEBUG # Add SCSI debugging statements
-#options PANICBUTTON # Forced crash via keypress (???)
-
-#Amiga specific options
-
-#options LIMITMEM=24 # Do not use more than LIMITMEM MB of the
- # first bank of RAM. (default: unlimited)
-#options NKPTADD=4 # set this for 4 additional KPT pages
-#options NKPTADDSHIFT=24 # set this for 1 additional KPT page
- # per 16 MB (1<<24 bytes) of RAM
- # define and decrease this, or define and
- # increase NKPTADD if you get "out of PT pages"
- # panics.
-
-#ATTENTION: There is NO WARRANTY AT ALL that the sync will be complete
-#before the 10 secondinterval ends, or that KBDRESET does work at all.
-#options KBDRESET # sync on Ctrl-Amiga-Amiga
-
-#These options improve performance with the built-in serial port
-#on slower Amigas. Try the larger buffers first then lev6_defer.
-#options SERIBUF_SIZE=4096
-#options SEROBUF_SIZE=32
-#options LEV6_DEFER # defers l6 to l4 (below serial l5)
-
-options RETINACONSOLE # enable code to allow retina to be console
-
-options ULOWELLCONSOLE # enable code to allow a2410 to be console
-options CL5426CONSOLE # Cirrus console
-options CV64CONSOLE # CyberVision console
-options TSENGCONSOLE # Tseng console
-options CV3DCONSOLE # CyberVision 64/3D console
-
-options GRF_ECS # Enhanced Chip Set
-options GRF_NTSC # NTSC
-options GRF_PAL # PAL
-options GRF_A2024 # Support for the A2024
-options GRF_AGA # AGA Chip Set
-options GRF_AGA_VGA # AGA VGAONLY timing
-options GRF_SUPER72 # AGA Super-72
-
-#options KFONT_8X11 # 8x11 font
-
-#This is how you would tell the kernel the A2410 oscillator frequencies:
-#The used frequencies are the defaults, and do not need option setting
-#options ULOWELL_OSC1=36000000
-#options ULOWELL_OSC2=66667000
-
-#This is how you specify the blitting speed, higher values may speed up blits
-#a littel bit. If you raise this value too much some trash may appear.
-#the commented version is the default.
-#options RH_MEMCLK=61000000
-#this option enables the 64 bit sprite which does not work
-#for quite a few people. E.g. The cursor sprite will turn to a block
-#when moved to the top of the screen in X.
-#options RH_64BIT_SPRITE
-#enables fast scroll code appears to now work on 040 systems.
-#options RETINA_SPEED_HACK
-#enables the Hardwarecursor which does not work on some systems.
-#options RH_HARDWARECURSOR
-
-grfcc0 at mainbus0 # custom chips
-grfrt0 at zbus0 # retina II
-
-grfrh0 at zbus0 # retina III
-
-grfcl* at zbus0 # Picasso II/Piccalo/Spectrum
-grful0 at zbus0 # A2410
-grfcv0 at zbus0 # CyberVision 64
-grfet* at zbus0 # Tseng (oMniBus, Domino, Merlin)
-grfcv3d0 at zbus0 # CyberVision 64/3D
-
-grf0 at grfcc0
-grf1 at grfrt0
-
-grf2 at grfrh0
-
-grf3 at grfcl?
-grf4 at grful0
-grf5 at grfcv0
-grf6 at grfet?
-grf7 at grfcv3d0
-
-ite0 at grf0 # terminal emulators for grfs
-ite1 at grf1 # terminal emulators for grfs
-
-ite2 at grf2 # terminal emulators for grfs
-
-ite3 at grf3 # terminal emulators for grfs
-ite4 at grf4 # terminal emulators for grfs
-ite5 at grf5 # terminal emulators for grfs
-ite6 at grf6 # terminal emulators for grfs
-ite7 at grf7 # terminal emulators for grfs
-
-msc0 at zbus0 # A2232 MSC multiport serial.
-mfc0 at zbus0 # MultiFaceCard I/O board
-mfcs0 at mfc0 unit 0 # MFC serial
-mfcs1 at mfc0 unit 1 # MFC serial
-#mfcp0 at mfc0 unit 0 # MFC parallel [not available yet]
-#mfc1 at zbus0 # MultiFaceCard 2nd I/O board
-#mfcs2 at mfc1 unit 0
-#mfcs3 at mfc1 unit 1
-#mfcp1 at mfc1 unit 0
-
-hyper* at zbus? # zbus HyperCom3/3+/4/4+
-#hyper* at mainbus0 # not yet: HyperCom1 + HyperCom3
-com* at hyper? port ? # Hypercom3/4 serial ports
-lpt* at hyper? port ? # Hypercom3+/4+ parallel port
-
-#not enabled yet... needs more testing and clock frequency autodetection
-#iobl* at zbus? # zbus IOBlix
-#com* at iobl? port ? # IOBlix serial ports
-#lpt* at iobl? port ? # IOBlix parallel ports
-
-#Amiga Mainboard devices (sans graphics and keyboard)
-
-ser0 at mainbus0 # Amiga onboard serial
-par0 at mainbus0 # Amiga onboard parallel
-ms* at mainbus0 # Amiga mice
-fdc0 at mainbus0 # Amiga FDC
-fd* at fdc0 unit ? # floppy disks on the later
-a34kbbc0 at mainbus0 # A3000/A4000 battery backed clock
-a2kbbc0 at mainbus0 # A2000 battery backed clock
-aucc* at mainbus0 # Amiga CC audio
-audio* at aucc?
-
-#DraCo Mainboard devices (sans keyboard)
-
-drbbc0 at mainbus0 # DraCo battery backed clock
-drsupio0 at mainbus0 # DraCo superio chip
-com* at drsupio? port ? # DraCo serial
-lpt0 at drsupio? port ? # DraCo parallel
-
-#Zorro-II, Zorro-III, DraCo Direct-Bus devices (sans graphics)
-
-#Ethernet cards:
-le* at zbus0 # A2065, Ameristar, Ariadne
-ne* at zbus0 # AriadneII
-ed* at zbus0 # Hydra, ASDG LanRover
-es* at zbus0 # CEI A4066 EthernetPLUS
-qn* at zbus0 # Quicknet
-
-bah* at zbus0 # C=/Ameristar A2060 / 560
-
-#Greater Valley Product Bus
-gvpbus* at zbus0
-
-#scsi stuff, all possible
-gtsc0 at gvpbus? # GVP series II scsi
-scsibus* at gtsc0
-ahsc0 at mainbus0 # A3000 scsi
Home |
Main Index |
Thread Index |
Old Index