Move cpu_configure to evbppc/*.c.
(Remove ibm4xxgpx_autoconf.c) I'm sorry for my wrong thinking.
This commit is contained in:
shige
parent
9f7fe9b1c9
commit
b920e23d24
@ -1,10 +1,9 @@
|
||||
# $NetBSD: files.obs200,v 1.3 2006/03/29 17:46:42 shige Exp $
|
||||
# $NetBSD: files.obs200,v 1.4 2006/05/15 15:56:54 shige Exp $
|
||||
# Original Tag: files.obs405,v 1.9 2005/01/24 18:47:37 shige Exp
|
||||
#
|
||||
# obs200-specific configuration info
|
||||
|
||||
file arch/powerpc/ibm4xx/ibm4xx_autoconf.c
|
||||
file arch/powerpc/ibm4xx/ibm4xxgpx_autoconf.c
|
||||
file arch/powerpc/ibm4xx/ibm40x_machdep.c
|
||||
file arch/powerpc/ibm4xx/ibm4xx_machdep.c
|
||||
file arch/powerpc/ibm4xx/intr.c
|
||||
|
||||
@ -1,9 +1,8 @@
|
||||
# $NetBSD: files.obs405,v 1.15 2006/03/13 16:20:58 shige Exp $
|
||||
# $NetBSD: files.obs405,v 1.16 2006/05/15 15:56:54 shige Exp $
|
||||
#
|
||||
# obs405-specific configuration info
|
||||
|
||||
file arch/powerpc/ibm4xx/ibm4xx_autoconf.c
|
||||
file arch/powerpc/ibm4xx/ibm4xxgpx_autoconf.c
|
||||
file arch/powerpc/ibm4xx/ibm40x_machdep.c
|
||||
file arch/powerpc/ibm4xx/ibm4xx_machdep.c
|
||||
file arch/powerpc/ibm4xx/intr.c
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: obs200_autoconf.c,v 1.2 2005/12/11 12:17:12 christos Exp $ */
|
||||
/* $NetBSD: obs200_autoconf.c,v 1.3 2006/05/15 15:56:54 shige Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 2004 Shigeyuki Fukushima.
|
||||
@ -33,13 +33,43 @@
|
||||
* DAMAGE.
|
||||
*/
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: obs200_autoconf.c,v 1.2 2005/12/11 12:17:12 christos Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: obs200_autoconf.c,v 1.3 2006/05/15 15:56:54 shige Exp $");
|
||||
|
||||
#include <sys/systm.h>
|
||||
#include <sys/device.h>
|
||||
|
||||
#include <machine/obs200.h>
|
||||
|
||||
#include <powerpc/ibm4xx/dcr405gp.h>
|
||||
|
||||
|
||||
/*
|
||||
* Determine device configuration for a machine.
|
||||
*/
|
||||
void
|
||||
cpu_configure(void)
|
||||
{
|
||||
|
||||
intr_init();
|
||||
calc_delayconst();
|
||||
|
||||
/* Make sure that timers run at CPU frequency */
|
||||
mtdcr(DCR_CPC0_CR1, mfdcr(DCR_CPC0_CR1) & ~CPC0_CR1_CETE);
|
||||
|
||||
if (config_rootfound("plb", NULL) == NULL)
|
||||
panic("configure: mainbus not configured");
|
||||
|
||||
printf("biomask %x netmask %x ttymask %x\n", (u_short)imask[IPL_BIO],
|
||||
(u_short)imask[IPL_NET], (u_short)imask[IPL_TTY]);
|
||||
|
||||
(void)spl0();
|
||||
|
||||
/*
|
||||
* Now allow hardware interrupts.
|
||||
*/
|
||||
__asm volatile ("wrteei 1");
|
||||
}
|
||||
|
||||
void device_register(struct device *dev, void *aux)
|
||||
{
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: obs266_autoconf.c,v 1.2 2005/12/11 12:17:12 christos Exp $ */
|
||||
/* $NetBSD: obs266_autoconf.c,v 1.3 2006/05/15 15:56:54 shige Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 2004 Shigeyuki Fukushima.
|
||||
@ -33,13 +33,43 @@
|
||||
* DAMAGE.
|
||||
*/
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: obs266_autoconf.c,v 1.2 2005/12/11 12:17:12 christos Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: obs266_autoconf.c,v 1.3 2006/05/15 15:56:54 shige Exp $");
|
||||
|
||||
#include <sys/systm.h>
|
||||
#include <sys/device.h>
|
||||
|
||||
#include <machine/obs266.h>
|
||||
|
||||
#include <powerpc/ibm4xx/dcr405gp.h>
|
||||
|
||||
|
||||
/*
|
||||
* Determine device configuration for a machine.
|
||||
*/
|
||||
void
|
||||
cpu_configure(void)
|
||||
{
|
||||
|
||||
intr_init();
|
||||
calc_delayconst();
|
||||
|
||||
/* Make sure that timers run at CPU frequency */
|
||||
mtdcr(DCR_CPC0_CR1, mfdcr(DCR_CPC0_CR1) & ~CPC0_CR1_CETE);
|
||||
|
||||
if (config_rootfound("plb", NULL) == NULL)
|
||||
panic("configure: mainbus not configured");
|
||||
|
||||
printf("biomask %x netmask %x ttymask %x\n", (u_short)imask[IPL_BIO],
|
||||
(u_short)imask[IPL_NET], (u_short)imask[IPL_TTY]);
|
||||
|
||||
(void)spl0();
|
||||
|
||||
/*
|
||||
* Now allow hardware interrupts.
|
||||
*/
|
||||
__asm volatile ("wrteei 1");
|
||||
}
|
||||
|
||||
void device_register(struct device *dev, void *aux)
|
||||
{
|
||||
|
||||
|
||||
@ -1,80 +0,0 @@
|
||||
/* $NetBSD: ibm4xxgpx_autoconf.c,v 1.5 2005/12/24 22:45:36 perry Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
|
||||
* Copyright (C) 1995, 1996 TooLs GmbH.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. All advertising materials mentioning features or use of this software
|
||||
* must display the following acknowledgement:
|
||||
* This product includes software developed by TooLs GmbH.
|
||||
* 4. The name of TooLs GmbH may not be used to endorse or promote products
|
||||
* derived from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR
|
||||
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
||||
* IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
||||
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
||||
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
||||
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: ibm4xxgpx_autoconf.c,v 1.5 2005/12/24 22:45:36 perry Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/conf.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/systm.h>
|
||||
|
||||
#include <dev/ic/comreg.h> /* For COM_FREQ */
|
||||
|
||||
#include <powerpc/ibm4xx/dcr405gp.h>
|
||||
#include <powerpc/ibm4xx/dev/plbvar.h>
|
||||
|
||||
/*
|
||||
* List of port-specific devices to attach to the processor local bus.
|
||||
*/
|
||||
static const struct plb_dev local_plb_devs [] = {
|
||||
{ "pbus", },
|
||||
{ NULL }
|
||||
};
|
||||
|
||||
/*
|
||||
* Determine device configuration for a machine.
|
||||
*/
|
||||
void
|
||||
cpu_configure(void)
|
||||
{
|
||||
|
||||
intr_init();
|
||||
calc_delayconst();
|
||||
|
||||
/* Make sure that timers run at CPU frequency */
|
||||
mtdcr(DCR_CPC0_CR1, mfdcr(DCR_CPC0_CR1) & ~CPC0_CR1_CETE);
|
||||
|
||||
if (config_rootfound("plb", &local_plb_devs) == NULL)
|
||||
panic("configure: plb not configured");
|
||||
|
||||
printf("biomask %x netmask %x ttymask %x\n", (u_short)imask[IPL_BIO],
|
||||
(u_short)imask[IPL_NET], (u_short)imask[IPL_TTY]);
|
||||
|
||||
(void)spl0();
|
||||
|
||||
/*
|
||||
* Now allow hardware interrupts.
|
||||
*/
|
||||
__asm volatile ("wrteei 1");
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user