CVS commit: src/sys/arch/mvme68k/mvme68k

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Sat Nov 21 17:59:13 UTC 2020

Modified Files:
src/sys/arch/mvme68k/mvme68k: bus_dma.c isr.c

Log Message:
malloc(9) -> kmem(9)


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/mvme68k/mvme68k/bus_dma.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/mvme68k/mvme68k/isr.c

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/mvme68k/mvme68k/bus_dma.c
diff -u src/sys/arch/mvme68k/mvme68k/bus_dma.c:1.37 src/sys/arch/mvme68k/mvme68k/bus_dma.c:1.38
--- src/sys/arch/mvme68k/mvme68k/bus_dma.c:1.37	Fri Nov 12 13:18:58 2010
+++ src/sys/arch/mvme68k/mvme68k/bus_dma.c	Sat Nov 21 17:59:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.37 2010/11/12 13:18:58 uebayasi Exp $	*/
+/* $NetBSD: bus_dma.c,v 1.38 2020/11/21 17:59:13 thorpej Exp $	*/
 
 /*
  * This file was taken from from next68k/dev/bus_dma.c, which was originally
@@ -39,13 +39,13 @@
 
 #include 			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.37 2010/11/12 13:18:58 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.38 2020/11/21 17:59:13 thorpej Exp $");
 
 #include 
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -64,6 +64,14 @@ int	_bus_dmamap_load_buffer_direct_commo
 	bus_dmamap_t, void *, bus_size_t, struct vmspace *, int,
 	paddr_t *, int *, int);
 
+static size_t
+_bus_dmamap_mapsize(int const nsegments)
+{
+	KASSERT(nsegments > 0);
+	return sizeof(struct mvme68k_bus_dmamap) +
+	   (sizeof(bus_dma_segment_t) * (nsegments - 1));
+}
+
 /*
  * Common function for DMA map creation.  May be called by bus-specific
  * DMA map creation functions.
@@ -74,7 +82,6 @@ _bus_dmamap_create(bus_dma_tag_t t, bus_
 {
 	struct mvme68k_bus_dmamap *map;
 	void *mapstore;
-	size_t mapsize;
 
 	/*
 	 * Allocate and initialize the DMA map.  The end of the map
@@ -88,13 +95,10 @@ _bus_dmamap_create(bus_dma_tag_t t, bus_
 	 * The bus_dmamap_t includes one bus_dma_segment_t, hence
 	 * the (nsegments - 1).
 	 */
