Module Name: src
Committed By: mrg
Date: Sun Jun 12 03:42:42 UTC 2011
Modified Files:
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/mpc85xx: machdep.c
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
Log Message:
for booke and ibm4xx evbppc systems, set module_machine to to either
"powerpc-ibm4xx" or "powerpc-booke".
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbppc/evbppc/evbppc_machdep.c
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/evbppc/explora/machdep.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbppc/include/cpu.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbppc/mpc85xx/machdep.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbppc/obs405/obs200_machdep.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbppc/obs405/obs266_machdep.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbppc/obs405/obs600_machdep.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbppc/virtex/machdep.c
cvs rdiff -u -r1.48 -r1.49 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/evbppc/evbppc_machdep.c
diff -u src/sys/arch/evbppc/evbppc/evbppc_machdep.c:1.9 src/sys/arch/evbppc/evbppc/evbppc_machdep.c:1.10
--- src/sys/arch/evbppc/evbppc/evbppc_machdep.c:1.9 Sat Nov 7 07:27:43 2009
+++ src/sys/arch/evbppc/evbppc/evbppc_machdep.c Sun Jun 12 03:42:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: evbppc_machdep.c,v 1.9 2009/11/07 07:27:43 cegger Exp $ */
+/* $NetBSD: evbppc_machdep.c,v 1.10 2011/06/12 03:42:41 mrg Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: evbppc_machdep.c,v 1.9 2009/11/07 07:27:43 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: evbppc_machdep.c,v 1.10 2011/06/12 03:42:41 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -80,6 +80,12 @@
#include <machine/bus.h>
#include <machine/pmap.h>
+/*
+ * ibm4xx/booke kernels need to set module_machine to this for modules to work.
+ */
+char module_machine_ibm4xx[] = "powerpc-ibm4xx";
+char module_machine_booke[] = "powerpc-booke";
+
int fake_mapiodev = 1;
/*
Index: src/sys/arch/evbppc/explora/machdep.c
diff -u src/sys/arch/evbppc/explora/machdep.c:1.32 src/sys/arch/evbppc/explora/machdep.c:1.33
--- src/sys/arch/evbppc/explora/machdep.c:1.32 Fri Jan 14 02:06:25 2011
+++ src/sys/arch/evbppc/explora/machdep.c Sun Jun 12 03:42:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.32 2011/01/14 02:06:25 rmind Exp $ */
+/* $NetBSD: machdep.c,v 1.33 2011/06/12 03:42:41 mrg Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.32 2011/01/14 02:06:25 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.33 2011/06/12 03:42:41 mrg Exp $");
#include "opt_explora.h"
#include "opt_modular.h"
@@ -46,6 +46,7 @@
#include <sys/reboot.h>
#include <sys/ksyms.h>
#include <sys/device.h>
+#include <sys/module.h>
#include <uvm/uvm_extern.h>
@@ -344,6 +345,11 @@
prop_object_release(pn);
intr_init();
+
+ /*
+ * Look for the ibm4xx modules in the right place.
+ */
+ module_machine = module_machine_ibm4xx;
}
int
Index: src/sys/arch/evbppc/include/cpu.h
diff -u src/sys/arch/evbppc/include/cpu.h:1.4 src/sys/arch/evbppc/include/cpu.h:1.5
--- src/sys/arch/evbppc/include/cpu.h:1.4 Sun Dec 11 12:17:12 2005
+++ src/sys/arch/evbppc/include/cpu.h Sun Jun 12 03:42:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.4 2005/12/11 12:17:12 christos Exp $ */
+/* $NetBSD: cpu.h,v 1.5 2011/06/12 03:42:41 mrg Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -57,4 +57,7 @@
#include <powerpc/cpu.h>
#endif
+extern char module_machine_booke[];
+extern char module_machine_ibm4xx[];
+
#endif /* _MACHINE_CPU_H_ */
Index: src/sys/arch/evbppc/mpc85xx/machdep.c
diff -u src/sys/arch/evbppc/mpc85xx/machdep.c:1.7 src/sys/arch/evbppc/mpc85xx/machdep.c:1.8
--- src/sys/arch/evbppc/mpc85xx/machdep.c:1.7 Sun Jun 5 16:52:23 2011
+++ src/sys/arch/evbppc/mpc85xx/machdep.c Sun Jun 12 03:42:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.7 2011/06/05 16:52:23 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.8 2011/06/12 03:42:41 mrg Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -60,6 +60,7 @@
#include <sys/bus.h>
#include <sys/extent.h>
#include <sys/malloc.h>
+#include <sys/module.h>
#include <uvm/uvm_extern.h>
@@ -927,6 +928,11 @@
#endif
printf(" initppc done!\n");
+
+ /*
+ * Look for the Book-E modules in the right place.
+ */
+ module_machine = module_machine_booke;
}
#ifdef MPC8548
Index: src/sys/arch/evbppc/obs405/obs200_machdep.c
diff -u src/sys/arch/evbppc/obs405/obs200_machdep.c:1.14 src/sys/arch/evbppc/obs405/obs200_machdep.c:1.15
--- src/sys/arch/evbppc/obs405/obs200_machdep.c:1.14 Mon Apr 4 20:37:50 2011
+++ src/sys/arch/evbppc/obs405/obs200_machdep.c Sun Jun 12 03:42:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: obs200_machdep.c,v 1.14 2011/04/04 20:37:50 dyoung Exp $ */
+/* $NetBSD: obs200_machdep.c,v 1.15 2011/06/12 03:42:41 mrg 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.14 2011/04/04 20:37:50 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obs200_machdep.c,v 1.15 2011/06/12 03:42:41 mrg Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@@ -82,6 +82,7 @@
#include <sys/reboot.h>
#include <sys/systm.h>
#include <sys/device.h>
+#include <sys/module.h>
#include <uvm/uvm_extern.h>
@@ -194,6 +195,11 @@
if (boothowto & RB_KDB)
ipkdb_connect(0);
#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.15 src/sys/arch/evbppc/obs405/obs266_machdep.c:1.16
--- src/sys/arch/evbppc/obs405/obs266_machdep.c:1.15 Mon Apr 4 20:37:50 2011
+++ src/sys/arch/evbppc/obs405/obs266_machdep.c Sun Jun 12 03:42:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: obs266_machdep.c,v 1.15 2011/04/04 20:37:50 dyoung Exp $ */
+/* $NetBSD: obs266_machdep.c,v 1.16 2011/06/12 03:42:41 mrg 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.15 2011/04/04 20:37:50 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obs266_machdep.c,v 1.16 2011/06/12 03:42:41 mrg Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@@ -82,6 +82,7 @@
#include <sys/reboot.h>
#include <sys/systm.h>
#include <sys/device.h>
+#include <sys/module.h>
#include <uvm/uvm_extern.h>
@@ -185,6 +186,11 @@
if (boothowto & RB_KDB)
ipkdb_connect(0);
#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.3 src/sys/arch/evbppc/obs405/obs600_machdep.c:1.4
--- src/sys/arch/evbppc/obs405/obs600_machdep.c:1.3 Fri Feb 25 10:18:09 2011
+++ src/sys/arch/evbppc/obs405/obs600_machdep.c Sun Jun 12 03:42:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: obs600_machdep.c,v 1.3 2011/02/25 10:18:09 kiyohara Exp $ */
+/* $NetBSD: obs600_machdep.c,v 1.4 2011/06/12 03:42:41 mrg 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.3 2011/02/25 10:18:09 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obs600_machdep.c,v 1.4 2011/06/12 03:42:41 mrg Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@@ -84,6 +84,7 @@
#include <sys/reboot.h>
#include <sys/systm.h>
#include <sys/device.h>
+#include <sys/module.h>
#include <uvm/uvm_extern.h>
@@ -197,6 +198,11 @@
if (boothowto & RB_KDB)
ipkdb_connect(0);
#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.15 src/sys/arch/evbppc/virtex/machdep.c:1.16
--- src/sys/arch/evbppc/virtex/machdep.c:1.15 Mon Jan 17 07:32:54 2011
+++ src/sys/arch/evbppc/virtex/machdep.c Sun Jun 12 03:42:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.15 2011/01/17 07:32:54 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.16 2011/06/12 03:42:41 mrg Exp $ */
/*
* Copyright (c) 2006 Jachym Holecek
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.15 2011/01/17 07:32:54 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.16 2011/06/12 03:42:41 mrg Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@@ -59,6 +59,7 @@
#include <sys/boot_flag.h>
#include <sys/ksyms.h>
#include <sys/device.h>
+#include <sys/module.h>
#include <uvm/uvm_extern.h>
@@ -265,6 +266,11 @@
*/
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.48 src/sys/arch/evbppc/walnut/machdep.c:1.49
--- src/sys/arch/evbppc/walnut/machdep.c:1.48 Mon Apr 4 20:37:50 2011
+++ src/sys/arch/evbppc/walnut/machdep.c Sun Jun 12 03:42:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.48 2011/04/04 20:37:50 dyoung Exp $ */
+/* $NetBSD: machdep.c,v 1.49 2011/06/12 03:42:42 mrg Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.48 2011/04/04 20:37:50 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.49 2011/06/12 03:42:42 mrg Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@@ -90,6 +90,7 @@
#include <sys/boot_flag.h>
#include <sys/ksyms.h>
#include <sys/device.h>
+#include <sys/module.h>
#include <uvm/uvm_extern.h>
@@ -336,6 +337,11 @@
if (boothowto & RB_KDB)
ipkdb_connect(0);
#endif
+
+ /*
+ * Look for the ibm4xx modules in the right place.
+ */
+ module_machine = module_machine_ibm4xx;
}
static void
