Mon Mar 29 13:49:15 2021 UTC ()
Use genppc_cpu_configure().


(rin)
diff -r1.24 -r1.25 src/sys/arch/evbppc/walnut/autoconf.c
cvs diff -r1.24 -r1.25 src/sys/arch/evbppc/walnut/autoconf.c (expand / switch to unified diff)

--- src/sys/arch/evbppc/walnut/autoconf.c 2021/03/29 13:38:31 1.24
+++ src/sys/arch/evbppc/walnut/autoconf.c 2021/03/29 13:49:15 1.25
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: autoconf.c,v 1.24 2021/03/29 13:38:31 rin Exp $ */ 1/* $NetBSD: autoconf.c,v 1.25 2021/03/29 13:49:15 rin Exp $ */
2 2
3/* 3/*
4 * Copyright (C) 1995, 1996 Wolfgang Solfrank. 4 * Copyright (C) 1995, 1996 Wolfgang Solfrank.
5 * Copyright (C) 1995, 1996 TooLs GmbH. 5 * Copyright (C) 1995, 1996 TooLs GmbH.
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
11 * 1. Redistributions of source code must retain the above copyright 11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer. 12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
@@ -22,27 +22,27 @@ @@ -22,27 +22,27 @@
22 * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR 22 * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR
23 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 23 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
24 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 24 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
25 * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 25 * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
26 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 26 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
27 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 27 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
28 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 28 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
29 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 29 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
30 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 30 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
31 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 31 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
32 */ 32 */
33 33
34#include <sys/cdefs.h> 34#include <sys/cdefs.h>
35__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.24 2021/03/29 13:38:31 rin Exp $"); 35__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.25 2021/03/29 13:49:15 rin Exp $");
36 36
37#include <sys/param.h> 37#include <sys/param.h>
38#include <sys/conf.h> 38#include <sys/conf.h>
39#include <sys/device.h> 39#include <sys/device.h>
40#include <sys/systm.h> 40#include <sys/systm.h>
41#include <sys/cpu.h> 41#include <sys/cpu.h>
42 42
43#include <dev/ic/comreg.h> /* For COM_FREQ */ 43#include <dev/ic/comreg.h> /* For COM_FREQ */
44 44
45#include <powerpc/ibm4xx/cpu.h> 45#include <powerpc/ibm4xx/cpu.h>
46#include <powerpc/ibm4xx/dcr4xx.h> 46#include <powerpc/ibm4xx/dcr4xx.h>
47#include <powerpc/ibm4xx/dev/plbvar.h> 47#include <powerpc/ibm4xx/dev/plbvar.h>
48#include <powerpc/ibm4xx/spr.h> 48#include <powerpc/ibm4xx/spr.h>
@@ -61,22 +61,22 @@ static const struct plb_dev local_plb_de @@ -61,22 +61,22 @@ static const struct plb_dev local_plb_de
61void 61void
62cpu_configure(void) 62cpu_configure(void)
63{ 63{
64 64
65 intr_init(); 65 intr_init();
66 calc_delayconst(); 66 calc_delayconst();
67 67
68 /* Make sure that timers run at CPU frequency */ 68 /* Make sure that timers run at CPU frequency */
69 mtdcr(DCR_CPC0_CR1, mfdcr(DCR_CPC0_CR1) & ~CPC0_CR1_CETE); 69 mtdcr(DCR_CPC0_CR1, mfdcr(DCR_CPC0_CR1) & ~CPC0_CR1_CETE);
70 70
71 if (config_rootfound("plb", __UNCONST(&local_plb_devs)) == NULL) 71 if (config_rootfound("plb", __UNCONST(&local_plb_devs)) == NULL)
72 panic("configure: plb not configured"); 72 panic("configure: plb not configured");
73 73
74 (void)spl0(); 74 genppc_cpu_configure();
75} 75}
76 76
77void 77void
78device_register(device_t dev, void *aux) 78device_register(device_t dev, void *aux)
79{ 79{
80 80
81 ibm4xx_device_register(dev, aux, COM_FREQ * 6); 81 ibm4xx_device_register(dev, aux, COM_FREQ * 6);
82} 82}