Module Name: src
Committed By: rin
Date: Mon Mar 29 13:38:31 UTC 2021
Modified Files:
src/sys/arch/evbppc/conf: files.obs405
src/sys/arch/evbppc/obs405: obs200_autoconf.c obs266_autoconf.c
obs600_autoconf.c
src/sys/arch/evbppc/walnut: autoconf.c
Removed Files:
src/sys/arch/evbppc/obs405: obs405_autoconf.c
Log Message:
Set com(4) frequency in ibm4xx_device_register() in order to dedup codes.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbppc/conf/files.obs405
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbppc/obs405/obs200_autoconf.c \
src/sys/arch/evbppc/obs405/obs266_autoconf.c
cvs rdiff -u -r1.7 -r0 src/sys/arch/evbppc/obs405/obs405_autoconf.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbppc/obs405/obs600_autoconf.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbppc/walnut/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/conf/files.obs405
diff -u src/sys/arch/evbppc/conf/files.obs405:1.21 src/sys/arch/evbppc/conf/files.obs405:1.22
--- src/sys/arch/evbppc/conf/files.obs405:1.21 Thu Mar 18 13:47:04 2010
+++ src/sys/arch/evbppc/conf/files.obs405 Mon Mar 29 13:38:31 2021
@@ -1,11 +1,10 @@
-# $NetBSD: files.obs405,v 1.21 2010/03/18 13:47:04 kiyohara Exp $
+# $NetBSD: files.obs405,v 1.22 2021/03/29 13:38:31 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_autoconf.c
file arch/evbppc/obs405/obs405_machdep.c
# Memory Disk for install kernel
Index: src/sys/arch/evbppc/obs405/obs200_autoconf.c
diff -u src/sys/arch/evbppc/obs405/obs200_autoconf.c:1.8 src/sys/arch/evbppc/obs405/obs200_autoconf.c:1.9
--- src/sys/arch/evbppc/obs405/obs200_autoconf.c:1.8 Tue Mar 2 07:21:01 2021
+++ src/sys/arch/evbppc/obs405/obs200_autoconf.c Mon Mar 29 13:38:31 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: obs200_autoconf.c,v 1.8 2021/03/02 07:21:01 rin Exp $ */
+/* $NetBSD: obs200_autoconf.c,v 1.9 2021/03/29 13:38:31 rin Exp $ */
/*
* Copyright 2004 Shigeyuki Fukushima.
@@ -33,7 +33,7 @@
* DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obs200_autoconf.c,v 1.8 2021/03/02 07:21:01 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obs200_autoconf.c,v 1.9 2021/03/29 13:38:31 rin Exp $");
#include <sys/systm.h>
#include <sys/device.h>
@@ -69,5 +69,5 @@ cpu_configure(void)
void device_register(device_t dev, void *aux)
{
- obs405_device_register(dev, aux, OBS200_COM_FREQ);
+ ibm4xx_device_register(dev, aux, OBS200_COM_FREQ);
}
Index: src/sys/arch/evbppc/obs405/obs266_autoconf.c
diff -u src/sys/arch/evbppc/obs405/obs266_autoconf.c:1.8 src/sys/arch/evbppc/obs405/obs266_autoconf.c:1.9
--- src/sys/arch/evbppc/obs405/obs266_autoconf.c:1.8 Tue Mar 2 07:21:01 2021
+++ src/sys/arch/evbppc/obs405/obs266_autoconf.c Mon Mar 29 13:38:31 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: obs266_autoconf.c,v 1.8 2021/03/02 07:21:01 rin Exp $ */
+/* $NetBSD: obs266_autoconf.c,v 1.9 2021/03/29 13:38:31 rin Exp $ */
/*
* Copyright 2004 Shigeyuki Fukushima.
@@ -33,7 +33,7 @@
* DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obs266_autoconf.c,v 1.8 2021/03/02 07:21:01 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obs266_autoconf.c,v 1.9 2021/03/29 13:38:31 rin Exp $");
#include <sys/systm.h>
#include <sys/device.h>
@@ -69,5 +69,5 @@ void
device_register(device_t dev, void *aux)
{
- obs405_device_register(dev, aux, OBS266_COM_FREQ);
+ ibm4xx_device_register(dev, aux, OBS266_COM_FREQ);
}
Index: src/sys/arch/evbppc/obs405/obs600_autoconf.c
diff -u src/sys/arch/evbppc/obs405/obs600_autoconf.c:1.10 src/sys/arch/evbppc/obs405/obs600_autoconf.c:1.11
--- src/sys/arch/evbppc/obs405/obs600_autoconf.c:1.10 Tue Mar 2 07:27:24 2021
+++ src/sys/arch/evbppc/obs405/obs600_autoconf.c Mon Mar 29 13:38:31 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: obs600_autoconf.c,v 1.10 2021/03/02 07:27:24 rin Exp $ */
+/* $NetBSD: obs600_autoconf.c,v 1.11 2021/03/29 13:38:31 rin Exp $ */
/*
* Copyright 2004 Shigeyuki Fukushima.
@@ -33,7 +33,7 @@
* DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obs600_autoconf.c,v 1.10 2021/03/02 07:27:24 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obs600_autoconf.c,v 1.11 2021/03/29 13:38:31 rin Exp $");
#include "dwctwo.h"
@@ -126,5 +126,5 @@ device_register(device_t dev, void *aux)
}
#endif
- obs405_device_register(dev, aux, OBS600_COM_FREQ);
+ ibm4xx_device_register(dev, aux, OBS600_COM_FREQ);
}
Index: src/sys/arch/evbppc/walnut/autoconf.c
diff -u src/sys/arch/evbppc/walnut/autoconf.c:1.23 src/sys/arch/evbppc/walnut/autoconf.c:1.24
--- src/sys/arch/evbppc/walnut/autoconf.c:1.23 Mon Mar 29 13:17:53 2021
+++ src/sys/arch/evbppc/walnut/autoconf.c Mon Mar 29 13:38:31 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.23 2021/03/29 13:17:53 rin Exp $ */
+/* $NetBSD: autoconf.c,v 1.24 2021/03/29 13:38:31 rin Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.23 2021/03/29 13:17:53 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.24 2021/03/29 13:38:31 rin Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -77,21 +77,6 @@ cpu_configure(void)
void
device_register(device_t dev, void *aux)
{
- device_t parent = device_parent(dev);
- if (device_is_a(dev, "com") && device_is_a(parent, "opb")) {
- /* Set the frequency of the on-chip UART. */
- prop_number_t pn = prop_number_create_integer(COM_FREQ * 6);
- KASSERT(pn != NULL);
-
- if (prop_dictionary_set(device_properties(dev),
- "clock-frequency", pn) == false) {
- printf("WARNING: unable to set clock-frequency "
- "property for %s\n", device_xname(dev));
- }
- prop_object_release(pn);
- return;
- }
-
- ibm4xx_device_register(dev, aux);
+ ibm4xx_device_register(dev, aux, COM_FREQ * 6);
}