-	mapsize = sizeof(struct mvme68k_bus_dmamap) +
-	(sizeof(bus_dma_segment_t) * (nsegments - 1));
-	if ((mapstore = malloc(mapsize, M_DMAMAP,
-	(flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK)) == NULL)
+	if ((mapstore = kmem_zalloc(_bus_dmamap_mapsize(nsegments),
+	(flags & BUS_DMA_NOWAIT) ? KM_NOSLEEP : KM_SLEEP)) == NULL)
 		return ENOMEM;
 
-	memset(mapstore, 0, mapsize);
 	map = (struct mvme68k_bus_dmamap *)mapstore;
 	map->_dm_size = size;
 	map->_dm_segcnt = nsegments;
@@ -117,7 +121,7 @@ void
 _bus_dmamap_destroy(bus_dma_tag_t t, bus_dmamap_t map)
 {
 
-	free(map, M_DMAMAP);
+	kmem_free(map, _bus_dmamap_mapsize(map->_dm_segcnt));
 }
 
 /*

Index: src/sys/arch/mvme68k/mvme68k/isr.c
diff -u src/sys/arch/mvme68k/mvme68k/isr.c:1.34 src/sys/arch/mvme68k/mvme68k/isr.c:1.35
--- src/sys/arch/mvme68k/mvme68k/isr.c:1.34	Sun Nov 10 21:16:30 2019
+++ src/sys/arch/mvme68k/mvme68k/isr.c	Sat Nov 21 17:59:13 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: isr.c,v 1.34 2019/11/10 21:16:30 chs Exp $	*/
+/*	$NetBSD: isr.c,v 1.35 2020/11/21 17:59:13 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -34,11 +34,11 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.34 2019/11/10 21:16:30 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.35 2020/11/21 17:59:13 thorpej Exp $");
 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -105,7 +105,7 @@ isrlink_autovec(int (*func)(void *), voi
 		panic("%s: bad ipl %d", __func__, ipl);
 #endif
 
-	newisr = malloc(sizeof(struct isr_autovec), M_DEVBUF, M_WAITOK);
+	newisr = kmem_alloc(sizeof(*newisr), KM_SLEEP);
 	newisr->isr_func = func;
 	newisr->isr_arg = arg;
 	newisr->isr_ipl = ipl;

CVS commit: src/sys/arch/mvme68k/dev

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Wed Mar 13 06:27:34 UTC 2019

Modified Files:
src/sys/arch/mvme68k/dev: pcctwo_68k.c

Log Message:
Fix small (but fatal) oversight in device/softc split.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/mvme68k/dev/pcctwo_68k.c

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/mvme68k/dev/pcctwo_68k.c
diff -u src/sys/arch/mvme68k/dev/pcctwo_68k.c:1.10 src/sys/arch/mvme68k/dev/pcctwo_68k.c:1.11
--- src/sys/arch/mvme68k/dev/pcctwo_68k.c:1.10	Sat Oct 27 17:18:04 2012
+++ src/sys/arch/mvme68k/dev/pcctwo_68k.c	Wed Mar 13 06:27:34 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcctwo_68k.c,v 1.10 2012/10/27 17:18:04 chs Exp $	*/
+/*	$NetBSD: pcctwo_68k.c,v 1.11 2019/03/13 06:27:34 martin Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pcctwo_68k.c,v 1.10 2012/10/27 17:18:04 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcctwo_68k.c,v 1.11 2019/03/13 06:27:34 martin Exp $");
 
 #include 
 #include 
@@ -187,6 +187,7 @@ pcctwoattach(device_t parent, device_t s
 	uint8_t cid;
 
 	sc = sys_pcctwo = device_private(self);
+	sc->sc_dev = self;
 	ma = aux;
 
 	/* Get a handle to the PCCChip2's registers */

CVS commit: src/sys/arch/mvme68k/stand/wrtvid

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Tue Jan  8 00:00:53 UTC 2019

Modified Files:
src/sys/arch/mvme68k/stand/wrtvid: wrtvid.c

Log Message:
Include unistd.h for write(2) and close(2).


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/mvme68k/stand/wrtvid/wrtvid.c

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/mvme68k/stand/wrtvid/wrtvid.c
diff -u src/sys/arch/mvme68k/stand/wrtvid/wrtvid.c:1.8 src/sys/arch/mvme68k/stand/wrtvid/wrtvid.c:1.9
--- src/sys/arch/mvme68k/stand/wrtvid/wrtvid.c:1.8	Mon Apr 28 20:23:29 2008
+++ src/sys/arch/mvme68k/stand/wrtvid/wrtvid.c	Tue Jan  8 00:00:53 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: wrtvid.c,v 1.8 2008/04/28 20:23:29 martin Exp $	*/
+/*	$NetBSD: wrtvid.c,v 1.9 2019/01/08 00:00:53 rin Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -35,6 +35,7 @@
 #include 
 #include 
 #include 
+#include 
 
 /* mvme68k's boot block is 512 bytes long */
 #define SIZEOF_VID		0x200

CVS commit: src/sys/arch/mvme68k/stand/netboot

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Sat Jun 11 06:33:30 UTC 2016

Modified Files:
src/sys/arch/mvme68k/stand/netboot: boot.c

Log Message:
PR 51200 gets in libsa considered harmful: use kgets


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/mvme68k/stand/netboot/boot.c

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/mvme68k/stand/netboot/boot.c
diff -u src/sys/arch/mvme68k/stand/netboot/boot.c:1.16 src/sys/arch/mvme68k/stand/netboot/boot.c:1.17
--- src/sys/arch/mvme68k/stand/netboot/boot.c:1.16	Sat Jan 12 09:54:32 2008
+++ src/sys/arch/mvme68k/stand/netboot/boot.c	Sat Jun 11 06:33:30 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.16 2008/01/12 09:54:32 tsutsui Exp $ */
+/*	$NetBSD: boot.c,v 1.17 2016/06/11 06:33:30 dholland Exp $ */
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -66,7 +66,7 @@ main(void)
 	for (;;) {
 		if (ask) {
 			printf("boot: ");
-			gets(line);
+			kgets(line, sizeof(line));
 			if (line[0]) {
 bugargs.arg_start = line;
 cp = line;

CVS commit: src/sys/arch/mvme68k/stand/bootst

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Jun  5 17:37:36 UTC 2016

Modified Files:
src/sys/arch/mvme68k/stand/bootst: boot.c

Log Message:
use gets_s


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/mvme68k/stand/bootst/boot.c

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/mvme68k/stand/bootst/boot.c
diff -u src/sys/arch/mvme68k/stand/bootst/boot.c:1.8 src/sys/arch/mvme68k/stand/bootst/boot.c:1.9
--- src/sys/arch/mvme68k/stand/bootst/boot.c:1.8	Sat Jan 12 04:54:30 2008
+++ src/sys/arch/mvme68k/stand/bootst/boot.c	Sun Jun  5 13:37:36 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.8 2008/01/12 09:54:30 tsutsui Exp $ */
+/*	$NetBSD: boot.c,v 1.9 2016/06/05 17:37:36 christos Exp $ */
 
 /*-
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -62,7 +62,7 @@ main(void)
 
 	if (flag & RB_ASKNAME) {
 		printf("tapeboot: segment? [%s] ", defname);
-		gets(line);
+		gets_s(line, sizeof(line));
 		if (line[0])
 			file = line;
 	}

CVS commit: src/sys/arch/mvme68k/mvme68k

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Tue May 31 03:25:46 UTC 2016

Modified Files:
src/sys/arch/mvme68k/mvme68k: machdep.c

Log Message:
PR 50792 David Binderman: make sure we don't divide by zero.

The loop that picks delay_divisor might conceivably reject all values,
particularly if the hardware is sulking for some reason; in that case
it'll be left zero. Use 1 instead of 0 so we don't then crash.


To generate a diff of this commit:
cvs rdiff -u -r1.153 -r1.154 src/sys/arch/mvme68k/mvme68k/machdep.c

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/mvme68k/mvme68k/machdep.c
diff -u src/sys/arch/mvme68k/mvme68k/machdep.c:1.153 src/sys/arch/mvme68k/mvme68k/machdep.c:1.154
--- src/sys/arch/mvme68k/mvme68k/machdep.c:1.153	Mon Mar 24 19:52:27 2014
+++ src/sys/arch/mvme68k/mvme68k/machdep.c	Tue May 31 03:25:46 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.153 2014/03/24 19:52:27 christos Exp $	*/
+/*	$NetBSD: machdep.c,v 1.154 2016/05/31 03:25:46 dholland Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.153 2014/03/24 19:52:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.154 2016/05/31 03:25:46 dholland Exp $");
 
 #include "opt_ddb.h"
 #include "opt_m060sp.h"
@@ -309,6 +309,10 @@ mvme147_init(void)
 		bus_space_write_1(bt, bh, PCCREG_TMR1_CONTROL, PCC_TIMERCLEAR);
 		/* retry! */
 	}
+	/* just in case */
+	if (delay_divisor == 0) {
+		delay_divisor = 1;
+	}
 
 	bus_space_unmap(bt, bh, PCCREG_SIZE);
 

CVS commit: src/sys/arch/mvme68k/stand/installboot

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Jan 25 21:58:02 UTC 2016

Modified Files:
src/sys/arch/mvme68k/stand/installboot: Makefile

Log Message:
uses _KERNTYPES


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/mvme68k/stand/installboot/Makefile

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/mvme68k/stand/installboot/Makefile
diff -u src/sys/arch/mvme68k/stand/installboot/Makefile:1.17 src/sys/arch/mvme68k/stand/installboot/Makefile:1.18
--- src/sys/arch/mvme68k/stand/installboot/Makefile:1.17	Wed Aug 21 02:58:58 2013
+++ src/sys/arch/mvme68k/stand/installboot/Makefile	Mon Jan 25 16:58:02 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.17 2013/08/21 06:58:58 matt Exp $
+#	$NetBSD: Makefile,v 1.18 2016/01/25 21:58:02 christos Exp $
 
 NOMAN=	# defined
 
@@ -8,7 +8,7 @@ PROG=	installboot
 BINDIR=/usr/mdec
 LIBSA=${.CURDIR}/../../../../lib/libsa
 COPTS+= -Wall -Wstrict-prototypes -Wmissing-prototypes
-CPPFLAGS+= -I${LIBSA} -I. -D__daddr_t=int32_t
+CPPFLAGS+= -I${LIBSA} -I. -D__daddr_t=int32_t -D_KERNTYPES
 # Need this to work in the miniroot
 LDSTATIC= -static
 

CVS commit: src/sys/arch/mvme68k/stand/libbug

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Nov 21 20:10:28 UTC 2014

Modified Files:
src/sys/arch/mvme68k/stand/libbug: Makefile
Added Files:
src/sys/arch/mvme68k/stand/libbug: bugstart.S
Removed Files:
src/sys/arch/mvme68k/stand/libbug: bugstart.s

Log Message:
rename to bugstart.S


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/mvme68k/stand/libbug/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/arch/mvme68k/stand/libbug/bugstart.S
cvs rdiff -u -r1.2 -r0 src/sys/arch/mvme68k/stand/libbug/bugstart.s

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/mvme68k/stand/libbug/Makefile
diff -u src/sys/arch/mvme68k/stand/libbug/Makefile:1.16 src/sys/arch/mvme68k/stand/libbug/Makefile:1.17
--- src/sys/arch/mvme68k/stand/libbug/Makefile:1.16	Fri Jan 21 10:59:08 2011
+++ src/sys/arch/mvme68k/stand/libbug/Makefile	Fri Nov 21 15:10:28 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.16 2011/01/21 15:59:08 joerg Exp $
+#	$NetBSD: Makefile,v 1.17 2014/11/21 20:10:28 christos Exp $
 
 LIB=bug
 
@@ -21,7 +21,7 @@ libinstall::
 
 # separate rule for bugstart.c
 # this is build separately from rest of libbug
-bugstart.o: bugstart.s
+bugstart.o: bugstart.S
 	${CC} -x assembler-with-cpp -nostdinc ${INCPATH} \
 	-D_STANDALONE -c ${.IMPSRC}
 

Added files:

Index: src/sys/arch/mvme68k/stand/libbug/bugstart.S
diff -u /dev/null src/sys/arch/mvme68k/stand/libbug/bugstart.S:1.1
--- /dev/null	Fri Nov 21 15:10:28 2014
+++ src/sys/arch/mvme68k/stand/libbug/bugstart.S	Fri Nov 21 15:10:28 2014
@@ -0,0 +1,57 @@
+/*	$NetBSD: bugstart.S,v 1.1 2014/11/21 20:10:28 christos Exp $	*/
+
+#define _LOCORE
+#include machine/prom.h
+#undef _LOCORE
+#include machine/asm.h
+
+	.data
+	.even
+
+GLOBAL(bugargs)
+	.space	MVMEPROM_ARGS_MAX*4
+
+	.text
+	.even
+
+	.long	_C_LABEL(start) - 0x10
+	.long	_C_LABEL(start)
+
+#define	BUG_ARG(which)	_C_LABEL(bugargs) + (which)
+
+ENTRY_NOPROFILE(_start)
+ENTRY_NOPROFILE(start)
+	moveml	%d0/%a0,%sp@-
+	lea	_C_LABEL(edata),%a0
+	movl	#_C_LABEL(end) - 4,%d0
+	subl	%a0,%d0
+	lsrl	#2,%d0
+1:	clrl	%a0@+
+	dbra	%d0,1b
+	moveml	%sp@+,%d0/%a0
+	movl	MVMEPROM_REG_DEVLUN, BUG_ARG(MVMEPROM_ARGS_DEVLUN)
+	movl	MVMEPROM_REG_CTRLLUN, BUG_ARG(MVMEPROM_ARGS_CTRLLUN)
+	movl	MVMEPROM_REG_FLAGS, BUG_ARG(MVMEPROM_ARGS_FLAGS)
+	movl	MVMEPROM_REG_CTRLADDR, BUG_ARG(MVMEPROM_ARGS_CTRLADDR)
+	movl	MVMEPROM_REG_ENTRY, BUG_ARG(MVMEPROM_ARGS_ENTRY)
+	movl	MVMEPROM_REG_CONFBLK, BUG_ARG(MVMEPROM_ARGS_CONFBLK)
+	movl	MVMEPROM_REG_NBARGSTART, BUG_ARG(MVMEPROM_ARGS_NBARGSTART)
+	movl	MVMEPROM_REG_NBARGEND, BUG_ARG(MVMEPROM_ARGS_NBARGEND)
+	movl	MVMEPROM_REG_ARGSTART, BUG_ARG(MVMEPROM_ARGS_ARGSTART)
+	movl	MVMEPROM_REG_ARGEND, BUG_ARG(MVMEPROM_ARGS_ARGEND)
+	jmp	_C_LABEL(_bugstart)
+
+ENTRY_NOPROFILE(bugexec)
+	addql	#4,%sp
+	movl	BUG_ARG(MVMEPROM_ARGS_DEVLUN), MVMEPROM_REG_DEVLUN
+	movl	BUG_ARG(MVMEPROM_ARGS_CTRLLUN), MVMEPROM_REG_CTRLLUN
+	movl	BUG_ARG(MVMEPROM_ARGS_FLAGS), MVMEPROM_REG_FLAGS
+	movl	BUG_ARG(MVMEPROM_ARGS_CTRLADDR), MVMEPROM_REG_CTRLADDR
+	movl	BUG_ARG(MVMEPROM_ARGS_ENTRY), MVMEPROM_REG_ENTRY
+	movl	BUG_ARG(MVMEPROM_ARGS_CONFBLK), MVMEPROM_REG_CONFBLK
+	movl	BUG_ARG(MVMEPROM_ARGS_NBARGSTART), MVMEPROM_REG_NBARGSTART
+	movl	BUG_ARG(MVMEPROM_ARGS_NBARGEND), MVMEPROM_REG_NBARGEND
+	movl	BUG_ARG(MVMEPROM_ARGS_ARGSTART), MVMEPROM_REG_ARGSTART
+	movl	BUG_ARG(MVMEPROM_ARGS_ARGEND), MVMEPROM_REG_ARGEND
+ENTRY_NOPROFILE(__main)
+	rts

CVS commit: src/sys/arch/mvme68k/stand/sboot

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Nov 21 20:13:19 UTC 2014

Modified Files:
src/sys/arch/mvme68k/stand/sboot: Makefile

Log Message:
Add libkern for umoddi3 needed for correct leap yar computation in is_leap_year.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/mvme68k/stand/sboot/Makefile

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/mvme68k/stand/sboot/Makefile
diff -u src/sys/arch/mvme68k/stand/sboot/Makefile:1.14 src/sys/arch/mvme68k/stand/sboot/Makefile:1.15
--- src/sys/arch/mvme68k/stand/sboot/Makefile:1.14	Fri Jan 21 10:59:08 2011
+++ src/sys/arch/mvme68k/stand/sboot/Makefile	Fri Nov 21 15:13:18 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.14 2011/01/21 15:59:08 joerg Exp $
+#	$NetBSD: Makefile,v 1.15 2014/11/21 20:13:18 christos Exp $
 
 #
 # sboot would like a newer GNU ld because it can generate S-Records.
@@ -13,7 +13,7 @@ SRCS=		start.s clock.c console.c etherfu
 		oc_cksum.s sboot.c
 SRTOBJ=
 PROG=		sboot
-LIBS=		${LIBSA}
+LIBS=		${LIBSA} ${LIBKERN}
 DPADD=		${LIBS}
 CLEANFILES+=	sboot.srec
 

CVS commit: src/sys/arch/mvme68k/stand/libbug

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Nov 21 20:21:08 UTC 2014

Modified Files:
src/sys/arch/mvme68k/stand/libbug: Makefile

Log Message:
We don't need a special rule now that the file is called .S (having a
just .o rule before broke the MKDEBUG build).


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/mvme68k/stand/libbug/Makefile

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/mvme68k/stand/libbug/Makefile
diff -u src/sys/arch/mvme68k/stand/libbug/Makefile:1.17 src/sys/arch/mvme68k/stand/libbug/Makefile:1.18
--- src/sys/arch/mvme68k/stand/libbug/Makefile:1.17	Fri Nov 21 15:10:28 2014
+++ src/sys/arch/mvme68k/stand/libbug/Makefile	Fri Nov 21 15:21:08 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.17 2014/11/21 20:10:28 christos Exp $
+#	$NetBSD: Makefile,v 1.18 2014/11/21 20:21:08 christos Exp $
 
 LIB=bug
 
@@ -19,12 +19,6 @@ CLEANFILES+= bugstart.o
 # only needed during build
 libinstall::
 
-# separate rule for bugstart.c
-# this is build separately from rest of libbug
-bugstart.o: bugstart.S
-	${CC} -x assembler-with-cpp -nostdinc ${INCPATH} \
-	-D_STANDALONE -c ${.IMPSRC}
-
 all realall: lib${LIB}.a
 
 .include bsd.own.mk

CVS commit: src/sys/arch/mvme68k/stand/libsa

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Nov 20 15:50:25 UTC 2014

Modified Files:
src/sys/arch/mvme68k/stand/libsa: chiptotime.c

Log Message:
this needs clock.h


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mvme68k/stand/libsa/chiptotime.c

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/mvme68k/stand/libsa/chiptotime.c
diff -u src/sys/arch/mvme68k/stand/libsa/chiptotime.c:1.5 src/sys/arch/mvme68k/stand/libsa/chiptotime.c:1.6
--- src/sys/arch/mvme68k/stand/libsa/chiptotime.c:1.5	Sun Nov 16 21:15:48 2014
+++ src/sys/arch/mvme68k/stand/libsa/chiptotime.c	Thu Nov 20 10:50:25 2014
@@ -1,6 +1,7 @@
-/*	$NetBSD: chiptotime.c,v 1.5 2014/11/17 02:15:48 christos Exp $ */
+/*	$NetBSD: chiptotime.c,v 1.6 2014/11/20 15:50:25 christos Exp $ */
 
 #include sys/types.h
+#include sys/clock.h
 
 #include machine/prom.h
 

CVS commit: src/sys/arch/mvme68k/stand/installboot

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Sep 21 16:33:48 UTC 2014

Modified Files:
src/sys/arch/mvme68k/stand/installboot: installboot.c

Log Message:
remove dead code


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 \
src/sys/arch/mvme68k/stand/installboot/installboot.c

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/mvme68k/stand/installboot/installboot.c
diff -u src/sys/arch/mvme68k/stand/installboot/installboot.c:1.18 src/sys/arch/mvme68k/stand/installboot/installboot.c:1.19
--- src/sys/arch/mvme68k/stand/installboot/installboot.c:1.18	Sat Jun 22 22:06:05 2013
+++ src/sys/arch/mvme68k/stand/installboot/installboot.c	Sun Sep 21 12:33:48 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: installboot.c,v 1.18 2013/06/23 02:06:05 dholland Exp $ */
+/*	$NetBSD: installboot.c,v 1.19 2014/09/21 16:33:48 christos Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -219,10 +219,6 @@ loadprotoblocks(char *fname, size_t *siz
 	}
 
 	return (char *)bp;
-
-	if (bp)
-		free((void *)bp);
-	return NULL;
 }
 
 static void

CVS commit: src/sys/arch/mvme68k/conf

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sat Apr  5 11:07:30 UTC 2014

Modified Files:
src/sys/arch/mvme68k/conf: Makefile.mvme68k

Log Message:
Specify both -Wa,-march=68030 and -Wa,-mcpu=68030 in -m68060 case for gcc45.

Now VME177 builds with both gcc45 and gcc48
(though untested on the real machines).

XXX: is it really worth to use -m68060 (instead of -m68020-60)
 for kernel binaries?


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/mvme68k/conf/Makefile.mvme68k

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/mvme68k/conf/Makefile.mvme68k
diff -u src/sys/arch/mvme68k/conf/Makefile.mvme68k:1.64 src/sys/arch/mvme68k/conf/Makefile.mvme68k:1.65
--- src/sys/arch/mvme68k/conf/Makefile.mvme68k:1.64	Sun Mar 30 15:54:37 2014
+++ src/sys/arch/mvme68k/conf/Makefile.mvme68k	Sat Apr  5 11:07:30 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.mvme68k,v 1.64 2014/03/30 15:54:37 tsutsui Exp $
+#	$NetBSD: Makefile.mvme68k,v 1.65 2014/04/05 11:07:30 tsutsui Exp $
 
 # Makefile for NetBSD
 #
@@ -40,7 +40,7 @@ CMACHFLAGS=	-m68030
 .endif
 .else
 .if empty(IDENT:M-DMVME147)  empty(IDENT:M-DMVME162)  empty(IDENT:M-DMVME167)
-CMACHFLAGS=	-m68060 -Wa,-mcpu=68030 -Wa,-m68851
+CMACHFLAGS=	-m68060 -Wa,-march=68030 -Wa,-mcpu=68030 -Wa,-m68851
 .else
 CMACHFLAGS=	-m68020-60 -Wa,-mcpu=68030 -Wa,-m68851
 .endif

CVS commit: src/sys/arch/mvme68k

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Mar 30 15:20:54 UTC 2014

Modified Files:
src/sys/arch/mvme68k/conf: Makefile.mvme68k
src/sys/arch/mvme68k/include: loadfile_machdep.h
src/sys/arch/mvme68k/stand/bootst: dev_tape.c

Log Message:
fixes for gcc-4.8 (John D. Baker)


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/mvme68k/conf/Makefile.mvme68k
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mvme68k/include/loadfile_machdep.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/mvme68k/stand/bootst/dev_tape.c

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/mvme68k/conf/Makefile.mvme68k
diff -u src/sys/arch/mvme68k/conf/Makefile.mvme68k:1.62 src/sys/arch/mvme68k/conf/Makefile.mvme68k:1.63
--- src/sys/arch/mvme68k/conf/Makefile.mvme68k:1.62	Fri Jan 21 10:59:07 2011
+++ src/sys/arch/mvme68k/conf/Makefile.mvme68k	Sun Mar 30 11:20:54 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.mvme68k,v 1.62 2011/01/21 15:59:07 joerg Exp $
+#	$NetBSD: Makefile.mvme68k,v 1.63 2014/03/30 15:20:54 christos Exp $
 
 # Makefile for NetBSD
 #
@@ -40,9 +40,9 @@ CMACHFLAGS=	-m68030
 .endif
 .else
 .if empty(IDENT:M-DMVME147)  empty(IDENT:M-DMVME162)  empty(IDENT:M-DMVME167)
-CMACHFLAGS=	-m68060 -Wa,-m68030 -Wa,-m68851
+CMACHFLAGS=	-m68060 -Wa,-mcpu68030 -Wa,-m68851
 .else
-CMACHFLAGS=	-m68020-60 -Wa,-m68030 -Wa,-m68851
+CMACHFLAGS=	-m68020-60 -Wa,-mcpu68030 -Wa,-m68851
 .endif
 .endif
 CFLAGS+=	${CMACHFLAGS} -msoft-float

Index: src/sys/arch/mvme68k/include/loadfile_machdep.h
diff -u src/sys/arch/mvme68k/include/loadfile_machdep.h:1.5 src/sys/arch/mvme68k/include/loadfile_machdep.h:1.6
--- src/sys/arch/mvme68k/include/loadfile_machdep.h:1.5	Mon Apr 28 16:23:29 2008
+++ src/sys/arch/mvme68k/include/loadfile_machdep.h	Sun Mar 30 11:20:54 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: loadfile_machdep.h,v 1.5 2008/04/28 20:23:29 martin Exp $	*/
+/*	$NetBSD: loadfile_machdep.h,v 1.6 2014/03/30 15:20:54 christos Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
 #define WARN(a)			warn a
 #define PROGRESS(a)		/* nothing */
 #define ALLOC(a)		malloc(a)
-#define DEALLOC(a, b)		free(a)
+#define DEALLOC(a, b)		free(a), __USE(b)
 #define OKMAGIC(a)		((a) == OMAGIC)
 
 #endif

Index: src/sys/arch/mvme68k/stand/bootst/dev_tape.c
diff -u src/sys/arch/mvme68k/stand/bootst/dev_tape.c:1.12 src/sys/arch/mvme68k/stand/bootst/dev_tape.c:1.13
--- src/sys/arch/mvme68k/stand/bootst/dev_tape.c:1.12	Sun Jul 17 16:54:44 2011
+++ src/sys/arch/mvme68k/stand/bootst/dev_tape.c	Sun Mar 30 11:20:54 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: dev_tape.c,v 1.12 2011/07/17 20:54:44 joerg Exp $	*/
+/*	$NetBSD: dev_tape.c,v 1.13 2014/03/30 15:20:54 christos Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -114,9 +114,6 @@ tape_open(struct open_file *f, ...)
 int
 tape_close(struct open_file *f)
 {
-	struct mvmeprom_dskio *ti;
-
-	ti = f-f_devdata;
 	f-f_devdata = NULL;
 	return 0;
 }

CVS commit: src/sys/arch/mvme68k/conf

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sun Mar 30 15:54:38 UTC 2014

Modified Files:
src/sys/arch/mvme68k/conf: Makefile.mvme68k

Log Message:
Fix Error: unrecognized option -mcpu68030.


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/mvme68k/conf/Makefile.mvme68k

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/mvme68k/conf/Makefile.mvme68k
diff -u src/sys/arch/mvme68k/conf/Makefile.mvme68k:1.63 src/sys/arch/mvme68k/conf/Makefile.mvme68k:1.64
--- src/sys/arch/mvme68k/conf/Makefile.mvme68k:1.63	Sun Mar 30 15:20:54 2014
+++ src/sys/arch/mvme68k/conf/Makefile.mvme68k	Sun Mar 30 15:54:37 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.mvme68k,v 1.63 2014/03/30 15:20:54 christos Exp $
+#	$NetBSD: Makefile.mvme68k,v 1.64 2014/03/30 15:54:37 tsutsui Exp $
 
 # Makefile for NetBSD
 #
@@ -40,9 +40,9 @@ CMACHFLAGS=	-m68030
 .endif
 .else
 .if empty(IDENT:M-DMVME147)  empty(IDENT:M-DMVME162)  empty(IDENT:M-DMVME167)
-CMACHFLAGS=	-m68060 -Wa,-mcpu68030 -Wa,-m68851
+CMACHFLAGS=	-m68060 -Wa,-mcpu=68030 -Wa,-m68851
 .else
-CMACHFLAGS=	-m68020-60 -Wa,-mcpu68030 -Wa,-m68851
+CMACHFLAGS=	-m68020-60 -Wa,-mcpu=68030 -Wa,-m68851
 .endif
 .endif
 CFLAGS+=	${CMACHFLAGS} -msoft-float

CVS commit: src/sys/arch/mvme68k

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Mar 24 19:52:27 UTC 2014

Modified Files:
src/sys/arch/mvme68k/dev: sbic.c
src/sys/arch/mvme68k/mvme68k: machdep.c trap.c

Log Message:
use cpu_{g,s}etmodel
fix unused


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/mvme68k/dev/sbic.c
cvs rdiff -u -r1.152 -r1.153 src/sys/arch/mvme68k/mvme68k/machdep.c
cvs rdiff -u -r1.106 -r1.107 src/sys/arch/mvme68k/mvme68k/trap.c

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/mvme68k/dev/sbic.c
diff -u src/sys/arch/mvme68k/dev/sbic.c:1.33 src/sys/arch/mvme68k/dev/sbic.c:1.34
--- src/sys/arch/mvme68k/dev/sbic.c:1.33	Sat Oct 27 13:18:04 2012
+++ src/sys/arch/mvme68k/dev/sbic.c	Mon Mar 24 15:52:27 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: sbic.c,v 1.33 2012/10/27 17:18:04 chs Exp $	*/
+/*	$NetBSD: sbic.c,v 1.34 2014/03/24 19:52:27 christos Exp $	*/
 
 /*
  * Copyright (c) 1990 The Regents of the University of California.
@@ -86,7 +86,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sbic.c,v 1.33 2012/10/27 17:18:04 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: sbic.c,v 1.34 2014/03/24 19:52:27 christos Exp $);
 
 #include opt_ddb.h
 
@@ -900,6 +900,7 @@ sbicreset(struct sbic_softc *dev)
 
 	SBIC_WAIT(regs, SBIC_ASR_INT, 0);
 	GET_SBIC_csr(regs, csr);	/* clears interrupt also */
+	__USE(csr);
 
 	/*
 	 * Set up various chip parameters
@@ -1258,6 +1259,7 @@ sbicxfin(sbic_regmap_p regs, int len, vo
 			} else {
 u_char foo;
 GET_SBIC_data (regs, foo);
+__USE(foo);
 			}
 			wait = sbic_data_wait;
 		}

Index: src/sys/arch/mvme68k/mvme68k/machdep.c
diff -u src/sys/arch/mvme68k/mvme68k/machdep.c:1.152 src/sys/arch/mvme68k/mvme68k/machdep.c:1.153
--- src/sys/arch/mvme68k/mvme68k/machdep.c:1.152	Sat Jul 28 15:08:24 2012
+++ src/sys/arch/mvme68k/mvme68k/machdep.c	Mon Mar 24 15:52:27 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.152 2012/07/28 19:08:24 matt Exp $	*/
+/*	$NetBSD: machdep.c,v 1.153 2014/03/24 19:52:27 christos Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.152 2012/07/28 19:08:24 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.153 2014/03/24 19:52:27 christos Exp $);
 
 #include opt_ddb.h
 #include opt_m060sp.h
@@ -71,6 +71,7 @@ __KERNEL_RCSID(0, $NetBSD: machdep.c,v 
 #include sys/ksyms.h
 #include sys/module.h
 #include sys/device.h
+#include sys/cpu.h
 
 #include ksyms.h
 
@@ -478,51 +479,39 @@ cpu_startup(void)
 	initcpu();
 }
 
-/*
- * Info for CTL_HW
- */
-char	cpu_model[124];
-
 void
 identifycpu(void)
 {
 	char board_str[16];
-	char cpu_str[32];
-	char mmu_str[16];
-	char fpu_str[16];
-	int len = 0;
-
-	memset(cpu_model, 0, sizeof(cpu_model));
-	memset(board_str, 0, sizeof(board_str));
-	memset(cpu_str, 0, sizeof(cpu_str));
-	memset(mmu_str, 0, sizeof(mmu_str));
-	memset(fpu_str, 0, sizeof(fpu_str));
+	const char *cpu_str, *mmu_str, *fpu_str, *cache_str;
 
 	/* Fill in the CPU string. */
 	switch (cputype) {
 #ifdef M68020
 	case CPU_68020:
-		sprintf(cpu_str, MC68020 CPU);
-		sprintf(fpu_str, MC68881 FPU);	/* XXX */
+		cpu_str = MC68020 CPU;
+		fpu_str = , MC68881 FPU;	/* XXX */
 		break;
 #endif
 
 #ifdef M68030
 	case CPU_68030:
-		sprintf(cpu_str, MC68030 CPU+MMU);
-		sprintf(fpu_str, MC68882 FPU);	/* XXX */
+		cpu_str = MC68030 CPU+MMU;
+		fpu_str = , MC68882 FPU;	/* XXX */
 		break;
 #endif
 
 #ifdef M68040
 	case CPU_68040:
-		sprintf(cpu_str, MC68040 CPU+MMU+FPU);
+		cpu_str = MC68040 CPU+MMU+FPU;
+		fpu_str = ;
 		break;
 #endif
 
 #ifdef M68060
 	case CPU_68060:
-		sprintf(cpu_str, MC68060 CPU+MMU+FPU);
+		cpu_str = MC68060 CPU+MMU+FPU;
+		fpu_str = ;
 		break;
 #endif
 
@@ -534,40 +523,31 @@ identifycpu(void)
 	/* Fill in the MMU string; only need to handle one case. */
 	switch (mmutype) {
 	case MMU_68851:
-		sprintf(mmu_str, MC68851 MMU);
+		mmu_str = , MC68851 MMU;
+		break;
+	default:
+		mmu_str = ;
 		break;
 	}
 
-	/* XXX Find out FPU type and fill in string here. */
-
 	/* Fill in board model string. */
 	switch (machineid) {
-#ifdef MVME147
+#if defined(MVME_147) || defined(MVME162) || defined(MVME167) || defined(MVME172) || defined(MVME177)
 	case MVME_147:
-	{
-		char *suffix = (char *)boardid.suffix;
-		len = sprintf(board_str, %x, machineid);
-		if (suffix[0] != '\0') {
-			board_str[len++] = suffix[0];
-			if (suffix[1] != '\0')
-board_str[len++] = suffix[1];
-		}
-		break;
-	}
-#endif
-
-#if defined(MVME162) || defined(MVME167) || defined(MVME172) || defined(MVME177)
 	case MVME_162:
 	case MVME_167:
 	case MVME_172:
 	case MVME_177:
 	{
 		char *suffix = (char *)boardid.suffix;
-		len = sprintf(board_str, %x, machineid);
-		if (suffix[0] != '\0') {
+		int len = snprintf(board_str, sizeof(board_str), %x,
+		machineid);
+		if (suffix[0] != '\0'  len  0 
+		len + 3  sizeof(board_str)) 

CVS commit: src/sys/arch/mvme68k/mvme68k

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sat Mar 15 12:02:28 UTC 2014

Modified Files:
src/sys/arch/mvme68k/mvme68k: locore.s

Log Message:
Remove duplicated INTERRUPT_SAVEREG and INTERRUPT_RESTOREREG macro.

They are in m68k/asm.h and now using different register format.


To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/sys/arch/mvme68k/mvme68k/locore.s

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/mvme68k/mvme68k/locore.s
diff -u src/sys/arch/mvme68k/mvme68k/locore.s:1.112 src/sys/arch/mvme68k/mvme68k/locore.s:1.113
--- src/sys/arch/mvme68k/mvme68k/locore.s:1.112	Sun Mar  9 14:53:52 2014
+++ src/sys/arch/mvme68k/mvme68k/locore.s	Sat Mar 15 12:02:28 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.112 2014/03/09 14:53:52 tsutsui Exp $	*/
+/*	$NetBSD: locore.s,v 1.113 2014/03/15 12:02:28 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -1114,9 +1114,6 @@ Lbrkpt3:
  * intrhand_vectored is the entry point for vectored interrupts.
  */
 
-#define INTERRUPT_SAVEREG	moveml  #0xC0C0,%sp@-
-#define INTERRUPT_RESTOREREG	moveml  %sp@+,#0x0303
-
 ENTRY_NOPROFILE(intrhand_autovec)
 	addql	#1,_C_LABEL(interrupt_depth)
 	INTERRUPT_SAVEREG

CVS commit: src/sys/arch/mvme68k/mvme68k

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sat Mar 15 12:04:22 UTC 2014

Modified Files:
src/sys/arch/mvme68k/mvme68k: locore.s

Log Message:
Use common m68k/busaddrerr.s for bus error and address error handlers.

No binary changes on GENERIC.


To generate a diff of this commit:
cvs rdiff -u -r1.113 -r1.114 src/sys/arch/mvme68k/mvme68k/locore.s

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/mvme68k/mvme68k/locore.s
diff -u src/sys/arch/mvme68k/mvme68k/locore.s:1.113 src/sys/arch/mvme68k/mvme68k/locore.s:1.114
--- src/sys/arch/mvme68k/mvme68k/locore.s:1.113	Sat Mar 15 12:02:28 2014
+++ src/sys/arch/mvme68k/mvme68k/locore.s	Sat Mar 15 12:04:22 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.113 2014/03/15 12:02:28 tsutsui Exp $	*/
+/*	$NetBSD: locore.s,v 1.114 2014/03/15 12:04:22 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -709,174 +709,10 @@ Lmemc040berr:
  */
 #include m68k/m68k/trap_subr.s
 
-#if defined(M68040) || defined(M68060)
-ENTRY_NOPROFILE(addrerr4060)
-	clrl	%sp@-			| stack adjust count
-	moveml	#0x,%sp@-		| save user registers
-	movl	%usp,%a0		| save the user SP
-	movl	%a0,%sp@(FR_SP)		|   in the savearea
-	movl	%sp@(FR_HW+8),%sp@-
-	clrl	%sp@-			| dummy code
-	movl	#T_ADDRERR,%sp@-	| mark address error
-	jra	_ASM_LABEL(faultstkadj)	| and deal with it
-#endif
-
-#if defined(M68060)
-ENTRY_NOPROFILE(buserr60)
-	clrl	%sp@-			| stack adjust count
-	moveml	#0x,%sp@-		| save user registers
-	movl	%usp,%a0		| save the user SP
-	movl	%a0,%sp@(FR_SP)		|   in the savearea
-	movel	%sp@(FR_HW+12),%d0	| FSLW
-	btst	#2,%d0			| branch prediction error?
-	jeq	Lnobpe
-	movc	%cacr,%d2
-	orl	#IC60_CABC,%d2		| clear all branch cache entries
-	movc	%d2,%cacr
-	movl	%d0,%d1
-	andl	#0x7ffd,%d1
-	jeq	_ASM_LABEL(faultstkadjnotrap2)
-Lnobpe:
-| we need to adjust for misaligned addresses
-	movl	%sp@(FR_HW+8),%d1	| grab VA
-	btst	#27,%d0			| check for mis-aligned access
-	jeq	Lberr3			| no, skip
-	addl	#28,%d1			| yes, get into next page
-	| operand case: 3,
-	| instruction case: 4+12+12
-	andl	#PG_FRAME,%d1		| and truncate
-Lberr3:
-	movl	%d1,%sp@-
-	movl	%d0,%sp@-		| code is FSLW now.
-	andw	#0x1f80,%d0
-	jeq	Lberr60			| it is a bus error
-	movl	#T_MMUFLT,%sp@-		| show that we are an MMU fault
-	jra	_ASM_LABEL(faultstkadj)	| and deal with it
-Lberr60:
-	tstl	_C_LABEL(nofault)	| catch bus error?
-	jeq	Lisberr			| no, handle as usual
-	movl	_C_LABEL(nofault),%sp@-	| yes,
-	jbsr	_C_LABEL(longjmp)	|  longjmp(nofault)
-	/* NOTREACHED */
-#endif
-#if defined(M68040)
-ENTRY_NOPROFILE(buserr40)
-	clrl	%sp@-			| stack adjust count
-	moveml	#0x,%sp@-		| save user registers
-	movl	%usp,%a0		| save the user SP
-	movl	%a0,%sp@(FR_SP)		|   in the savearea
-	movl	%sp@(FR_HW+20),%d1	| get fault address
-	moveq	#0,%d0
-	movw	%sp@(FR_HW+12),%d0	| get SSW
-	btst	#11,%d0			| check for mis-aligned
-	jeq	Lbe1stpg		| no skip
-	addl	#3,%d1			| get into next page
-	andl	#PG_FRAME,%d1		| and truncate
-Lbe1stpg:
-	movl	%d1,%sp@-		| pass fault address.
-	movl	%d0,%sp@-		| pass SSW as code
-	btst	#10,%d0			| test ATC
-	jeq	Lberr40			| it is a bus error
-	movl	#T_MMUFLT,%sp@-		| show that we are an MMU fault
-	jra	_ASM_LABEL(faultstkadj)	| and deal with it
-Lberr40:
-	tstl	_C_LABEL(nofault)	| catch bus error?
-	jeq	Lisberr			| no, handle as usual
-	movl	_C_LABEL(nofault),%sp@-	| yes,
-	jbsr	_C_LABEL(longjmp)	|  longjmp(nofault)
-	/* NOTREACHED */
-#endif
-
-#if defined(M68020) || defined(M68030)
-ENTRY_NOPROFILE(busaddrerr2030)
-	clrl	%sp@-			| stack adjust count
-	moveml	#0x,%sp@-		| save user registers
-	movl	%usp,%a0		| save the user SP
-	movl	%a0,%sp@(FR_SP)		|   in the savearea
-	moveq	#0,%d0
-	movw	%sp@(FR_HW+10),%d0	| grab SSW for fault processing
-	btst	#12,%d0			| RB set?
-	jeq	LbeX0			| no, test RC
-	bset	#14,%d0			| yes, must set FB
-	movw	%d0,%sp@(FR_HW+10)	| for hardware too
-LbeX0:
-	btst	#13,%d0			| RC set?
-	jeq	LbeX1			| no, skip
-	bset	#15,%d0			| yes, must set FC
-	movw	%d0,%sp@(FR_HW+10)	| for hardware too
-LbeX1:
-	btst	#8,%d0			| data fault?
-	jeq	Lbe0			| no, check for hard cases
-	movl	%sp@(FR_HW+16),%d1	| fault address is as given in frame
-	jra	Lbe10			| thats it
-Lbe0:
-	btst	#4,%sp@(FR_HW+6)	| long (type B) stack frame?
-	jne	Lbe4			| yes, go handle
-	movl	%sp@(FR_HW+2),%d1	| no, can use save PC
-	btst	#14,%d0			| FB set?
-	jeq	Lbe3			| no, try FC
-	addql	#4,%d1			| yes, adjust address
-	jra	Lbe10			| done
-Lbe3:
-	btst	#15,%d0			| FC set?
-	jeq	Lbe10			| no, done
-	addql	#2,%d1			| yes, adjust address
-	jra	Lbe10			| done
-Lbe4:
-	movl	%sp@(FR_HW+36),%d1	| long format, use stage B address
-	btst	#15,%d0			| FC set?
-	jeq	Lbe10			| no, all done
-	subql	#2,%d1			| yes, adjust address
-Lbe10:
-	movl	%d1,%sp@-		| push fault VA
-	movl	%d0,%sp@-		| and padded SSW
-	movw	%sp@(FR_HW+8+6),%d0	| get frame format/vector offset
-	andw	#0x0FFF,%d0		| clear 

CVS commit: src/sys/arch/mvme68k/mvme68k

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sun Mar  9 14:53:52 UTC 2014

Modified Files:
src/sys/arch/mvme68k/mvme68k: locore.s

Log Message:
Remove trailing spaces and tabs.


To generate a diff of this commit:
cvs rdiff -u -r1.111 -r1.112 src/sys/arch/mvme68k/mvme68k/locore.s

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/mvme68k/mvme68k/locore.s
diff -u src/sys/arch/mvme68k/mvme68k/locore.s:1.111 src/sys/arch/mvme68k/mvme68k/locore.s:1.112
--- src/sys/arch/mvme68k/mvme68k/locore.s:1.111	Fri Jan 31 18:49:35 2014
+++ src/sys/arch/mvme68k/mvme68k/locore.s	Sun Mar  9 14:53:52 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.111 2014/01/31 18:49:35 tsutsui Exp $	*/
+/*	$NetBSD: locore.s,v 1.112 2014/03/09 14:53:52 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -706,7 +706,7 @@ Lmemc040berr:
 
 /*
  * Trap/interrupt vector routines
- */ 
+ */
 #include m68k/m68k/trap_subr.s
 
 #if defined(M68040) || defined(M68060)
@@ -729,7 +729,7 @@ ENTRY_NOPROFILE(buserr60)
 	movl	%a0,%sp@(FR_SP)		|   in the savearea
 	movel	%sp@(FR_HW+12),%d0	| FSLW
 	btst	#2,%d0			| branch prediction error?
-	jeq	Lnobpe			
+	jeq	Lnobpe
 	movc	%cacr,%d2
 	orl	#IC60_CABC,%d2		| clear all branch cache entries
 	movc	%d2,%cacr
@@ -748,7 +748,7 @@ Lnobpe:
 Lberr3:
 	movl	%d1,%sp@-
 	movl	%d0,%sp@-		| code is FSLW now.
-	andw	#0x1f80,%d0 
+	andw	#0x1f80,%d0
 	jeq	Lberr60			| it is a bus error
 	movl	#T_MMUFLT,%sp@-		| show that we are an MMU fault
 	jra	_ASM_LABEL(faultstkadj)	| and deal with it
@@ -1205,7 +1205,7 @@ Laststkadj:
 
 /*
  * Primitives
- */ 
+ */
 
 /*
  * Use common m68k support routines.

CVS commit: src/sys/arch/mvme68k

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Mon Sep 23 01:39:27 UTC 2013

Modified Files:
src/sys/arch/mvme68k/include: prom.h
src/sys/arch/mvme68k/stand/libbug: outln.c outstr.c

Log Message:
Make MVMEPROM_ARG2() macro take two args in a single asm statement.

Fixes a problem that a wrong address is passed to the MVMEPROM outstr
function (then caused garbages on screen) after we switched to gcc-4.5.
Reported and confirmed by Andrew Gillham on port-mvme68k@:
http://mail-index.NetBSD.org/port-mvme68k/2013/09/17/msg84.html
http://mail-index.NetBSD.org/port-mvme68k/2013/09/19/msg85.html
http://mail-index.NetBSD.org/port-mvme68k/2013/09/22/msg95.html
http://mail-index.NetBSD.org/port-mvme68k/2013/09/22/msg97.html
No error on build.sh -m mvme68k build builds.

Should be pulled up to netbsd-6 branches.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/mvme68k/include/prom.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mvme68k/stand/libbug/outln.c \
src/sys/arch/mvme68k/stand/libbug/outstr.c

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/mvme68k/include/prom.h
diff -u src/sys/arch/mvme68k/include/prom.h:1.17 src/sys/arch/mvme68k/include/prom.h:1.18
--- src/sys/arch/mvme68k/include/prom.h:1.17	Sat Dec 24 23:24:01 2005
+++ src/sys/arch/mvme68k/include/prom.h	Mon Sep 23 01:39:27 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: prom.h,v 1.17 2005/12/24 23:24:01 perry Exp $	*/
+/*	$NetBSD: prom.h,v 1.18 2013/09/23 01:39:27 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -155,8 +155,10 @@ struct mvmeprom_args {
 	__asm volatile (clrl %sp@-)
 #define MVMEPROM_ARG1(arg) \
 	__asm volatile (movel %0, %%sp@-::d (arg))
-#define MVMEPROM_ARG2(arg) \
-	__asm volatile (movel %0, %%sp@-::d (arg))
+#define MVMEPROM_ARG2(arg0, arg1)\
+	__asm volatile (movel %0, %%sp@-;			\
+			movel %1, %%sp@-;			\
+			:: d (arg0), d (arg1):)
 #define MVMEPROM_GETRES(ret) \
 	__asm volatile (movel %%sp@+,%0: =d (ret):)
 #define MVMEPROM_GETSR(ret) \

Index: src/sys/arch/mvme68k/stand/libbug/outln.c
diff -u src/sys/arch/mvme68k/stand/libbug/outln.c:1.3 src/sys/arch/mvme68k/stand/libbug/outln.c:1.4
--- src/sys/arch/mvme68k/stand/libbug/outln.c:1.3	Sat Jan 12 09:54:31 2008
+++ src/sys/arch/mvme68k/stand/libbug/outln.c	Mon Sep 23 01:39:27 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: outln.c,v 1.3 2008/01/12 09:54:31 tsutsui Exp $	*/
+/*	$NetBSD: outln.c,v 1.4 2013/09/23 01:39:27 tsutsui Exp $	*/
 
 /*
  * bug routines -- assumes that the necessary sections of memory
@@ -13,7 +13,6 @@ void
 mvmeprom_outln(char *start, char *end)
 {
 
-	MVMEPROM_ARG1(end);
-	MVMEPROM_ARG2(start);
+	MVMEPROM_ARG2(end, start);
 	MVMEPROM_CALL(MVMEPROM_OUTSTRCRLF);
 }
Index: src/sys/arch/mvme68k/stand/libbug/outstr.c
diff -u src/sys/arch/mvme68k/stand/libbug/outstr.c:1.3 src/sys/arch/mvme68k/stand/libbug/outstr.c:1.4
--- src/sys/arch/mvme68k/stand/libbug/outstr.c:1.3	Sat Jan 12 09:54:31 2008
+++ src/sys/arch/mvme68k/stand/libbug/outstr.c	Mon Sep 23 01:39:27 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: outstr.c,v 1.3 2008/01/12 09:54:31 tsutsui Exp $	*/
+/*	$NetBSD: outstr.c,v 1.4 2013/09/23 01:39:27 tsutsui Exp $	*/
 
 /*
  * bug routines -- assumes that the necessary sections of memory
@@ -13,7 +13,6 @@ void
 mvmeprom_outstr(char *start, char *end)
 {
 
-	MVMEPROM_ARG1(end);
-	MVMEPROM_ARG2(start);
+	MVMEPROM_ARG2(end, start);
 	MVMEPROM_CALL(MVMEPROM_OUTSTR);
 }

CVS commit: src/sys/arch/mvme68k/stand

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sat Sep 21 08:32:39 UTC 2013

Modified Files:
src/sys/arch/mvme68k/stand: Makefile.booters
src/sys/arch/mvme68k/stand/libsa: Makefile Makefile.inc

Log Message:
Explicitly link SRT0.o (Standalone RunTime startup code) first.

This is my fault on changes to make mvme68k bootloaders use MI libsa:
http://mail-index.netbsd.org/source-changes/2011/01/02/msg016539.html
MVME PROM requires raw binaries (by objcopy -O binary) so we have to
make sure the entry point is located at the first address of the binaries.

The problem (6.1 netboot fails with an illegal instruction message)
is reported by Andrew Gillham on port-mvme68k@:
http://mail-index.netbsd.org/port-mvme68k/2013/09/17/msg82.html
Note mvme68k bootloadres in netbsd-6 still have another bug triggered
by gcc-4.5.

Should be pulled up to netbsd-6 branches.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/mvme68k/stand/Makefile.booters
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/mvme68k/stand/libsa/Makefile
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mvme68k/stand/libsa/Makefile.inc

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/mvme68k/stand/Makefile.booters
diff -u src/sys/arch/mvme68k/stand/Makefile.booters:1.23 src/sys/arch/mvme68k/stand/Makefile.booters:1.24
--- src/sys/arch/mvme68k/stand/Makefile.booters:1.23	Mon Aug 12 16:34:05 2013
+++ src/sys/arch/mvme68k/stand/Makefile.booters	Sat Sep 21 08:32:39 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.booters,v 1.23 2013/08/12 16:34:05 joerg Exp $
+#	$NetBSD: Makefile.booters,v 1.24 2013/09/21 08:32:39 tsutsui Exp $
 
 S?=		${.CURDIR}/../../../..
 MDEC_DIR?=	/usr/mdec
@@ -59,6 +59,8 @@ LIBSA_DIR!=	cd ${LIB_SA_DIR}  ${PRINTO
 LIBSA=		${LIBSA_DIR}/lib/sa/libsa.a
 LIBKERN=	${LIBSA_DIR}/lib/kern/libkern.a
 
+SRTOBJ?= ${LIBSA_DIR}/SRT0.o
+
 LIB_BUG_DIR=	${.CURDIR}/../libbug
 LIBBUG_DIR!=	cd ${LIB_BUG_DIR}  ${PRINTOBJDIR}
 LIBBUG=${LIBBUG_DIR}/libbug.a

Index: src/sys/arch/mvme68k/stand/libsa/Makefile
diff -u src/sys/arch/mvme68k/stand/libsa/Makefile:1.33 src/sys/arch/mvme68k/stand/libsa/Makefile:1.34
--- src/sys/arch/mvme68k/stand/libsa/Makefile:1.33	Sun Jan  2 05:30:12 2011
+++ src/sys/arch/mvme68k/stand/libsa/Makefile	Sat Sep 21 08:32:39 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.33 2011/01/02 05:30:12 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.34 2013/09/21 08:32:39 tsutsui Exp $
 
 S!= cd ${.CURDIR}/../../../..; pwd
 
@@ -31,7 +31,9 @@ LIBKERN= ${KERNLIB}
 
 LIBS= ${LIBSA} ${LIBKERN}
 
-all realall: ${LIBS}
+CLEANFILES+= SRT0.o
+
+all realall: ${LIBS} SRT0.o
 
 cleandir distclean: .WAIT cleanlibdir
 

Index: src/sys/arch/mvme68k/stand/libsa/Makefile.inc
diff -u src/sys/arch/mvme68k/stand/libsa/Makefile.inc:1.5 src/sys/arch/mvme68k/stand/libsa/Makefile.inc:1.6
--- src/sys/arch/mvme68k/stand/libsa/Makefile.inc:1.5	Sun Jan  2 05:30:12 2011
+++ src/sys/arch/mvme68k/stand/libsa/Makefile.inc	Sat Sep 21 08:32:39 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.5 2011/01/02 05:30:12 tsutsui Exp $
+#	$NetBSD: Makefile.inc,v 1.6 2013/09/21 08:32:39 tsutsui Exp $
 
 S!= cd ${SA_EXTRADIR}/../../../..; pwd
 
@@ -9,8 +9,7 @@ SRC_sa=   dev_net.c
 
 SRC_mvme= exec_mvme.c
 
-SRC_here= SRT0.S \
-	  bugdev.c \
+SRC_here= bugdev.c \
 	  chiptotime.c clock.c \
 	  parse_args.c
 

CVS commit: src/sys/arch/mvme68k/mvme68k

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Thu Sep 19 12:04:36 UTC 2013

Modified Files:
src/sys/arch/mvme68k/mvme68k: pmap_bootstrap.c

Log Message:
Move physmem calculations before nptpage initialization.

Fixes mvme68k specific part of PR port-m68k/45915
(panic: pmap_enter_ptpage: can't get KPT page).
Reported and confirmed by Andrew Gillham on his MVME177:
http://mail-index.NetBSD.org/port-mvme68k/2013/09/17/msg82.html

Should be pulled up to all netbsd-6 branches.


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c

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/mvme68k/mvme68k/pmap_bootstrap.c
diff -u src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.51 src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.52
--- src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.51	Fri Feb 10 06:28:39 2012
+++ src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c	Thu Sep 19 12:04:36 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap_bootstrap.c,v 1.51 2012/02/10 06:28:39 mhitch Exp $	*/
+/*	$NetBSD: pmap_bootstrap.c,v 1.52 2013/09/19 12:04:36 tsutsui Exp $	*/
 
 /* 
  * Copyright (c) 1991, 1993
@@ -36,7 +36,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pmap_bootstrap.c,v 1.51 2012/02/10 06:28:39 mhitch Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap_bootstrap.c,v 1.52 2013/09/19 12:04:36 tsutsui Exp $);
 
 #include opt_m68k_arch.h
 
@@ -100,6 +100,42 @@ pmap_bootstrap(paddr_t nextpa, paddr_t f
 #endif
 
 	/*
+	 * Initialize the mem_clusters[] array for the crash dump
+	 * code.  While we're at it, compute the total amount of
+	 * physical memory in the system.
+	 */
+	for (i = 0; i  VM_PHYSSEG_MAX; i++) {
+		if (RELOC(phys_seg_list[i].ps_start, paddr_t) ==
+		RELOC(phys_seg_list[i].ps_end, paddr_t)) {
+			/*
+			 * No more memory.
+			 */
+			break;
+		}
+
+		/*
+		 * Make sure these are properly rounded.
+		 */
+		RELOC(phys_seg_list[i].ps_start, paddr_t) =
+		m68k_round_page(RELOC(phys_seg_list[i].ps_start,
+	  paddr_t));
+		RELOC(phys_seg_list[i].ps_end, paddr_t) =
+		m68k_trunc_page(RELOC(phys_seg_list[i].ps_end,
+	  paddr_t));
+
+		size = RELOC(phys_seg_list[i].ps_end, paddr_t) -
+		RELOC(phys_seg_list[i].ps_start, paddr_t);
+
+		RELOC(mem_clusters[i].start, u_quad_t) =
+		RELOC(phys_seg_list[i].ps_start, paddr_t);
+		RELOC(mem_clusters[i].size, u_quad_t) = size;
+
+		RELOC(physmem, int) += size  PGSHIFT;
+
+		RELOC(mem_cluster_cnt, int) += 1;
+	}
+
+	/*
 	 * Calculate important physical addresses:
 	 *
 	 *	lwp0upa		lwp0 u-area		UPAGES pages
@@ -409,42 +445,6 @@ pmap_bootstrap(paddr_t nextpa, paddr_t f
 	RELOC(lwp0uarea, vaddr_t) = lwp0upa - firstpa;
 
 	/*
-	 * Initialize the mem_clusters[] array for the crash dump
-	 * code.  While we're at it, compute the total amount of
-	 * physical memory in the system.
-	 */
-	for (i = 0; i  VM_PHYSSEG_MAX; i++) {
-		if (RELOC(phys_seg_list[i].ps_start, paddr_t) ==
-		RELOC(phys_seg_list[i].ps_end, paddr_t)) {
-			/*
-			 * No more memory.
-			 */
-			break;
-		}
-
-		/*
-		 * Make sure these are properly rounded.
-		 */
-		RELOC(phys_seg_list[i].ps_start, paddr_t) =
-		m68k_round_page(RELOC(phys_seg_list[i].ps_start,
-	  paddr_t));
-		RELOC(phys_seg_list[i].ps_end, paddr_t) =
-		m68k_trunc_page(RELOC(phys_seg_list[i].ps_end,
-	  paddr_t));
-
-		size = RELOC(phys_seg_list[i].ps_end, paddr_t) -
-		RELOC(phys_seg_list[i].ps_start, paddr_t);
-
-		RELOC(mem_clusters[i].start, u_quad_t) =
-		RELOC(phys_seg_list[i].ps_start, paddr_t);
-		RELOC(mem_clusters[i].size, u_quad_t) = size;
-
-		RELOC(physmem, int) += size  PGSHIFT;
-
-		RELOC(mem_cluster_cnt, int) += 1;
-	}
-
-	/*
 	 * Scoot the start of available on-board RAM forward to
 	 * account for:
 	 *

CVS commit: src/sys/arch/mvme68k/stand/installboot

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Wed Aug 21 06:58:58 UTC 2013

Modified Files:
src/sys/arch/mvme68k/stand/installboot: Makefile

Log Message:
Use bsd.klinks.mk


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/mvme68k/stand/installboot/Makefile

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/mvme68k/stand/installboot/Makefile
diff -u src/sys/arch/mvme68k/stand/installboot/Makefile:1.16 src/sys/arch/mvme68k/stand/installboot/Makefile:1.17
--- src/sys/arch/mvme68k/stand/installboot/Makefile:1.16	Wed Dec 28 08:08:00 2005
+++ src/sys/arch/mvme68k/stand/installboot/Makefile	Wed Aug 21 06:58:58 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.16 2005/12/28 08:08:00 skrll Exp $
+#	$NetBSD: Makefile,v 1.17 2013/08/21 06:58:58 matt Exp $
 
 NOMAN=	# defined
 
@@ -12,19 +12,9 @@ CPPFLAGS+= -I${LIBSA} -I. -D__daddr_t=in
 # Need this to work in the miniroot
 LDSTATIC= -static
 
-.if !make(obj)  !make(clean)  !make(cleandir)
-.BEGIN: machine
-.NOPATH: machine
-
-machine::
-	-rm -f $@
-	ln -s ${.CURDIR}/../../include $@
-.endif
-
-CLEANFILES+= machine
-
 .PATH.c: ${LIBSA}
 
 SRCS=	installboot.c byteorder.c loadfile.c loadfile_aout.c loadfile_elf32.c
 
 .include bsd.prog.mk
+.include bsd.klinks.mk

CVS commit: src/sys/arch/mvme68k/stand/sboot

[Havard Eidnes]

Module Name:src
Committed By:   he
Date:   Thu Sep 29 09:18:17 UTC 2011

Modified Files:
src/sys/arch/mvme68k/stand/sboot: etherfun.c

Log Message:
Drop the static from the HEXDIGITS declaration, now that there's an
extern definition in sys/systm.h, to allow this to continue to build.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/mvme68k/stand/sboot/etherfun.c

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/mvme68k/stand/sboot/etherfun.c
diff -u src/sys/arch/mvme68k/stand/sboot/etherfun.c:1.11 src/sys/arch/mvme68k/stand/sboot/etherfun.c:1.12
--- src/sys/arch/mvme68k/stand/sboot/etherfun.c:1.11	Fri Feb 25 00:17:35 2011
+++ src/sys/arch/mvme68k/stand/sboot/etherfun.c	Thu Sep 29 09:18:17 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: etherfun.c,v 1.11 2011/02/25 00:17:35 joerg Exp $	*/
+/*	$NetBSD: etherfun.c,v 1.12 2011/09/29 09:18:17 he Exp $	*/
 
 /*
  * Copyright (c) 1995 Charles D. Cranor and Seth Widoff
@@ -90,7 +90,7 @@ rev_arp(void) 
 
 /* Send a tftp read request or acknowledgement 
mesgtype 0 is a read request, 1 is an aknowledgement */
-static const char HEXDIGITS[16] = 0123456789ABCDEF;
+const char HEXDIGITS[16] = 0123456789ABCDEF;
 
 void 
 do_send_tftp(int mesgtype) 

CVS commit: src/sys/arch/mvme68k/stand/libsa

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sun May 29 10:29:01 UTC 2011

Modified Files:
src/sys/arch/mvme68k/stand/libsa: exec_mvme.c

Log Message:
Avoid backward seek on tape boot.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/mvme68k/stand/libsa/exec_mvme.c

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/mvme68k/stand/libsa/exec_mvme.c
diff -u src/sys/arch/mvme68k/stand/libsa/exec_mvme.c:1.15 src/sys/arch/mvme68k/stand/libsa/exec_mvme.c:1.16
--- src/sys/arch/mvme68k/stand/libsa/exec_mvme.c:1.15	Sat Jan 12 09:54:32 2008
+++ src/sys/arch/mvme68k/stand/libsa/exec_mvme.c	Sun May 29 10:29:01 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: exec_mvme.c,v 1.15 2008/01/12 09:54:32 tsutsui Exp $ */
+/*	$NetBSD: exec_mvme.c,v 1.16 2011/05/29 10:29:01 tsutsui Exp $ */
 
 /*-
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -56,7 +56,7 @@
 
 	lflags = LOAD_KERNEL;
 	if ((flag  RB_NOSYM) != 0 )
-		lflags = ~LOAD_SYM;
+		lflags = ~(LOAD_SYM | LOAD_BACKWARDS);
 
 	marks[MARK_START] = KERN_LOADADDR;
 	if ((fd = loadfile(file, marks, lflags)) == -1)

CVS commit: src/sys/arch/mvme68k/stand

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sun Jan  2 05:30:12 UTC 2011

Modified Files:
src/sys/arch/mvme68k/stand: Makefile.booters
src/sys/arch/mvme68k/stand/bootsd: Makefile version
src/sys/arch/mvme68k/stand/bootst: Makefile version
src/sys/arch/mvme68k/stand/bootxx: Makefile version
src/sys/arch/mvme68k/stand/libsa: Makefile
src/sys/arch/mvme68k/stand/netboot: Makefile version
src/sys/arch/mvme68k/stand/sboot: version
Added Files:
src/sys/arch/mvme68k/stand/libsa: Makefile.inc

Log Message:
Switch mvme68k standalone problams to using MI libsa and libkern
for maintainablility. Also bump version for note.

Compile test only, but no functional changes.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/mvme68k/stand/Makefile.booters
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mvme68k/stand/bootsd/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mvme68k/stand/bootsd/version
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/mvme68k/stand/bootst/Makefile
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mvme68k/stand/bootst/version
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/mvme68k/stand/bootxx/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mvme68k/stand/bootxx/version
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/mvme68k/stand/libsa/Makefile
cvs rdiff -u -r0 -r1.5 src/sys/arch/mvme68k/stand/libsa/Makefile.inc
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/mvme68k/stand/netboot/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mvme68k/stand/netboot/version
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mvme68k/stand/sboot/version

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/mvme68k/stand/Makefile.booters
diff -u src/sys/arch/mvme68k/stand/Makefile.booters:1.20 src/sys/arch/mvme68k/stand/Makefile.booters:1.21
--- src/sys/arch/mvme68k/stand/Makefile.booters:1.20	Thu Dec 24 16:39:39 2009
+++ src/sys/arch/mvme68k/stand/Makefile.booters	Sun Jan  2 05:30:11 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.booters,v 1.20 2009/12/24 16:39:39 tsutsui Exp $
+#	$NetBSD: Makefile.booters,v 1.21 2011/01/02 05:30:11 tsutsui Exp $
 
 S?=		${.CURDIR}/../../../..
 MDEC_DIR?=	/usr/mdec
@@ -56,18 +56,8 @@
 
 LIB_SA_DIR=	${.CURDIR}/../libsa
 LIBSA_DIR!=	cd ${LIB_SA_DIR}  ${PRINTOBJDIR}
-LIBSA=${LIBSA_DIR}/libsa.a
-
-.PHONY: ${LIBSA}
-${LIBSA}:
-	@echo making sure the libsa is up to date...
-	@cd ${LIB_SA_DIR}  ${MAKE}
-
-SRTOBJ?= ${LIBSA_DIR}/SRT0.o
-.PHONY: ${SRTOBJ}
-${SRTOBJ}:
-	@echo making sure the libsa is up to date...
-	@cd ${LIB_SA_DIR}  ${MAKE} SRT0.o
+LIBSA=		${LIBSA_DIR}/lib/sa/libsa.a
+LIBKERN=	${LIBSA_DIR}/lib/kern/libkern.a
 
 LIB_BUG_DIR=	${.CURDIR}/../libbug
 LIBBUG_DIR!=	cd ${LIB_BUG_DIR}  ${PRINTOBJDIR}

Index: src/sys/arch/mvme68k/stand/bootsd/Makefile
diff -u src/sys/arch/mvme68k/stand/bootsd/Makefile:1.6 src/sys/arch/mvme68k/stand/bootsd/Makefile:1.7
--- src/sys/arch/mvme68k/stand/bootsd/Makefile:1.6	Mon Dec  4 21:25:58 2000
+++ src/sys/arch/mvme68k/stand/bootsd/Makefile	Sun Jan  2 05:30:11 2011
@@ -1,9 +1,9 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	$NetBSD: Makefile,v 1.6 2000/12/04 21:25:58 scw Exp $
+#	$NetBSD: Makefile,v 1.7 2011/01/02 05:30:11 tsutsui Exp $
 
 SRCS=   boot.c conf.c
 PROG=	bootsd 
-LIBS=	${LIBSA} ${LIBBUG}
+LIBS=	${LIBSA} ${LIBKERN} ${LIBBUG}
 DPADD=	${LIBS}
 
 .include ../Makefile.booters

Index: src/sys/arch/mvme68k/stand/bootsd/version
diff -u src/sys/arch/mvme68k/stand/bootsd/version:1.4 src/sys/arch/mvme68k/stand/bootsd/version:1.5
--- src/sys/arch/mvme68k/stand/bootsd/version:1.4	Fri Nov  9 19:53:14 2001
+++ src/sys/arch/mvme68k/stand/bootsd/version	Sun Jan  2 05:30:11 2011
@@ -1,7 +1,8 @@
-$NetBSD: version,v 1.4 2001/11/09 19:53:14 scw Exp $
+$NetBSD: version,v 1.5 2011/01/02 05:30:11 tsutsui Exp $
 
 1.1:	Initial bootsd import (from sun3 port, adjusted for mvme68k port
 	by Chuck Cranor)
 1.2:	Support verbose/quiet boot.
 1.3:	loadfile() update:  ELF symbols no longer need backward seeks.
 1.4:	loadfile() update to avoid backwards seeks for ELF Program Headers.
+1.5:	switched to using MI libsa and libkern

Index: src/sys/arch/mvme68k/stand/bootst/Makefile
diff -u src/sys/arch/mvme68k/stand/bootst/Makefile:1.14 src/sys/arch/mvme68k/stand/bootst/Makefile:1.15
--- src/sys/arch/mvme68k/stand/bootst/Makefile:1.14	Sat Feb  9 09:36:00 2002
+++ src/sys/arch/mvme68k/stand/bootst/Makefile	Sun Jan  2 05:30:11 2011
@@ -1,11 +1,11 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	$NetBSD: Makefile,v 1.14 2002/02/09 09:36:00 lukem Exp $
+#	$NetBSD: Makefile,v 1.15 2011/01/02 05:30:11 tsutsui Exp $
 
 CLEANFILES+=stboot bootst bootst.bug
 
 PROG=bootst.bug
 SRCS=   boot.c conf.c dev_tape.c rawfs.c
-LIBS=	${LIBSA} ${LIBBUG}
+LIBS=	${LIBSA} ${LIBKERN} ${LIBBUG}
 SRTOBJ=
 DPADD=	${LIBS} ${WRTVID}
 

Index: src/sys/arch/mvme68k/stand/bootst/version
diff -u src/sys/arch/mvme68k/stand/bootst/version:1.5 

CVS commit: src/sys/arch/mvme68k

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sun Jan  2 06:15:04 UTC 2011

Modified Files:
src/sys/arch/mvme68k/include: vmparam.h
src/sys/arch/mvme68k/mvme68k: pmap_bootstrap.c

Log Message:
Remove last kernel PT page stuff derived from hp300 where PA != VA.

Compile test only, but same changes as other PA == VA m68k ports like
luna68k, news68k, and x68k used for a decade.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/mvme68k/include/vmparam.h
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c

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/mvme68k/include/vmparam.h
diff -u src/sys/arch/mvme68k/include/vmparam.h:1.32 src/sys/arch/mvme68k/include/vmparam.h:1.33
--- src/sys/arch/mvme68k/include/vmparam.h:1.32	Sat Nov  6 15:42:47 2010
+++ src/sys/arch/mvme68k/include/vmparam.h	Sun Jan  2 06:15:04 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmparam.h,v 1.32 2010/11/06 15:42:47 uebayasi Exp $	*/
+/*	$NetBSD: vmparam.h,v 1.33 2011/01/02 06:15:04 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -147,7 +147,7 @@
 #define VM_MAXUSER_ADDRESS	((vaddr_t)0xFFF0)
 #define VM_MAX_ADDRESS		((vaddr_t)0xFFF0)
 #define VM_MIN_KERNEL_ADDRESS	((vaddr_t)0)
-#define VM_MAX_KERNEL_ADDRESS	((vaddr_t)(0-PAGE_SIZE*NPTEPG*2))
+#define VM_MAX_KERNEL_ADDRESS	((vaddr_t)(0-PAGE_SIZE*NPTEPG))
 
 /* virtual sizes (bytes) for various kernel submaps */
 #define VM_PHYS_SIZE		(USRIOSIZE*PAGE_SIZE)

Index: src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c
diff -u src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.44 src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.45
--- src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.44	Sat Dec 25 16:14:44 2010
+++ src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c	Sun Jan  2 06:15:04 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap_bootstrap.c,v 1.44 2010/12/25 16:14:44 tsutsui Exp $	*/
+/*	$NetBSD: pmap_bootstrap.c,v 1.45 2011/01/02 06:15:04 tsutsui Exp $	*/
 
 /* 
  * Copyright (c) 1991, 1993
@@ -38,7 +38,7 @@
 #include opt_m68k_arch.h
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pmap_bootstrap.c,v 1.44 2010/12/25 16:14:44 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap_bootstrap.c,v 1.45 2011/01/02 06:15:04 tsutsui Exp $);
 
 #include sys/param.h
 #include sys/kcore.h
@@ -89,7 +89,7 @@
 void
 pmap_bootstrap(paddr_t nextpa, paddr_t firstpa)
 {
-	paddr_t kstpa, kptpa, kptmpa, lkptpa, lwp0upa;
+	paddr_t kstpa, kptpa, kptmpa, lwp0upa;
 	u_int nptpages, kstsize;
 	st_entry_t protoste, *ste, *este;
 	pt_entry_t protopte, *pte, *epte;
@@ -110,8 +110,6 @@
 	 *
 	 *	kptmpa		kernel PT map		1 page
 	 *
-	 *	lkptpa		last kernel PT page	1 page
-	 *
 	 *	kptpa		statically allocated
 	 *			kernel PT pages		Sysptsize+ pages
 	 *
@@ -138,8 +136,6 @@
 	nextpa += kstsize * PAGE_SIZE;
 	kptmpa = nextpa;
 	nextpa += PAGE_SIZE;
-	lkptpa = nextpa;
-	nextpa += PAGE_SIZE;
 	kptpa = nextpa;
 	nptpages = RELOC(Sysptsize, int) + (iiomappages + NPTEPG - 1) / NPTEPG;
 	nextpa += nptpages * PAGE_SIZE;
@@ -164,18 +160,8 @@
 	 * each mapping 256kb.  Note that there may be additional segment
 	 * table pages depending on how large MAXKL2SIZE is.
 	 *
-	 * Portions of the last two segment of KVA space (0xFF80 -
-	 * 0x) are mapped for a couple of purposes.
-	 * The first segment (0xFF80 - 0xFFBF) is mapped
-	 * for the kernel page tables.
-	 *
-	 * XXX: It looks this was copied from hp300 and not sure if
-	 * XXX: last physical page mapping is really needed on this port.
-	 * The very last page (0xF000) in the second segment is mapped
-	 * to the last physical page of RAM to give us a region in which
-	 * PA == VA.  We use the first part of this page for enabling
-	 * and disabling mapping.  The last part of this page also contains
-	 * info left by the boot ROM.
+	 * Portions of the last segment of KVA space (0xFFC0 -
+	 * 0x) are mapped for the kernel page tables.
 	 *
 	 * XXX cramming two levels of mapping into the single segment
 	 * table on the 68040 is intended as a temporary hack to get things
@@ -233,23 +219,17 @@
 		*ste = protoste;
 		/*
 		 * Now initialize the final portion of that block of
-		 * descriptors to map kptmpa and the last PT page.
+		 * descriptors to map Sysmap.
 		 */
 		i = SG4_LEV1SIZE + (nl1desc * SG4_LEV2SIZE);
 		ste = (st_entry_t *)kstpa;
-		ste = ste[i + SG4_LEV2SIZE - (NPTEPG / SG4_LEV3SIZE) * 2];
+		ste = ste[i + SG4_LEV2SIZE - (NPTEPG / SG4_LEV3SIZE)];
 		este = ste[NPTEPG / SG4_LEV3SIZE];
 		protoste = kptmpa | SG_U | SG_RW | SG_V;
 		while (ste  este) {
 			*ste++ = protoste;
 			protoste += (SG4_LEV3SIZE * sizeof(st_entry_t));
 		}
-		este = ste[NPTEPG / SG4_LEV3SIZE];
-		protoste = lkptpa | SG_U | SG_RW | SG_V;
-		while (ste  este) {
-			*ste++ = protoste;
-			protoste += (SG4_LEV3SIZE * sizeof(st_entry_t));
-		}
 		/*
 		 * Calculate the free level 2 descriptor mask
 		 * 

CVS commit: src/sys/arch/mvme68k/mvme68k

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sun Jan  2 06:25:23 UTC 2011

Modified Files:
src/sys/arch/mvme68k/mvme68k: pmap_bootstrap.c

Log Message:
Some cosmetics to reduce diffs from other m68k ports.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c

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/mvme68k/mvme68k/pmap_bootstrap.c
diff -u src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.45 src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.46
--- src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.45	Sun Jan  2 06:15:04 2011
+++ src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c	Sun Jan  2 06:25:23 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap_bootstrap.c,v 1.45 2011/01/02 06:15:04 tsutsui Exp $	*/
+/*	$NetBSD: pmap_bootstrap.c,v 1.46 2011/01/02 06:25:23 tsutsui Exp $	*/
 
 /* 
  * Copyright (c) 1991, 1993
@@ -38,7 +38,7 @@
 #include opt_m68k_arch.h
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pmap_bootstrap.c,v 1.45 2011/01/02 06:15:04 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap_bootstrap.c,v 1.46 2011/01/02 06:25:23 tsutsui Exp $);
 
 #include sys/param.h
 #include sys/kcore.h
@@ -53,7 +53,7 @@
 
 #define RELOC(v, t)	*((t*)((uintptr_t)(v) + firstpa))
 
-extern char *kernel_text, *etext;
+extern char *etext;
 
 extern int maxmem, physmem;
 extern paddr_t avail_start, avail_end;
@@ -120,12 +120,11 @@
 	 * The KVA corresponding to any of these PAs is:
 	 *	(PA - firstpa + KERNBASE).
 	 */
-	lwp0upa = nextpa;
-	nextpa += USPACE;
-
 	iiomappages = m68k_btop(RELOC(intiotop_phys, u_int) -
 	RELOC(intiobase_phys, u_int));
 
+	lwp0upa = nextpa;
+	nextpa += USPACE;
 #if defined(M68040) || defined(M68060)
 	if (RELOC(mmutype, int) == MMU_68040)
 		kstsize = MAXKL2SIZE / (NPTEPG/SG4_LEV2SIZE);
@@ -321,7 +320,7 @@
 	while (pte  epte)
 		*pte++ = PG_NV;
 	/*
-	 * Validate PTEs for kernel text (RO)
+	 * Validate PTEs for kernel text (RO).
 	 */
 	pte = (pt_entry_t *)kptpa;
 	pte = pte[m68k_btop(KERNBASE)];
@@ -349,7 +348,7 @@
 		protopte += PAGE_SIZE;
 	}
 	/*
-	 * map the kernel segment table cache invalidated for 
+	 * map the kernel segment table cache invalidated for
 	 * these machines (for the 68040 not strictly necessary, but
 	 * recommended by Motorola; for the 68060 mandatory)
 	 */
@@ -373,8 +372,8 @@
 
 	protopte = RELOC(intiobase_phys, u_int) | PG_RW | PG_CI | PG_U | PG_V;
 	epte = pte[iiomappages];
-	RELOC(intiobase, char *) = (char *)PTE2VA(pte);
-	RELOC(intiolimit, char *) = (char *)PTE2VA(epte);
+	RELOC(intiobase, uint8_t *) = (uint8_t *)PTE2VA(pte);
+	RELOC(intiolimit, uint8_t *) = (uint8_t *)PTE2VA(epte);
 	while (pte  epte) {
 		*pte++ = protopte;
 		protopte += PAGE_SIZE;

CVS commit: src/sys/arch/mvme68k/mvme68k

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sat Dec 25 15:29:34 UTC 2010

Modified Files:
src/sys/arch/mvme68k/mvme68k: pmap_bootstrap.c

Log Message:
Fix harmless pasto and tweak some comments.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c

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/mvme68k/mvme68k/pmap_bootstrap.c
diff -u src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.42 src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.43
--- src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.42	Sat Dec 25 14:43:00 2010
+++ src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c	Sat Dec 25 15:29:34 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap_bootstrap.c,v 1.42 2010/12/25 14:43:00 tsutsui Exp $	*/
+/*	$NetBSD: pmap_bootstrap.c,v 1.43 2010/12/25 15:29:34 tsutsui Exp $	*/
 
 /* 
  * Copyright (c) 1991, 1993
@@ -38,7 +38,7 @@
 #include opt_m68k_arch.h
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pmap_bootstrap.c,v 1.42 2010/12/25 14:43:00 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap_bootstrap.c,v 1.43 2010/12/25 15:29:34 tsutsui Exp $);
 
 #include sys/param.h
 #include sys/kcore.h
@@ -103,7 +103,7 @@
 	/*
 	 * Calculate important physical addresses:
 	 *
-	 *	lwp0upa		lwp0 0 u-area		UPAGES pages
+	 *	lwp0upa		lwp0 u-area		UPAGES pages
 	 *
 	 *	kstpa		kernel segment table	1 page (!040)
 	 *		N pages (040)
@@ -212,7 +212,7 @@
 		}
 		/*
 		 * Initialize level 1 descriptors.  We need:
-		 *	roundup(nl2desc, SG4_LEV2SIZE) / SG4_LEV2SIZE
+		 *	howmany(nl2desc, SG4_LEV2SIZE)
 		 * level 1 descriptors to map the `nl2desc' level 2's.
 		 */
 		nl1desc = howmany(nl2desc, SG4_LEV2SIZE);
@@ -302,7 +302,7 @@
 		 * and the software Sysptmap.
 		 */
 		ste = (st_entry_t *)kstpa;
-		pte = (st_entry_t *)kptmpa;
+		pte = (pt_entry_t *)kptmpa;
 		epte = pte[nptpages];
 		protoste = kptpa | SG_RW | SG_V;
 		protopte = kptpa | PG_RW | PG_CI | PG_V;
@@ -319,7 +319,7 @@
 		este = este[TIA_SIZE];
 		while (ste  este)
 			*ste++ = SG_NV;
-		epte = (st_entry_t *)kptmpa;
+		epte = (pt_entry_t *)kptmpa;
 		epte = epte[TIB_SIZE];
 		while (pte  epte)
 			*pte++ = PG_NV;

CVS commit: src/sys/arch/mvme68k/mvme68k

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sat Dec 25 16:14:44 UTC 2010

Modified Files:
src/sys/arch/mvme68k/mvme68k: pmap_bootstrap.c

Log Message:
Put somehow missed code part in rev 1.36:
 Allocate lwp0upa (PA of lwp0 uarea) right after kernel rather than
 between other page tables to use different mappings for ste/pte pages
 as well as amiga and atari.  Should resolve XXX comments in next68k and x68k.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c

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/mvme68k/mvme68k/pmap_bootstrap.c
diff -u src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.43 src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.44
--- src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.43	Sat Dec 25 15:29:34 2010
+++ src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c	Sat Dec 25 16:14:44 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap_bootstrap.c,v 1.43 2010/12/25 15:29:34 tsutsui Exp $	*/
+/*	$NetBSD: pmap_bootstrap.c,v 1.44 2010/12/25 16:14:44 tsutsui Exp $	*/
 
 /* 
  * Copyright (c) 1991, 1993
@@ -38,7 +38,7 @@
 #include opt_m68k_arch.h
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pmap_bootstrap.c,v 1.43 2010/12/25 15:29:34 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap_bootstrap.c,v 1.44 2010/12/25 16:14:44 tsutsui Exp $);
 
 #include sys/param.h
 #include sys/kcore.h
@@ -122,6 +122,9 @@
 	 * The KVA corresponding to any of these PAs is:
 	 *	(PA - firstpa + KERNBASE).
 	 */
+	lwp0upa = nextpa;
+	nextpa += USPACE;
+
 	iiomappages = m68k_btop(RELOC(intiotop_phys, u_int) -
 	RELOC(intiobase_phys, u_int));
 
@@ -137,8 +140,6 @@
 	nextpa += PAGE_SIZE;
 	lkptpa = nextpa;
 	nextpa += PAGE_SIZE;
-	lwp0upa = nextpa;
-	nextpa += USPACE;
 	kptpa = nextpa;
 	nptpages = RELOC(Sysptsize, int) + (iiomappages + NPTEPG - 1) / NPTEPG;
 	nextpa += nptpages * PAGE_SIZE;

CVS commit: src/sys/arch/mvme68k/stand

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Thu Dec 24 16:39:39 UTC 2009

Modified Files:
src/sys/arch/mvme68k/stand: Makefile.booters

Log Message:
Use bsd.klinks.mk to create machine and ${MACHINE_CPU} symlinks.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/mvme68k/stand/Makefile.booters

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/mvme68k/stand/Makefile.booters
diff -u src/sys/arch/mvme68k/stand/Makefile.booters:1.19 src/sys/arch/mvme68k/stand/Makefile.booters:1.20
--- src/sys/arch/mvme68k/stand/Makefile.booters:1.19	Sun Dec  6 13:28:04 2009
+++ src/sys/arch/mvme68k/stand/Makefile.booters	Thu Dec 24 16:39:39 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.booters,v 1.19 2009/12/06 13:28:04 tsutsui Exp $
+#	$NetBSD: Makefile.booters,v 1.20 2009/12/24 16:39:39 tsutsui Exp $
 
 S?=		${.CURDIR}/../../../..
 MDEC_DIR?=	/usr/mdec
@@ -38,15 +38,7 @@
 	${HOST_SH} ${S}/conf/newvers_stand.sh -DM ${.CURDIR}/version mvme68k
 .endif
 
-CLEANFILES+= machine m68k
-
-.if !make(obj)  !make(clean)  !make(cleandir)
-.BEGIN:
-	@rm -f machine  \
-	ln -s $S/arch/${MACHINE}/include machine
-	@rm -f ${MACHINE_CPU}  \
-	ln -s $S/arch/${MACHINE_CPU}/include ${MACHINE_CPU}
-.endif
+.include bsd.klinks.mk
 
 .if defined(LIB)
 

CVS commit: src/sys/arch/mvme68k/stand

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sun Dec  6 13:28:04 UTC 2009

Modified Files:
src/sys/arch/mvme68k/stand: Makefile.booters

Log Message:
Create machine and ${MACHINE_CPU} symlinks properly and
remove unnecessary dependencies so that parallel build works.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/mvme68k/stand/Makefile.booters

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/mvme68k/stand/Makefile.booters
diff -u src/sys/arch/mvme68k/stand/Makefile.booters:1.18 src/sys/arch/mvme68k/stand/Makefile.booters:1.19
--- src/sys/arch/mvme68k/stand/Makefile.booters:1.18	Sat Apr 11 10:56:12 2009
+++ src/sys/arch/mvme68k/stand/Makefile.booters	Sun Dec  6 13:28:04 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.booters,v 1.18 2009/04/11 10:56:12 scw Exp $
+#	$NetBSD: Makefile.booters,v 1.19 2009/12/06 13:28:04 tsutsui Exp $
 
 S?=		${.CURDIR}/../../../..
 MDEC_DIR?=	/usr/mdec
@@ -41,22 +41,16 @@
 CLEANFILES+= machine m68k
 
 .if !make(obj)  !make(clean)  !make(cleandir)
-.NOPATH: machine m68k
-.BEGIN: machine m68k
-
-machine :
-	-rm -f ${.TARGET}
-	ln -s $S/arch/mvme68k/include machine
-
-m68k :
-	-rm -f ${.TARGET}
-	ln -s $S/arch/m68k/include m68k
+.BEGIN:
+	@rm -f machine  \
+	ln -s $S/arch/${MACHINE}/include machine
+	@rm -f ${MACHINE_CPU}  \
+	ln -s $S/arch/${MACHINE_CPU}/include ${MACHINE_CPU}
 .endif
 
 .if defined(LIB)
 
-lib${LIB}.a:: machine m68k ${OBJS}
-beforedepend:	machine m68k
+lib${LIB}.a:: ${OBJS}
 
 .else
 

CVS commit: src/sys/arch/mvme68k/stand

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sun Dec  6 13:31:17 UTC 2009

Modified Files:
src/sys/arch/mvme68k/stand/libbug: Makefile
src/sys/arch/mvme68k/stand/libsa: Makefile

Log Message:
Put asm objects into OBJS, not dependencies for all target.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/mvme68k/stand/libbug/Makefile
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/mvme68k/stand/libsa/Makefile

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/mvme68k/stand/libbug/Makefile
diff -u src/sys/arch/mvme68k/stand/libbug/Makefile:1.14 src/sys/arch/mvme68k/stand/libbug/Makefile:1.15
--- src/sys/arch/mvme68k/stand/libbug/Makefile:1.14	Wed Dec 12 01:49:46 2001
+++ src/sys/arch/mvme68k/stand/libbug/Makefile	Sun Dec  6 13:31:16 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.14 2001/12/12 01:49:46 tv Exp $
+#	$NetBSD: Makefile,v 1.15 2009/12/06 13:31:16 tsutsui Exp $
 
 LIB=bug
 
@@ -11,6 +11,7 @@
 
 SRCS=	bugcrt.c delay.c diskrd.c diskwr.c getbrdid.c inchr.c instat.c \
 	outln.c outstr.c putchar.c return.c rtc_rd.c
+OBJS+=	bugstart.o
 CLEANFILES+= bugstart.o
 
 .include ../Makefile.booters
@@ -24,7 +25,7 @@
 	${CC} -x assembler-with-cpp -traditional-cpp -nostdinc ${INCPATH} \
 	-D_STANDALONE -c ${.IMPSRC}
 
-all realall: lib${LIB}.a bugstart.o
+all realall: lib${LIB}.a
 
 .include bsd.own.mk
 .undef DESTDIR

Index: src/sys/arch/mvme68k/stand/libsa/Makefile
diff -u src/sys/arch/mvme68k/stand/libsa/Makefile:1.30 src/sys/arch/mvme68k/stand/libsa/Makefile:1.31
--- src/sys/arch/mvme68k/stand/libsa/Makefile:1.30	Thu Mar 19 10:19:33 2009
+++ src/sys/arch/mvme68k/stand/libsa/Makefile	Sun Dec  6 13:31:17 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.30 2009/03/19 10:19:33 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.31 2009/12/06 13:31:17 tsutsui Exp $
 
 LIB=sa
 
@@ -55,6 +55,7 @@
 CPPFLAGS+= -DSUPPORT_RARP -DSUPPORT_BOOTPARAM
 CPPFLAGS+= -DSUPPORT_NFS -DNFS_NOSYMLINK
 
+OBJS+=	SRT0.o
 CLEANFILES+= SRT0.o
 
 .include ../Makefile.booters
@@ -66,7 +67,7 @@
 # only needed during build
 libinstall::
 
-all realall: lib${LIB}.a SRT0.o
+all realall: lib${LIB}.a
 
 .include bsd.own.mk
 .undef DESTDIR

CVS commit: src/sys/arch/mvme68k/mvme68k

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Fri Dec  4 18:11:14 UTC 2009

Modified Files:
src/sys/arch/mvme68k/mvme68k: pmap_bootstrap.c

Log Message:
Update one more comment.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c

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/mvme68k/mvme68k/pmap_bootstrap.c
diff -u src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.33 src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.34
--- src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.33	Fri Dec  4 18:06:28 2009
+++ src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c	Fri Dec  4 18:11:14 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap_bootstrap.c,v 1.33 2009/12/04 18:06:28 tsutsui Exp $	*/
+/*	$NetBSD: pmap_bootstrap.c,v 1.34 2009/12/04 18:11:14 tsutsui Exp $	*/
 
 /* 
  * Copyright (c) 1991, 1993
@@ -36,7 +36,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pmap_bootstrap.c,v 1.33 2009/12/04 18:06:28 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap_bootstrap.c,v 1.34 2009/12/04 18:11:14 tsutsui Exp $);
 
 #include sys/param.h
 #include sys/kcore.h
@@ -406,7 +406,8 @@
 	while (pte  epte)
 		*pte++ = 0;
 	/*
-	 * Store the u-area into lwp0.
+	 * Remember the u-area address so it can be loaded in the lwp0
+	 * via uvm_lwp_setuarea() later in pmap_bootstrap_finalize().
 	 */
 	RELOC(lwp0uarea, vaddr_t) = lwp0upa - firstpa;
 

CVS commit: src/sys/arch/mvme68k/include

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Oct 23 03:25:36 UTC 2009

Modified Files:
src/sys/arch/mvme68k/include: disklabel.h

Log Message:
Follow revision 1.8 in OpenBSD: remove ad clause.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/mvme68k/include/disklabel.h

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/mvme68k/include/disklabel.h
diff -u src/sys/arch/mvme68k/include/disklabel.h:1.9 src/sys/arch/mvme68k/include/disklabel.h:1.10
--- src/sys/arch/mvme68k/include/disklabel.h:1.9	Sun Dec 11 12:18:17 2005
+++ src/sys/arch/mvme68k/include/disklabel.h	Fri Oct 23 03:25:36 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: disklabel.h,v 1.9 2005/12/11 12:18:17 christos Exp $	*/
+/*	$NetBSD: disklabel.h,v 1.10 2009/10/23 03:25:36 snj Exp $	*/
 
 /*
  * Copyright (c) 1995 Dale Rahn.
@@ -12,10 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *   This product includes software developed by Dale Rahn.
- * 4. The name of the author may not be used to endorse or promote products
+ * 3. The name of the author may not be used to endorse or promote products
  *derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR

CVS commit: src/sys/arch/mvme68k/mvme68k

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Oct 23 03:28:09 UTC 2009

Modified Files:
src/sys/arch/mvme68k/mvme68k: disksubr.c

Log Message:
Follow revision 1.28 in OpenBSD: remove ad clause.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/mvme68k/mvme68k/disksubr.c

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/mvme68k/mvme68k/disksubr.c
diff -u src/sys/arch/mvme68k/mvme68k/disksubr.c:1.34 src/sys/arch/mvme68k/mvme68k/disksubr.c:1.35
--- src/sys/arch/mvme68k/mvme68k/disksubr.c:1.34	Sat Apr 11 11:04:41 2009
+++ src/sys/arch/mvme68k/mvme68k/disksubr.c	Fri Oct 23 03:28:09 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: disksubr.c,v 1.34 2009/04/11 11:04:41 scw Exp $	*/
+/*	$NetBSD: disksubr.c,v 1.35 2009/10/23 03:28:09 snj Exp $	*/
 
 /*
  * Copyright (c) 1995 Dale Rahn.
@@ -12,10 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *   This product includes software developed by Dale Rahn.
- * 4. The name of the author may not be used to endorse or promote products
+ * 3. The name of the author may not be used to endorse or promote products
  *derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
@@ -31,7 +28,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: disksubr.c,v 1.34 2009/04/11 11:04:41 scw Exp $);
+__KERNEL_RCSID(0, $NetBSD: disksubr.c,v 1.35 2009/10/23 03:28:09 snj Exp $);
 
 #include sys/param.h
 #include sys/systm.h

CVS commit: src/sys/arch/mvme68k/stand/bootxx

[Havard Eidnes]

Module Name:src
Committed By:   he
Date:   Sat Aug 22 10:02:21 UTC 2009

Modified Files:
src/sys/arch/mvme68k/stand/bootxx: bootxx.c

Log Message:
This one needs sys/exec_aout.h, so include it explicitly.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/mvme68k/stand/bootxx/bootxx.c

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/mvme68k/stand/bootxx/bootxx.c
diff -u src/sys/arch/mvme68k/stand/bootxx/bootxx.c:1.15 src/sys/arch/mvme68k/stand/bootxx/bootxx.c:1.16
--- src/sys/arch/mvme68k/stand/bootxx/bootxx.c:1.15	Mon Apr 28 20:23:29 2008
+++ src/sys/arch/mvme68k/stand/bootxx/bootxx.c	Sat Aug 22 10:02:21 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: bootxx.c,v 1.15 2008/04/28 20:23:29 martin Exp $ */
+/*	$NetBSD: bootxx.c,v 1.16 2009/08/22 10:02:21 he Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -43,6 +43,7 @@
 #include sys/time.h
 #include sys/exec.h
 #include sys/exec_elf.h
+#include sys/exec_aout.h
 #include machine/prom.h
 
 #include lib/libsa/stand.h

CVS commit: src/sys/arch/mvme68k/mvme68k

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Sat Aug 15 19:16:45 UTC 2009

Modified Files:
src/sys/arch/mvme68k/mvme68k: machdep.c

Log Message:
Fix a 13 year old buffer overrun.  From Henning Petersen in
PR port-mvme68k/41857.


To generate a diff of this commit:
cvs rdiff -u -r1.137 -r1.138 src/sys/arch/mvme68k/mvme68k/machdep.c

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/mvme68k/mvme68k/machdep.c
diff -u src/sys/arch/mvme68k/mvme68k/machdep.c:1.137 src/sys/arch/mvme68k/mvme68k/machdep.c:1.138
--- src/sys/arch/mvme68k/mvme68k/machdep.c:1.137	Fri Feb 13 22:41:02 2009
+++ src/sys/arch/mvme68k/mvme68k/machdep.c	Sat Aug 15 19:16:45 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.137 2009/02/13 22:41:02 apb Exp $	*/
+/*	$NetBSD: machdep.c,v 1.138 2009/08/15 19:16:45 snj Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -77,7 +77,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.137 2009/02/13 22:41:02 apb Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.138 2009/08/15 19:16:45 snj Exp $);
 
 #include opt_ddb.h
 #include opt_m060sp.h
@@ -579,7 +579,7 @@
 	memset(board_str, 0, sizeof(board_str));
 	memset(cpu_str, 0, sizeof(cpu_str));
 	memset(mmu_str, 0, sizeof(mmu_str));
-	memset(fpu_str, 0, sizeof(cpu_str));
+	memset(fpu_str, 0, sizeof(fpu_str));
 
 	/* Fill in the CPU string. */
 	switch (cputype) {

CVS commit: src/sys/arch/mvme68k/include

[Havard Eidnes]

Module Name:src
Committed By:   he
Date:   Fri May 22 08:08:36 UTC 2009

Modified Files:
src/sys/arch/mvme68k/include: intr.h

Log Message:
Remove a no-longer-needed include of sys/device.h, which now created
a build problem because dvl_mtx has an incomplete type when building
cacheops.o.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/mvme68k/include/intr.h

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/mvme68k/include/intr.h
diff -u src/sys/arch/mvme68k/include/intr.h:1.19 src/sys/arch/mvme68k/include/intr.h:1.20
--- src/sys/arch/mvme68k/include/intr.h:1.19	Thu Jun 26 02:52:29 2008
+++ src/sys/arch/mvme68k/include/intr.h	Fri May 22 08:08:36 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.h,v 1.19 2008/06/26 02:52:29 isaki Exp $	*/
+/*	$NetBSD: intr.h,v 1.20 2009/05/22 08:08:36 he Exp $	*/
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -32,7 +32,6 @@
 #ifndef _MVME68K_INTR_H
 #define _MVME68K_INTR_H
 
-#include sys/device.h
 #include machine/psl.h
 
 #define	IPL_NONE	0	/* disable only this interrupt */