Module Name: src
Committed By: rin
Date: Tue Mar 30 02:41:15 UTC 2021
Modified Files:
src/sys/arch/evbppc/conf: files.obs405
src/sys/arch/evbppc/evbppc: evbppc_machdep.c
src/sys/arch/evbppc/explora: machdep.c
src/sys/arch/evbppc/virtex: machdep.c
src/sys/arch/evbppc/walnut: machdep.c
Removed Files:
src/sys/arch/evbppc/obs405: obs405_machdep.c
Log Message:
Move common global variables, i.e., phys_map, machine, and machine_arch to
evbppc/evbppc_machdep.c (bad naming; used only for 4xx boards).
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/evbppc/conf/files.obs405
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbppc/evbppc/evbppc_machdep.c
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/evbppc/explora/machdep.c
cvs rdiff -u -r1.6 -r0 src/sys/arch/evbppc/obs405/obs405_machdep.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/evbppc/virtex/machdep.c
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/evbppc/walnut/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/evbppc/conf/files.obs405
diff -u src/sys/arch/evbppc/conf/files.obs405:1.22 src/sys/arch/evbppc/conf/files.obs405:1.23
--- src/sys/arch/evbppc/conf/files.obs405:1.22 Mon Mar 29 13:38:31 2021
+++ src/sys/arch/evbppc/conf/files.obs405 Tue Mar 30 02:41:14 2021
@@ -1,11 +1,10 @@
-# $NetBSD: files.obs405,v 1.22 2021/03/29 13:38:31 rin Exp $
+# $NetBSD: files.obs405,v 1.23 2021/03/30 02:41:14 rin Exp $
#
# obs405-specific configuration info
file arch/powerpc/ibm4xx/ibm4xx_autoconf.c
file arch/powerpc/ibm4xx/ibm40x_machdep.c
file arch/powerpc/ibm4xx/ibm4xx_machdep.c
-file arch/evbppc/obs405/obs405_machdep.c
# Memory Disk for install kernel
file dev/md_root.c memory_disk_hooks
Index: src/sys/arch/evbppc/evbppc/evbppc_machdep.c
diff -u src/sys/arch/evbppc/evbppc/evbppc_machdep.c:1.13 src/sys/arch/evbppc/evbppc/evbppc_machdep.c:1.14
--- src/sys/arch/evbppc/evbppc/evbppc_machdep.c:1.13 Fri Jul 1 20:46:39 2011
+++ src/sys/arch/evbppc/evbppc/evbppc_machdep.c Tue Mar 30 02:41:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: evbppc_machdep.c,v 1.13 2011/07/01 20:46:39 dyoung Exp $ */
+/* $NetBSD: evbppc_machdep.c,v 1.14 2021/03/30 02:41:14 rin Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: evbppc_machdep.c,v 1.13 2011/07/01 20:46:39 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: evbppc_machdep.c,v 1.14 2021/03/30 02:41:14 rin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -81,6 +81,17 @@ __KERNEL_RCSID(0, "$NetBSD: evbppc_machd
#include <machine/pmap.h>
/*
+ * Global variables used here and there.
+ */
+struct vm_map *phys_map = NULL;
+
+/*
+ * XXX This should probably be in autoconf.
+ */
+char machine[] = MACHINE;
+char machine_arch[] = MACHINE_ARCH;
+
+/*
* ibm4xx kernels need to set module_machine to this for modules to work.
*/
char module_machine_ibm4xx[] = "powerpc-ibm4xx";
Index: src/sys/arch/evbppc/explora/machdep.c
diff -u src/sys/arch/evbppc/explora/machdep.c:1.47 src/sys/arch/evbppc/explora/machdep.c:1.48
--- src/sys/arch/evbppc/explora/machdep.c:1.47 Tue Mar 30 01:33:50 2021
+++ src/sys/arch/evbppc/explora/machdep.c Tue Mar 30 02:41:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.47 2021/03/30 01:33:50 rin Exp $ */
+/* $NetBSD: machdep.c,v 1.48 2021/03/30 02:41:14 rin Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.47 2021/03/30 01:33:50 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.48 2021/03/30 02:41:14 rin Exp $");
#include "opt_explora.h"
#include "opt_modular.h"
@@ -74,13 +74,8 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#define TLB_PG_SIZE (16*1024*1024)
-char machine[] = MACHINE; /* from <machine/param.h> */
-char machine_arch[] = MACHINE_ARCH; /* from <machine/param.h> */
-
static const unsigned int cpuspeed = 66000000;
-struct vm_map *phys_map = NULL;
-
void initppc(vaddr_t, vaddr_t);
void
Index: src/sys/arch/evbppc/virtex/machdep.c
diff -u src/sys/arch/evbppc/virtex/machdep.c:1.28 src/sys/arch/evbppc/virtex/machdep.c:1.29
--- src/sys/arch/evbppc/virtex/machdep.c:1.28 Tue Mar 30 01:33:50 2021
+++ src/sys/arch/evbppc/virtex/machdep.c Tue Mar 30 02:41:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.28 2021/03/30 01:33:50 rin Exp $ */
+/* $NetBSD: machdep.c,v 1.29 2021/03/30 02:41:14 rin Exp $ */
/*
* Copyright (c) 2006 Jachym Holecek
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.28 2021/03/30 01:33:50 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.29 2021/03/30 02:41:14 rin Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@@ -88,17 +88,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include <sys/kgdb.h>
#endif
-/*
- * Global variables used here and there
- */
-struct vm_map *phys_map = NULL;
-
-/*
- * This should probably be in autoconf! XXX
- */
-char machine[] = MACHINE; /* from <machine/param.h> */
-char machine_arch[] = MACHINE_ARCH; /* from <machine/param.h> */
-
void initppc(vaddr_t, vaddr_t);
/* BSS segment start & end. */
Index: src/sys/arch/evbppc/walnut/machdep.c
diff -u src/sys/arch/evbppc/walnut/machdep.c:1.65 src/sys/arch/evbppc/walnut/machdep.c:1.66
--- src/sys/arch/evbppc/walnut/machdep.c:1.65 Tue Mar 30 02:04:44 2021
+++ src/sys/arch/evbppc/walnut/machdep.c Tue Mar 30 02:41:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.65 2021/03/30 02:04:44 rin Exp $ */
+/* $NetBSD: machdep.c,v 1.66 2021/03/30 02:41:15 rin Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.65 2021/03/30 02:04:44 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.66 2021/03/30 02:41:15 rin Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@@ -128,17 +128,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#define TLB_PG_SIZE (16*1024*1024)
-/*
- * Global variables used here and there
- */
-struct vm_map *phys_map = NULL;
-
-/*
- * This should probably be in autoconf! XXX
- */
-char machine[] = MACHINE; /* from <machine/param.h> */
-char machine_arch[] = MACHINE_ARCH; /* from <machine/param.h> */
-
void initppc(vaddr_t, vaddr_t, char *, void *);
void
