Module Name: src
Committed By: rin
Date: Mon Mar 29 13:17:53 UTC 2021
Modified Files:
src/sys/arch/evbppc/obs405: obs405_autoconf.c
src/sys/arch/evbppc/walnut: autoconf.c
src/sys/arch/powerpc/ibm4xx: ibm4xx_autoconf.c
Log Message:
Centralize cpu_rootconf().
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbppc/obs405/obs405_autoconf.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/evbppc/walnut/autoconf.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/powerpc/ibm4xx/ibm4xx_autoconf.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/obs405/obs405_autoconf.c
diff -u src/sys/arch/evbppc/obs405/obs405_autoconf.c:1.6 src/sys/arch/evbppc/obs405/obs405_autoconf.c:1.7
--- src/sys/arch/evbppc/obs405/obs405_autoconf.c:1.6 Sun Jul 29 18:05:42 2012
+++ src/sys/arch/evbppc/obs405/obs405_autoconf.c Mon Mar 29 13:17:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: obs405_autoconf.c,v 1.6 2012/07/29 18:05:42 mlelstv Exp $ */
+/* $NetBSD: obs405_autoconf.c,v 1.7 2021/03/29 13:17:53 rin Exp $ */
/*
* Copyright 2004 Shigeyuki Fukushima.
@@ -33,7 +33,7 @@
* DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obs405_autoconf.c,v 1.6 2012/07/29 18:05:42 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obs405_autoconf.c,v 1.7 2021/03/29 13:17:53 rin Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -46,14 +46,6 @@ __KERNEL_RCSID(0, "$NetBSD: obs405_autoc
#include <powerpc/ibm4xx/cpu.h>
#include <powerpc/ibm4xx/dev/comopbvar.h>
-
-void
-cpu_rootconf(void)
-{
-
- rootconf();
-}
-
void
obs405_device_register(device_t dev, void *aux, int com_freq)
{
Index: src/sys/arch/evbppc/walnut/autoconf.c
diff -u src/sys/arch/evbppc/walnut/autoconf.c:1.22 src/sys/arch/evbppc/walnut/autoconf.c:1.23
--- src/sys/arch/evbppc/walnut/autoconf.c:1.22 Wed Jul 30 19:33:56 2014
+++ src/sys/arch/evbppc/walnut/autoconf.c Mon Mar 29 13:17:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.22 2014/07/30 19:33:56 joerg Exp $ */
+/* $NetBSD: autoconf.c,v 1.23 2021/03/29 13:17:53 rin Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.22 2014/07/30 19:33:56 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.23 2021/03/29 13:17:53 rin Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -74,17 +74,6 @@ cpu_configure(void)
(void)spl0();
}
-/*
- * Setup root device.
- * Configure swap area.
- */
-void
-cpu_rootconf(void)
-{
-
- rootconf();
-}
-
void
device_register(device_t dev, void *aux)
{
Index: src/sys/arch/powerpc/ibm4xx/ibm4xx_autoconf.c
diff -u src/sys/arch/powerpc/ibm4xx/ibm4xx_autoconf.c:1.15 src/sys/arch/powerpc/ibm4xx/ibm4xx_autoconf.c:1.16
--- src/sys/arch/powerpc/ibm4xx/ibm4xx_autoconf.c:1.15 Sat Jun 18 06:41:41 2011
+++ src/sys/arch/powerpc/ibm4xx/ibm4xx_autoconf.c Mon Mar 29 13:17:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ibm4xx_autoconf.c,v 1.15 2011/06/18 06:41:41 matt Exp $ */
+/* $NetBSD: ibm4xx_autoconf.c,v 1.16 2021/03/29 13:17:53 rin Exp $ */
/* Original Tag: ibm4xxgpx_autoconf.c,v 1.2 2004/10/23 17:12:22 thorpej Exp $ */
/*
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ibm4xx_autoconf.c,v 1.15 2011/06/18 06:41:41 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibm4xx_autoconf.c,v 1.16 2021/03/29 13:17:53 rin Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -48,6 +48,13 @@ __KERNEL_RCSID(0, "$NetBSD: ibm4xx_autoc
#include <powerpc/ibm4xx/dev/opbvar.h>
void
+cpu_rootconf(void)
+{
+
+ rootconf();
+}
+
+void
ibm4xx_device_register(device_t dev, void *aux)
{
device_t parent = device_parent(dev);
