Subject: port-pmax/2548: Misc things needed for other configs than NEWCONF
To: None <gnats-bugs@NetBSD.ORG>
From: None <bouyer@ensta.fr>
List: netbsd-bugs
Date: 06/14/1996 14:59:38
>Number: 2548
>Category: port-pmax
>Synopsis: configs other than NEWCONF may not compile
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: gnats-admin (GNATS administrator)
>State: open
>Class: sw-bug
>Submitter-Id: net
>Arrival-Date: Fri Jun 14 09:20:01 1996
>Last-Modified:
>Originator: Manuel Bouyer
>Organization:
LIX, Ecole Polytechnique, Palaiseau (France).
>Release: 1.2_ALPHA
>Environment:
NetBSD antioche.polytechnique.fr 1.2_ALPHA NetBSD 1.2_ALPHA (ANTIOCHE) #0: Mon Jun 10 17:52:11 MET DST 1996 bouyer@antioche.polytechnique.fr:/usr/src/src_current/sys/arch/pmax/compile/ANTIOCHE pmax
>Description:
The following config file kernel config file doesn't compile, due to
some misc problems.
#
# DECstation (3100 or 5000/xxx)
#
# Generic config.new configuration for NetBSD/pmax
# $NetBSD: NEWCONF,v 1.6.4.1 1996/05/30 03:55:55 mhitch Exp $
#
include "std.pmax"
maxusers 64
# does not really do anything anymore, but this replaces "ident GENERIC"
# (actually, it enables fudging of swap blocks to swap after a miniroot
# in the b partition, and make the kernel call setconf() to ask
# what the root device is.)
#options GENERIC
options CPU_R3000 # R2000/R3000 support
# replaces "cpu ds5k/240"
options DS5000 # generic TC support and 3MAX support
options DS5000_240 # 3MAXPLUS (kn03) support
options DS5000_100 # 3MIN (kn02ba/kmin) support
options DS5000_25 # MAXINE (kn02ca/xine) support
options DS5000_200 # 3MAX (kn02) support, one day
options DS3100 # PMAX (kn01) DECstation 2100, 3100
# You need to set this locally, but it doesn't do much outside the kernel.
# Set up /etc/localtime instead.
options TIMEZONE=0
options DST=0 # use daylight savings rules
# Standard system options
options SWAPPAGER # swap pager (anonymous and swap space)
options VNODEPAGER # vnode pager (mapped files)
options DEVPAGER # device pager (mapped devices)
#options DIAGNOSTIC # extra kernel debugging checks
#options DEBUG # extra kernel debugging support
options "COMPAT_43" # compatibility with 4.3BSD binaries
options KTRACE # system call tracing support
options "NKMEMCLUSTERS=1024" # 4K pages in kernel malloc pool
#options KGDB # support for kernel gdb
#options "KGDBRATE=19200" # kernel gdb port rate (default 9600)
#options "KGDBDEV=15*256+0" # device for kernel gdb
options UCONSOLE
# Filesystem options
options FIFO # POSIX fifo support (in all filesystems)
options FFS # fast filesystem with user and group quotas
options MFS # memory-based filesystem
options NFSCLIENT # Sun NFS-compatible filesystem (client)
options NFSSERVER # Sun NFS-compatible filesystem (server)
#options KERNFS # kernel data-structure filesystem
#options FDESC # user file descriptor filesystem
#options UMAPFS # uid/gid remapping filesystem
options NULLFS # null layer filesystem
options UNION
#options LFS # Log-based filesystem (still experimental)
#options PORTAL # portal filesystem (still experimental)
# Networking options
options INET # Internet protocols
options "TCP_COMPAT_42" # compatibility with 4.2BSD TCP/IP
options GATEWAY # IP packet forwarding
#options MULTICAST # Multicast support
#options MROUTING # Multicast routing support
#options ISO # OSI networking
#options TPIP
#options EON
# pmax specific
options COMPAT_ULTRIX # ultrix compatibility
options "HZ=256" # RTC rate required
# Note that this configuration is unlikely to work, yet...
config netbsd root on rz2a swap on rz2b and rz1b dumps on rz2b
#config gennetbsd swap generic
########################################################################
# #
# DECstation Turbochannel configuration and options #
# #
########################################################################
tc* at mainbus0 # All but PMAXes have a turbochannel
########################################################################
# Common configuration for machines with IO ASIC chips #
# (3MIN, MAXINE, 3MAXPLUS) #
########################################################################
ioasic0 at tc?
#clock0 at ioasic? # RTC
#asc0 at ioasic? # system SCSI subslot
#scc0 at ioasic?
#le0 at ioasic? # tc onboard lance
#scc1 at ioasic? # Not present on Maxine
########################################################################
# MAXINE-only baseboard devices and on-baseboard "options" #
########################################################################
#xcfb0 at tc? # TC framebuffer "option"
#dtop0 at ioasic0
#isdn at ioasic0
#fdc at ioasic0 # floppy disk
########################################################################
# Configuration for 3MAX (5000/200) which has turbochannel but no ASIC.#
# 3MAX (5000/200) baseboard devices and on-baseboard "options" #
########################################################################
clock0 at mainbus0 # RTC
dc0 at mainbus0
le0 at tc? #slot ? offset ? # TC ether "option" on baseboard
asc0 at tc? # TC scsi "option" on baseboard
# For now, pretend this machine has an IOASIC.
dc0 at ioasic? # dc7083 four-port DZ device
########################################################################
# Supported turbochannel option cards #
########################################################################
cfb0 at tc?
mfb0 at tc?
sfb0 at tc?
#sfb1 at tc?
le* at tc? #slot ? offset ? # TC ether option
#tt0 at tc? #slot? offset ?
########################################################################
# Decstation 2100/3100 (aka PMAX aka KN01) configuration. #
# (these don't really have any options except a framebuffer.) #
########################################################################
clock0 at mainbus0 # RTC
pm0 at mainbus0 # 3100 onboard fb
dc0 at mainbus0 # dc7083 four-port DZ device
le* at mainbus0 # 3100 onboard lance
sii0 at mainbus0 # onboard scsi
########################################################################
# SCSI configuration #
########################################################################
#
# SCSI configuration for new-config machine-independent SCSI driver
#
scsibus* at sii?
scsibus* at asc?
sd* at scsibus? target ? lun ?
st* at scsibus? target ? lun ?
cd* at scsibus? target ? lun ?
#
# SCSI configuration for old DECstation SCSI driver
#
oldscsibus* at sii?
oldscsibus* at asc?
rz0 at oldscsibus? target ? drive ?
rz1 at oldscsibus? target ? drive ?
rz2 at oldscsibus? target ? drive ?
rz3 at oldscsibus? target ? drive ?
rz4 at oldscsibus? target ? drive ?
rz5 at oldscsibus? target ? drive ?
tz0 at oldscsibus? target? drive ?
tz1 at oldscsibus? target? drive ?
#
# pseudo-devices
#
pseudo-device sl 4 # serial-line IP ports
pseudo-device ppp 2 # serial-line IP ports
pseudo-device pty 64 # pseudo ptys
pseudo-device bpfilter 16 # packet filter ports
pseudo-device loop
pseudo-device vnd 4 # virtual disk ick
pseudo-device ccd 4 # concatenated disks
#pseudo-device ether # From old config. what does it mean?
pseudo-device rasterconsole 1 # NB: raster console requires "fb"
pseudo-device fb 1 # up to 3 framebuffers
>How-To-Repeat:
config ANTIOCHE; cd ../compile/ANTIOCHE; make depend all
and see the compile failing.
>Fix:
apply the following diffs:
This diff avoid 'cpu_singlestep' undefined symbol for kernels without debug.
Index: pmax/pmax/trap.c
===================================================================
RCS file: /usr/cvs/cvsroot/sources/src_current/sys/arch/pmax/pmax/trap.c,v
retrieving revision 1.1.1.7
diff -c -r1.1.1.7 trap.c
*** trap.c 1996/05/30 21:10:32 1.1.1.7
--- trap.c 1996/06/14 12:34:15
***************
*** 1280,1286 ****
return ((unsigned)InstPtr + 4 + ((short)InstPtr->IType.imm << 2));
}
- #ifdef DEBUG
/*
* This routine is called by procxmt() to single step one instruction.
--- 1280,1285 ----
***************
*** 1393,1398 ****
--- 1392,1399 ----
#endif
return (0);
}
+
+ #ifdef DEBUG
int
kdbpeek(addr)
On my config, reloc.h was sometimes included 2 times, I don't know why
Index: mips/include/reloc.h
===================================================================
RCS file: /usr/cvs/cvsroot/sources/src_current/sys/arch/mips/include/reloc.h,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 reloc.h
*** reloc.h 1996/04/18 13:13:55 1.1.1.1
--- reloc.h 1996/06/14 12:34:31
***************
*** 37,42 ****
--- 37,45 ----
* from: Header: reloc.h,v 1.6 92/06/20 09:59:37 torek Exp
*/
+ #ifndef _MIPS_RELOC_H_
+ #define _MIPS_RELOC_H_
+
/*
* MIPS relocation types.
*/
***************
*** 72,74 ****
--- 75,79 ----
};
#define relocation_info reloc_info_mips
+
+ #endif /* _MIPS_RELOC_H_ */
>Audit-Trail:
>Unformatted: