Module Name: src
Committed By: rin
Date: Tue Aug 3 09:25:44 UTC 2021
Modified Files:
src/doc: CHANGES
src/sys/arch/evbppc/dht: machdep.c
src/sys/arch/evbppc/evbppc: evbppc_machdep.c
src/sys/arch/evbppc/explora: machdep.c
src/sys/arch/evbppc/include: cpu.h
src/sys/arch/evbppc/obs405: obs200_machdep.c obs266_machdep.c
obs600_machdep.c
src/sys/arch/evbppc/virtex: machdep.c
src/sys/arch/evbppc/walnut: machdep.c
src/sys/modules/arch: archdirs.mk
Removed Files:
src/sys/modules/arch/powerpc/powerpc-ibm4xx: Makefile
bsd.powerpc-ibm4xx.mk
Log Message:
Switch evbppc/ibm4xx to generic evbppc (same as oea) kernel modules.
I've confirmed that kernels similar to amd64/conf/MODULAR work fine
both on 403 and 405.
XXX
Unfortunately, we cannot immediately switch evbppc/booke to generic
kernel modules yet; it has its own intr.h implementation.
To generate a diff of this commit:
cvs rdiff -u -r1.2816 -r1.2817 src/doc/CHANGES
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbppc/dht/machdep.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbppc/evbppc/evbppc_machdep.c
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/evbppc/explora/machdep.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbppc/include/cpu.h
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbppc/obs405/obs200_machdep.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/evbppc/obs405/obs266_machdep.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbppc/obs405/obs600_machdep.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbppc/virtex/machdep.c
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/evbppc/walnut/machdep.c
cvs rdiff -u -r1.6 -r1.7 src/sys/modules/arch/archdirs.mk
cvs rdiff -u -r1.1 -r0 src/sys/modules/arch/powerpc/powerpc-ibm4xx/Makefile \
src/sys/modules/arch/powerpc/powerpc-ibm4xx/bsd.powerpc-ibm4xx.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2816 src/doc/CHANGES:1.2817
--- src/doc/CHANGES:1.2816 Tue Jul 27 12:40:07 2021
+++ src/doc/CHANGES Tue Aug 3 09:25:43 2021
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2816 $>
+# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2817 $>
#
#
# [Note: This file does not mention every change made to the NetBSD source tree.
@@ -389,3 +389,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0:
[tsutsui 20210709]
kernel: Tie the maximum file lock per unprivilegied uid to
kern.maxfiles [manu 20210727]
+ evbppc: Switch ibm4xx to generic evbppc kernel modules. [rin 20210803]
Index: src/sys/arch/evbppc/dht/machdep.c
diff -u src/sys/arch/evbppc/dht/machdep.c:1.1 src/sys/arch/evbppc/dht/machdep.c:1.2
--- src/sys/arch/evbppc/dht/machdep.c:1.1 Fri Apr 2 07:00:33 2021
+++ src/sys/arch/evbppc/dht/machdep.c Tue Aug 3 09:25:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.1 2021/04/02 07:00:33 rin Exp $ */
+/* $NetBSD: machdep.c,v 1.2 2021/08/03 09:25:43 rin Exp $ */
/*
* Taken from src/sys/arch/evbppc/walnut/machdep.c:
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.1 2021/04/02 07:00:33 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.2 2021/08/03 09:25:43 rin Exp $");
#include "opt_ddb.h"
#include "opt_pci.h"
@@ -188,9 +188,6 @@ initppc(vaddr_t startkernel, vaddr_t end
if (boothowto & RB_KDB)
Debugger();
#endif
-
- /* Look for the ibm4xx modules in the right place */
- module_machine = module_machine_ibm4xx;
}
void
Index: src/sys/arch/evbppc/evbppc/evbppc_machdep.c
diff -u src/sys/arch/evbppc/evbppc/evbppc_machdep.c:1.14 src/sys/arch/evbppc/evbppc/evbppc_machdep.c:1.15
--- src/sys/arch/evbppc/evbppc/evbppc_machdep.c:1.14 Tue Mar 30 02:41:14 2021
+++ src/sys/arch/evbppc/evbppc/evbppc_machdep.c Tue Aug 3 09:25:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: evbppc_machdep.c,v 1.14 2021/03/30 02:41:14 rin Exp $ */
+/* $NetBSD: evbppc_machdep.c,v 1.15 2021/08/03 09:25:43 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.14 2021/03/30 02:41:14 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: evbppc_machdep.c,v 1.15 2021/08/03 09:25:43 rin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -91,11 +91,6 @@ struct vm_map *phys_map = NULL;
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";
-
int fake_mapiodev = 1;
/*
Index: src/sys/arch/evbppc/explora/machdep.c
diff -u src/sys/arch/evbppc/explora/machdep.c:1.51 src/sys/arch/evbppc/explora/machdep.c:1.52
--- src/sys/arch/evbppc/explora/machdep.c:1.51 Tue Mar 30 03:20:13 2021
+++ src/sys/arch/evbppc/explora/machdep.c Tue Aug 3 09:25:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.51 2021/03/30 03:20:13 rin Exp $ */
+/* $NetBSD: machdep.c,v 1.52 2021/08/03 09:25:43 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.51 2021/03/30 03:20:13 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.52 2021/08/03 09:25:43 rin Exp $");
#include "opt_explora.h"
@@ -107,11 +107,6 @@ initppc(vaddr_t startkernel, vaddr_t end
ibm40x_memsize_init(size, startkernel);
ibm4xx_init(startkernel, endkernel, pic_ext_intr);
-
- /*
- * Look for the ibm4xx modules in the right place.
- */
- module_machine = module_machine_ibm4xx;
}
void
Index: src/sys/arch/evbppc/include/cpu.h
diff -u src/sys/arch/evbppc/include/cpu.h:1.7 src/sys/arch/evbppc/include/cpu.h:1.8
--- src/sys/arch/evbppc/include/cpu.h:1.7 Mon Jun 20 06:35:40 2011
+++ src/sys/arch/evbppc/include/cpu.h Tue Aug 3 09:25:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.7 2011/06/20 06:35:40 matt Exp $ */
+/* $NetBSD: cpu.h,v 1.8 2021/08/03 09:25:43 rin Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -60,7 +60,6 @@ extern int fake_mapiodev;
#if defined(_KERNEL)
extern char module_machine_booke[];
-extern char module_machine_ibm4xx[];
-#endif /* _KERNEL */
+#endif
#endif /* _EVBPPC_CPU_H_ */
Index: src/sys/arch/evbppc/obs405/obs200_machdep.c
diff -u src/sys/arch/evbppc/obs405/obs200_machdep.c:1.23 src/sys/arch/evbppc/obs405/obs200_machdep.c:1.24
--- src/sys/arch/evbppc/obs405/obs200_machdep.c:1.23 Tue Mar 30 04:53:13 2021
+++ src/sys/arch/evbppc/obs405/obs200_machdep.c Tue Aug 3 09:25:44 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: obs200_machdep.c,v 1.23 2021/03/30 04:53:13 rin Exp $ */
+/* $NetBSD: obs200_machdep.c,v 1.24 2021/08/03 09:25:44 rin Exp $ */
/* Original: machdep.c,v 1.3 2005/01/17 17:24:09 shige Exp */
/*
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obs200_machdep.c,v 1.23 2021/03/30 04:53:13 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obs200_machdep.c,v 1.24 2021/08/03 09:25:44 rin Exp $");
#include "opt_ddb.h"
@@ -156,11 +156,6 @@ initppc(vaddr_t startkernel, vaddr_t end
if (boothowto & RB_KDB)
Debugger();
#endif
-
- /*
- * Look for the ibm4xx modules in the right place.
- */
- module_machine = module_machine_ibm4xx;
}
void
Index: src/sys/arch/evbppc/obs405/obs266_machdep.c
diff -u src/sys/arch/evbppc/obs405/obs266_machdep.c:1.26 src/sys/arch/evbppc/obs405/obs266_machdep.c:1.27
--- src/sys/arch/evbppc/obs405/obs266_machdep.c:1.26 Tue Mar 30 04:02:17 2021
+++ src/sys/arch/evbppc/obs405/obs266_machdep.c Tue Aug 3 09:25:44 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: obs266_machdep.c,v 1.26 2021/03/30 04:02:17 rin Exp $ */
+/* $NetBSD: obs266_machdep.c,v 1.27 2021/08/03 09:25:44 rin Exp $ */
/* Original: md_machdep.c,v 1.3 2005/01/24 18:47:37 shige Exp $ */
/*
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obs266_machdep.c,v 1.26 2021/03/30 04:02:17 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obs266_machdep.c,v 1.27 2021/08/03 09:25:44 rin Exp $");
#include "opt_ddb.h"
@@ -147,11 +147,6 @@ initppc(vaddr_t startkernel, vaddr_t end
if (boothowto & RB_KDB)
Debugger();
#endif
-
- /*
- * Look for the ibm4xx modules in the right place.
- */
- module_machine = module_machine_ibm4xx;
}
void
Index: src/sys/arch/evbppc/obs405/obs600_machdep.c
diff -u src/sys/arch/evbppc/obs405/obs600_machdep.c:1.15 src/sys/arch/evbppc/obs405/obs600_machdep.c:1.16
--- src/sys/arch/evbppc/obs405/obs600_machdep.c:1.15 Tue Mar 30 04:28:50 2021
+++ src/sys/arch/evbppc/obs405/obs600_machdep.c Tue Aug 3 09:25:44 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: obs600_machdep.c,v 1.15 2021/03/30 04:28:50 rin Exp $ */
+/* $NetBSD: obs600_machdep.c,v 1.16 2021/08/03 09:25:44 rin Exp $ */
/* Original: md_machdep.c,v 1.3 2005/01/24 18:47:37 shige Exp $ */
/*
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obs600_machdep.c,v 1.15 2021/03/30 04:28:50 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obs600_machdep.c,v 1.16 2021/08/03 09:25:44 rin Exp $");
#include "opt_ddb.h"
@@ -153,11 +153,6 @@ initppc(vaddr_t startkernel, vaddr_t end
if (boothowto & RB_KDB)
Debugger();
#endif
-
- /*
- * Look for the ibm4xx modules in the right place.
- */
- module_machine = module_machine_ibm4xx;
}
void
Index: src/sys/arch/evbppc/virtex/machdep.c
diff -u src/sys/arch/evbppc/virtex/machdep.c:1.29 src/sys/arch/evbppc/virtex/machdep.c:1.30
--- src/sys/arch/evbppc/virtex/machdep.c:1.29 Tue Mar 30 02:41:14 2021
+++ src/sys/arch/evbppc/virtex/machdep.c Tue Aug 3 09:25:44 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.29 2021/03/30 02:41:14 rin Exp $ */
+/* $NetBSD: machdep.c,v 1.30 2021/08/03 09:25:44 rin Exp $ */
/*
* Copyright (c) 2006 Jachym Holecek
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.29 2021/03/30 02:41:14 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.30 2021/08/03 09:25:44 rin Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@@ -141,11 +141,6 @@ initppc(vaddr_t startkernel, vaddr_t end
*/
kgdb_connect(1);
#endif /* KGDB */
-
- /*
- * Look for the ibm4xx modules in the right place.
- */
- module_machine = module_machine_ibm4xx;
}
/*
Index: src/sys/arch/evbppc/walnut/machdep.c
diff -u src/sys/arch/evbppc/walnut/machdep.c:1.67 src/sys/arch/evbppc/walnut/machdep.c:1.68
--- src/sys/arch/evbppc/walnut/machdep.c:1.67 Tue Mar 30 05:08:16 2021
+++ src/sys/arch/evbppc/walnut/machdep.c Tue Aug 3 09:25:44 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.67 2021/03/30 05:08:16 rin Exp $ */
+/* $NetBSD: machdep.c,v 1.68 2021/08/03 09:25:44 rin Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.67 2021/03/30 05:08:16 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.68 2021/08/03 09:25:44 rin Exp $");
#include "opt_ddb.h"
@@ -132,11 +132,6 @@ initppc(vaddr_t startkernel, vaddr_t end
if (boothowto & RB_KDB)
Debugger();
#endif
-
- /*
- * Look for the ibm4xx modules in the right place.
- */
- module_machine = module_machine_ibm4xx;
}
/*
Index: src/sys/modules/arch/archdirs.mk
diff -u src/sys/modules/arch/archdirs.mk:1.6 src/sys/modules/arch/archdirs.mk:1.7
--- src/sys/modules/arch/archdirs.mk:1.6 Sat Jul 4 21:02:16 2020
+++ src/sys/modules/arch/archdirs.mk Tue Aug 3 09:25:44 2021
@@ -1,9 +1,9 @@
-# $NetBSD: archdirs.mk,v 1.6 2020/07/04 21:02:16 chs Exp $
+# $NetBSD: archdirs.mk,v 1.7 2021/08/03 09:25:44 rin Exp $
# list of subdirs used per-platform
.if ${MACHINE_ARCH} == "powerpc"
-ARCHDIR_SUBDIR= powerpc/powerpc-ibm4xx powerpc/powerpc-booke
+ARCHDIR_SUBDIR= powerpc/powerpc-booke
.endif
.if ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
