Module Name: src
Committed By: thorpej
Date: Fri Jan 19 03:57:04 UTC 2024
Modified Files:
src/sys/arch/mvmeppc/conf: files.mvmeppc
src/sys/arch/mvmeppc/mvmeppc: machdep.c platform.c
Log Message:
opt_mvmetype.h -> opt_mvmeconf.h to match mvme68k (which wins out because
it supports more boards).
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/mvmeppc/conf/files.mvmeppc
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/mvmeppc/mvmeppc/machdep.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mvmeppc/mvmeppc/platform.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/mvmeppc/conf/files.mvmeppc
diff -u src/sys/arch/mvmeppc/conf/files.mvmeppc:1.15 src/sys/arch/mvmeppc/conf/files.mvmeppc:1.16
--- src/sys/arch/mvmeppc/conf/files.mvmeppc:1.15 Wed Jun 22 18:06:33 2011
+++ src/sys/arch/mvmeppc/conf/files.mvmeppc Fri Jan 19 03:57:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: files.mvmeppc,v 1.15 2011/06/22 18:06:33 matt Exp $
+# $NetBSD: files.mvmeppc,v 1.16 2024/01/19 03:57:04 thorpej Exp $
#
# Motorola's MVMEPPC boards specific configuration info
#
@@ -8,10 +8,10 @@ maxusers 2 8 64
include "arch/powerpc/pic/files.pic"
-defflag opt_mvmetype.h SUPPORT_MVME160X
-defflag opt_mvmetype.h SUPPORT_MVME210X
-defflag opt_mvmetype.h SUPPORT_MVME230X
-defflag opt_mvmetype.h SUPPORT_MVME240X
+defflag opt_mvmeconf.h SUPPORT_MVME160X
+defflag opt_mvmeconf.h SUPPORT_MVME210X
+defflag opt_mvmeconf.h SUPPORT_MVME230X
+defflag opt_mvmeconf.h SUPPORT_MVME240X
file arch/mvmeppc/mvmeppc/autoconf.c
file arch/powerpc/powerpc/clock.c
Index: src/sys/arch/mvmeppc/mvmeppc/machdep.c
diff -u src/sys/arch/mvmeppc/mvmeppc/machdep.c:1.34 src/sys/arch/mvmeppc/mvmeppc/machdep.c:1.35
--- src/sys/arch/mvmeppc/mvmeppc/machdep.c:1.34 Wed Dec 20 15:29:05 2023
+++ src/sys/arch/mvmeppc/mvmeppc/machdep.c Fri Jan 19 03:57:04 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.34 2023/12/20 15:29:05 thorpej Exp $ */
+/* $NetBSD: machdep.c,v 1.35 2024/01/19 03:57:04 thorpej Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,10 +32,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.34 2023/12/20 15:29:05 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.35 2024/01/19 03:57:04 thorpej Exp $");
#include "opt_compat_netbsd.h"
-#include "opt_mvmetype.h"
+#include "opt_mvmeconf.h"
#include "opt_ddb.h"
#include <sys/param.h>
Index: src/sys/arch/mvmeppc/mvmeppc/platform.c
diff -u src/sys/arch/mvmeppc/mvmeppc/platform.c:1.5 src/sys/arch/mvmeppc/mvmeppc/platform.c:1.6
--- src/sys/arch/mvmeppc/mvmeppc/platform.c:1.5 Mon Apr 28 20:23:29 2008
+++ src/sys/arch/mvmeppc/mvmeppc/platform.c Fri Jan 19 03:57:04 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: platform.c,v 1.5 2008/04/28 20:23:29 martin Exp $ */
+/* $NetBSD: platform.c,v 1.6 2024/01/19 03:57:04 thorpej Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,9 +30,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: platform.c,v 1.5 2008/04/28 20:23:29 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: platform.c,v 1.6 2024/01/19 03:57:04 thorpej Exp $");
-#include "opt_mvmetype.h"
+#include "opt_mvmeconf.h"
#include <sys/param.h>
#include <sys/conf.h>
