diff options
| author | matt <matt@NetBSD.org> | 2003-02-03 17:09:53 +0000 |
|---|---|---|
| committer | matt <matt@NetBSD.org> | 2003-02-03 17:09:53 +0000 |
| commit | 2b0e97a5619ac2e4a64b40a360da40e4ca00a272 (patch) | |
| tree | 3944ed9e947967dbeb5562c8db853dd0c9979e99 /sys | |
| parent | 023b82a8068094654c32a63a44f628f6db187834 (diff) | |
Rename PPC_MPC6XX to PPC_OEA (and any mpc6xx reference to oea).
Diffstat (limited to 'sys')
75 files changed, 265 insertions, 368 deletions
diff --git a/sys/arch/amigappc/conf/NULL b/sys/arch/amigappc/conf/NULL index 51bdf343300..5b0eba8e400 100644 --- a/sys/arch/amigappc/conf/NULL +++ b/sys/arch/amigappc/conf/NULL @@ -1,4 +1,4 @@ -# $NetBSD: NULL,v 1.11 2002/09/18 02:43:55 lukem Exp $ +# $NetBSD: NULL,v 1.12 2003/02/03 17:09:54 matt Exp $ # # This file was automatically created. Changes will be # lost when running make in this directory. @@ -23,7 +23,7 @@ options RTC_OFFSET=0 #processors this kernel should support -options PPC_MPC6XX +options PPC_OEA options PPC604E options PPC603E diff --git a/sys/arch/amigappc/conf/std.amigappc b/sys/arch/amigappc/conf/std.amigappc index 56832f8a25f..b904e002c9c 100644 --- a/sys/arch/amigappc/conf/std.amigappc +++ b/sys/arch/amigappc/conf/std.amigappc @@ -1,4 +1,4 @@ -# $NetBSD: std.amigappc,v 1.2 2002/04/18 20:08:08 matt Exp $ +# $NetBSD: std.amigappc,v 1.3 2003/02/03 17:09:54 matt Exp $ # standard amiga information @@ -12,5 +12,5 @@ zbus0 at mainbus0 options EXEC_ELF options EXEC_SCRIPT -options PPC_MPC6XX -makeoptions PPCDIR="mpc6xx" # Tell Makefile.powerpc what dir to use +options PPC_OEA +makeoptions PPCDIR="oea" # Tell Makefile.powerpc what dir to use diff --git a/sys/arch/amigappc/include/vmparam.h b/sys/arch/amigappc/include/vmparam.h index 919ce79b696..029f0058973 100644 --- a/sys/arch/amigappc/include/vmparam.h +++ b/sys/arch/amigappc/include/vmparam.h @@ -1,102 +1,3 @@ -/* $NetBSD: vmparam.h,v 1.5 2002/12/10 05:14:25 thorpej Exp $ */ +/* $NetBSD: vmparam.h,v 1.6 2003/02/03 17:09:54 matt 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. - */ - -#ifndef _MACHINE_VMPARAM_H_ -#define _MACHINE_VMPARAM_H_ - -#define USRSTACK VM_MAXUSER_ADDRESS - -#ifndef MAXTSIZ -#define MAXTSIZ (16*1024*1024) /* max text size */ -#endif - -#ifndef DFLDSIZ -#define DFLDSIZ (32*1024*1024) /* default data size */ -#endif - -#ifndef MAXDSIZ -#define MAXDSIZ (512*1024*1024) /* max data size */ -#endif - -#ifndef DFLSSIZ -#define DFLSSIZ (1*1024*1024) /* default stack size */ -#endif - -#ifndef MAXSSIZ -#define MAXSSIZ (32*1024*1024) /* max stack size */ -#endif - -/* - * Size of shared memory map - */ -#ifndef SHMMAXPGS -#define SHMMAXPGS 1024 -#endif - -/* - * Size of User Raw I/O map - */ -#define USRIOSIZE 1024 - -/* - * Would like to have MAX addresses = 0, but this doesn't (currently) work - */ -#define VM_MIN_ADDRESS ((vaddr_t)0) -#define VM_MAXUSER_ADDRESS ((vaddr_t)0x7ffff000) -#define VM_MAX_ADDRESS VM_MAXUSER_ADDRESS -#define VM_MIN_KERNEL_ADDRESS ((vaddr_t)(KERNEL_SR << ADDR_SR_SHFT)) -#define VM_MAX_KERNEL_ADDRESS (VM_MIN_KERNEL_ADDRESS + SEGMENT_LENGTH - 1) - -/* XXX max. amount of KVM to be used by buffers. */ -#ifndef VM_MAX_KERNEL_BUF -#define VM_MAX_KERNEL_BUF (SEGMENT_LENGTH * 7 / 10) -#endif - -#define VM_KMEM_SIZE (NKMEMCLUSTERS * NBPG) -#define VM_PHYS_SIZE (USRIOSIZE * NBPG) - -#define __HAVE_PMAP_PHYSSEG - -struct pmap_physseg { - struct pv_entry *pvent; - char *attrs; -}; - -#define VM_PHYSSEG_MAX 16 /* 1? */ -#define VM_PHYSSEG_STRAT VM_PSTRAT_BSEARCH -#define VM_PHYSSEG_NOADD /* can't add RAM after vm_mem_init */ - -#define VM_NFREELIST 1 -#define VM_FREELIST_DEFAULT 0 - -#endif /* _MACHINE_VMPARAM_H_ */ +#include <powerpc/oea/vmparam.h> diff --git a/sys/arch/bebox/bebox/autoconf.c b/sys/arch/bebox/bebox/autoconf.c index 2600bb3be28..955b49ee75e 100644 --- a/sys/arch/bebox/bebox/autoconf.c +++ b/sys/arch/bebox/bebox/autoconf.c @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.9 2002/09/06 13:18:43 gehenna Exp $ */ +/* $NetBSD: autoconf.c,v 1.10 2003/02/03 17:09:54 matt Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -55,8 +55,8 @@ #include <sys/reboot.h> #include <sys/device.h> -#include <powerpc/mpc6xx/pte.h> #include <machine/intr.h> +#include <powerpc/pte.h> struct device *booted_device; int booted_partition; diff --git a/sys/arch/bebox/bebox/machdep.c b/sys/arch/bebox/bebox/machdep.c index 6ad4e06509d..3dbce8dbb3b 100644 --- a/sys/arch/bebox/bebox/machdep.c +++ b/sys/arch/bebox/bebox/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.76 2003/01/22 21:55:15 kleink Exp $ */ +/* $NetBSD: machdep.c,v 1.77 2003/02/03 17:09:54 matt Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -62,7 +62,7 @@ #include <net/netisr.h> -#include <powerpc/mpc6xx/bat.h> +#include <powerpc/bat.h> #include <machine/bootinfo.h> #include <machine/autoconf.h> #define _POWERPC_BUS_DMA_PRIVATE @@ -192,7 +192,7 @@ initppc(startkernel, endkernel, args, btinfo) /* * Set up initial BAT table */ - mpc6xx_batinit( + oea_batinit( BEBOX_BUS_SPACE_IO, BAT_BL_256M, BEBOX_BUS_SPACE_MEM, BAT_BL_256M, 0); @@ -200,7 +200,7 @@ initppc(startkernel, endkernel, args, btinfo) /* * Initialize the vector table and interrupt routine. */ - mpc6xx_init(ext_intr); + oea_init(ext_intr); /* * Set the page size. @@ -249,7 +249,7 @@ cpu_startup() /* * Do common VM initialization */ - mpc6xx_startup(NULL); + oea_startup(NULL); /* * Now that we have VM, malloc's are OK in bus_space. @@ -407,7 +407,7 @@ cpu_reboot(howto, what) #endif } if (!cold && (howto & RB_DUMP)) - mpc6xx_dumpsys(); + oea_dumpsys(); doshutdownhooks(); printf("rebooting\n\n"); if (what && *what) { diff --git a/sys/arch/bebox/conf/std.bebox b/sys/arch/bebox/conf/std.bebox index e12be1ed94f..2c849849273 100644 --- a/sys/arch/bebox/conf/std.bebox +++ b/sys/arch/bebox/conf/std.bebox @@ -1,11 +1,11 @@ -# $NetBSD: std.bebox,v 1.10 2003/02/02 20:43:18 matt Exp $ +# $NetBSD: std.bebox,v 1.11 2003/02/03 17:09:55 matt Exp $ # # standard, required NetBSD/bebox 'options' machine bebox powerpc -options PPC_MPC6XX # BeBox uses Motorola PPC60x CPUs -makeoptions PPCDIR="mpc6xx" # Tell Makefile.powerpc what dir to use +options PPC_OEA # BeBox uses Motorola PPC60x CPUs +makeoptions PPCDIR="oea" # Tell Makefile.powerpc what dir to use options EXEC_ELF32 # exec ELF binaries options EXEC_SCRIPT # exec #! scripts diff --git a/sys/arch/bebox/include/pmap.h b/sys/arch/bebox/include/pmap.h index 0d85bf11bc9..853c6b13f6f 100644 --- a/sys/arch/bebox/include/pmap.h +++ b/sys/arch/bebox/include/pmap.h @@ -1,3 +1,3 @@ -/* $NetBSD: pmap.h,v 1.9 2001/06/06 17:42:30 matt Exp $ */ +/* $NetBSD: pmap.h,v 1.10 2003/02/03 17:09:55 matt Exp $ */ -#include <powerpc/mpc6xx/pmap.h> +#include <powerpc/oea/pmap.h> diff --git a/sys/arch/bebox/include/pte.h b/sys/arch/bebox/include/pte.h index 4bda6efcbda..1bc8620c324 100644 --- a/sys/arch/bebox/include/pte.h +++ b/sys/arch/bebox/include/pte.h @@ -1,3 +1,3 @@ -/* $NetBSD: pte.h,v 1.4 2003/01/17 22:36:32 thorpej Exp $ */ +/* $NetBSD: pte.h,v 1.5 2003/02/03 17:09:55 matt Exp $ */ -#include <powerpc/mpc6xx/pte.h> +#include <powerpc/pte.h> diff --git a/sys/arch/bebox/include/vmparam.h b/sys/arch/bebox/include/vmparam.h index ab27fef7f70..8a4b784adee 100644 --- a/sys/arch/bebox/include/vmparam.h +++ b/sys/arch/bebox/include/vmparam.h @@ -1,3 +1,3 @@ -/* $NetBSD: vmparam.h,v 1.13 2001/06/06 17:42:31 matt Exp $ */ +/* $NetBSD: vmparam.h,v 1.14 2003/02/03 17:09:55 matt Exp $ */ -#include <powerpc/mpc6xx/vmparam.h> +#include <powerpc/oea/vmparam.h> diff --git a/sys/arch/evbppc/include/pmap.h b/sys/arch/evbppc/include/pmap.h index e6d4bc27790..6918eb78bd1 100644 --- a/sys/arch/evbppc/include/pmap.h +++ b/sys/arch/evbppc/include/pmap.h @@ -1,11 +1,3 @@ -/* $NetBSD: pmap.h,v 1.2 2003/02/03 05:15:51 matt Exp $ */ +/* $NetBSD: pmap.h,v 1.3 2003/02/03 17:09:55 matt Exp $ */ -#ifdef _KERNEL_OPT -#include "opt_ppcarch.h" -#endif - -#ifdef PPC_IBM4XX -#include <powerpc/ibm4xx/pmap.h> -#elif defined(PPC_MPC6XX) -#include <powerpc/mpc6xx/pmap.h> -#endif +#include <powerpc/pmap.h> diff --git a/sys/arch/macppc/conf/std.macppc b/sys/arch/macppc/conf/std.macppc index 16fbd1a2f90..566395d4a1b 100644 --- a/sys/arch/macppc/conf/std.macppc +++ b/sys/arch/macppc/conf/std.macppc @@ -1,12 +1,12 @@ -# $NetBSD: std.macppc,v 1.14 2003/02/02 20:43:19 matt Exp $ +# $NetBSD: std.macppc,v 1.15 2003/02/03 17:09:56 matt Exp $ # # Standard/required options for NetBSD/macppc. machine macppc powerpc # standard ("mandatory") kernel options. -options PPC_MPC6XX # OEA class PowerPC chips -makeoptions PPCDIR="mpc6xx" # Tell Makefile.powerpc what dir to use +options PPC_OEA # OEA class PowerPC chips +makeoptions PPCDIR="oea" # Tell Makefile.powerpc what dir to use # Executable support: options EXEC_ELF32 # (native) ELF32 binary support diff --git a/sys/arch/macppc/include/bat.h b/sys/arch/macppc/include/bat.h index eba55676c9d..7d228c19c36 100644 --- a/sys/arch/macppc/include/bat.h +++ b/sys/arch/macppc/include/bat.h @@ -1,3 +1,3 @@ -/* $NetBSD: bat.h,v 1.3 2001/06/10 15:24:57 tsubai Exp $ */ +/* $NetBSD: bat.h,v 1.4 2003/02/03 17:09:56 matt Exp $ */ -#include <powerpc/mpc6xx/bat.h> +#include <powerpc/bat.h> diff --git a/sys/arch/macppc/include/pmap.h b/sys/arch/macppc/include/pmap.h index 6ebc85d452a..22597c6e770 100644 --- a/sys/arch/macppc/include/pmap.h +++ b/sys/arch/macppc/include/pmap.h @@ -1,3 +1,3 @@ -/* $NetBSD: pmap.h,v 1.6 2003/02/03 05:15:52 matt Exp $ */ +/* $NetBSD: pmap.h,v 1.7 2003/02/03 17:09:56 matt Exp $ */ -#include <powerpc/mpc6xx/pmap.h> +#include <powerpc/pmap.h> diff --git a/sys/arch/macppc/include/pte.h b/sys/arch/macppc/include/pte.h index 38d89485138..4937a68dbfd 100644 --- a/sys/arch/macppc/include/pte.h +++ b/sys/arch/macppc/include/pte.h @@ -1,3 +1,3 @@ -/* $NetBSD: pte.h,v 1.3 2001/06/06 17:50:15 matt Exp $ */ +/* $NetBSD: pte.h,v 1.4 2003/02/03 17:09:56 matt Exp $ */ -#include <powerpc/mpc6xx/pte.h> +#include <powerpc/pte.h> diff --git a/sys/arch/macppc/include/vmparam.h b/sys/arch/macppc/include/vmparam.h index b507c046c90..f9db465bef9 100644 --- a/sys/arch/macppc/include/vmparam.h +++ b/sys/arch/macppc/include/vmparam.h @@ -1,3 +1,3 @@ -/* $NetBSD: vmparam.h,v 1.22 2003/02/02 21:22:11 matt Exp $ */ +/* $NetBSD: vmparam.h,v 1.23 2003/02/03 17:09:56 matt Exp $ */ -#include <powerpc/mpc6xx/vmparam.h> +#include <powerpc/oea/vmparam.h> diff --git a/sys/arch/macppc/macppc/cpu.c b/sys/arch/macppc/macppc/cpu.c index ce2edcfcda7..669ff001947 100644 --- a/sys/arch/macppc/macppc/cpu.c +++ b/sys/arch/macppc/macppc/cpu.c @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.c,v 1.30 2002/10/02 05:30:45 thorpej Exp $ */ +/* $NetBSD: cpu.c,v 1.31 2003/02/03 17:09:56 matt Exp $ */ /*- * Copyright (c) 2001 Tsubai Masanari. @@ -42,7 +42,7 @@ #include <uvm/uvm_extern.h> #include <dev/ofw/openfirm.h> -#include <powerpc/mpc6xx/hid.h> +#include <powerpc/oea/hid.h> #include <powerpc/openpic.h> #include <powerpc/atomic.h> #include <powerpc/spr.h> diff --git a/sys/arch/macppc/macppc/extintr.c b/sys/arch/macppc/macppc/extintr.c index a03aa0dfc3b..d0281780c8e 100644 --- a/sys/arch/macppc/macppc/extintr.c +++ b/sys/arch/macppc/macppc/extintr.c @@ -1,4 +1,4 @@ -/* $NetBSD: extintr.c,v 1.35 2003/02/02 20:43:20 matt Exp $ */ +/* $NetBSD: extintr.c,v 1.36 2003/02/03 17:09:57 matt Exp $ */ /*- * Copyright (c) 2000, 2001 Tsubai Masanari. @@ -842,7 +842,7 @@ openpic_init() /* XXX set spurious intr vector */ - mpc6xx_install_extint(ext_intr_openpic); + oea_install_extint(ext_intr_openpic); } void @@ -855,7 +855,7 @@ legacy_int_init() out32rb(INT_CLEAR_REG_H, 0xffffffff); } - mpc6xx_install_extint(ext_intr); + oea_install_extint(ext_intr); } #define HEATHROW_FCR_OFFSET 0x38 /* XXX should not here */ diff --git a/sys/arch/macppc/macppc/locore.S b/sys/arch/macppc/macppc/locore.S index d566a524db4..b04f6b1e8f5 100644 --- a/sys/arch/macppc/macppc/locore.S +++ b/sys/arch/macppc/macppc/locore.S @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.49 2003/02/03 05:15:52 matt Exp $ */ +/* $NetBSD: locore.S,v 1.50 2003/02/03 17:09:57 matt Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -141,7 +141,7 @@ ENTRY(cpu_spinup_trampoline) /* * Pull in common Open Firmware code. */ -#include <powerpc/mpc6xx/ofw_subr.S> +#include <powerpc/oea/ofw_subr.S> /* * Pull in common switch and setfault code. diff --git a/sys/arch/macppc/macppc/machdep.c b/sys/arch/macppc/macppc/machdep.c index a79614044ae..07918b854e9 100644 --- a/sys/arch/macppc/macppc/machdep.c +++ b/sys/arch/macppc/macppc/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.123 2003/01/22 21:55:15 kleink Exp $ */ +/* $NetBSD: machdep.c,v 1.124 2003/02/03 17:09:57 matt Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -131,10 +131,10 @@ initppc(startkernel, endkernel, args) struct ofw_translations *ofmap; int ofmaplen; - mpc6xx_batinit(0x80000000, BAT_BL_256M, 0xf0000000, BAT_BL_256M, + oea_batinit(0x80000000, BAT_BL_256M, 0xf0000000, BAT_BL_256M, 0x90000000, BAT_BL_256M, 0xa0000000, BAT_BL_256M, 0xb0000000, BAT_BL_256M, 0); - mpc6xx_init(ext_intr); + oea_init(ext_intr); chosen = OF_finddevice("/chosen"); @@ -246,7 +246,7 @@ restore_ofmap(ofmap, len) void cpu_startup() { - mpc6xx_startup(NULL); + oea_startup(NULL); } /* diff --git a/sys/arch/mvmeppc/conf/std.mvmeppc b/sys/arch/mvmeppc/conf/std.mvmeppc index 261164b19df..addc8480017 100644 --- a/sys/arch/mvmeppc/conf/std.mvmeppc +++ b/sys/arch/mvmeppc/conf/std.mvmeppc @@ -1,11 +1,11 @@ -# $NetBSD: std.mvmeppc,v 1.5 2003/02/02 20:43:20 matt Exp $ +# $NetBSD: std.mvmeppc,v 1.6 2003/02/03 17:09:57 matt Exp $ # # standard, required NetBSD/mvmeppc 'options' machine mvmeppc powerpc -options PPC_MPC6XX # Support Motorola PPC60x CPUs -makeoptions PPCDIR="mpc6xx" # Tell Makefile.powerpc what dir to use +options PPC_OEA # Support Motorola PPC60x CPUs +makeoptions PPCDIR="oea" # Tell Makefile.powerpc what dir to use options EXEC_ELF32 # exec ELF binaries options EXEC_SCRIPT # exec #! scripts diff --git a/sys/arch/mvmeppc/include/pmap.h b/sys/arch/mvmeppc/include/pmap.h index 1dce0bd2ebf..d5ce16a22aa 100644 --- a/sys/arch/mvmeppc/include/pmap.h +++ b/sys/arch/mvmeppc/include/pmap.h @@ -1,3 +1,3 @@ -/* $NetBSD: pmap.h,v 1.1 2002/02/27 21:02:19 scw Exp $ */ +/* $NetBSD: pmap.h,v 1.2 2003/02/03 17:09:57 matt Exp $ */ -#include <powerpc/mpc6xx/pmap.h> +#include <powerpc/pmap.h> diff --git a/sys/arch/mvmeppc/include/vmparam.h b/sys/arch/mvmeppc/include/vmparam.h index 1a40d598fdd..7fa203f397d 100644 --- a/sys/arch/mvmeppc/include/vmparam.h +++ b/sys/arch/mvmeppc/include/vmparam.h @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.2 2002/07/09 20:06:35 scw Exp $ */ +/* $NetBSD: vmparam.h,v 1.3 2003/02/03 17:09:58 matt Exp $ */ #define USER_SR 15 -#include <powerpc/mpc6xx/vmparam.h> +#include <powerpc/oea/vmparam.h> diff --git a/sys/arch/mvmeppc/mvmeppc/machdep.c b/sys/arch/mvmeppc/mvmeppc/machdep.c index 6ddf1260d37..c83d9b603b8 100644 --- a/sys/arch/mvmeppc/mvmeppc/machdep.c +++ b/sys/arch/mvmeppc/mvmeppc/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.8 2003/01/22 21:55:16 kleink Exp $ */ +/* $NetBSD: machdep.c,v 1.9 2003/02/03 17:09:58 matt Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -168,7 +168,7 @@ initppc(startkernel, endkernel, btinfo) /* * boothowto */ - mpc6xx_batinit( + oea_batinit( MVMEPPC_PHYS_BASE_IO, BAT_BL_256M, MVMEPPC_PHYS_BASE_MEM, BAT_BL_256M, 0); @@ -176,7 +176,7 @@ initppc(startkernel, endkernel, btinfo) /* * Install vectors and interrupt handler. */ - mpc6xx_init(platform->ext_intr); + oea_init(platform->ext_intr); #ifdef DEBUG /* @@ -232,7 +232,7 @@ cpu_startup() platform->model, bootinfo.bi_mpuspeed/1000000, bootinfo.bi_busspeed/1000000); - mpc6xx_startup(modelbuf); + oea_startup(modelbuf); /* * Now allow hardware interrupts. @@ -363,7 +363,7 @@ cpu_reboot(howto, what) /* Do dump if requested */ if ((howto & (RB_DUMP | RB_HALT)) == RB_DUMP) - mpc6xx_dumpsys(); + oea_dumpsys(); halt_sys: doshutdownhooks(); diff --git a/sys/arch/ofppc/conf/std.ofppc b/sys/arch/ofppc/conf/std.ofppc index 37cfd844b52..e52a955be1d 100644 --- a/sys/arch/ofppc/conf/std.ofppc +++ b/sys/arch/ofppc/conf/std.ofppc @@ -1,11 +1,11 @@ -# $NetBSD: std.ofppc,v 1.8 2003/02/02 20:43:21 matt Exp $ +# $NetBSD: std.ofppc,v 1.9 2003/02/03 17:09:58 matt Exp $ # # standard, required NetBSD/ofppc 'options' machine ofppc powerpc -options PPC_MPC6XX -makeoptions PPCDIR="mpc6xx" # Tell Makefile.powerpc what dir to use +options PPC_OEA +makeoptions PPCDIR="oea" # Tell Makefile.powerpc what dir to use options EXEC_ELF32 # exec ELF binaries options EXEC_SCRIPT # exec #! scripts diff --git a/sys/arch/ofppc/firepower/firepower.c b/sys/arch/ofppc/firepower/firepower.c index c18a52ca8f9..ed0baab8c21 100644 --- a/sys/arch/ofppc/firepower/firepower.c +++ b/sys/arch/ofppc/firepower/firepower.c @@ -1,4 +1,4 @@ -/* $NetBSD: firepower.c,v 1.7 2003/01/01 01:57:51 thorpej Exp $ */ +/* $NetBSD: firepower.c,v 1.8 2003/02/03 17:09:58 matt Exp $ */ /* * Copyright 2001 Wasabi Systems, Inc. @@ -92,19 +92,19 @@ firepower_init(void) * * XXX This is actually a lot larger than 256M. */ - mpc6xx_iobat_add(0x80000000, BAT_BL_256M); + oea_iobat_add(0x80000000, BAT_BL_256M); /* * Map VA==PA the region that includes PCI Memory. * * XXX This is actually a lot larger than 256M. */ - mpc6xx_iobat_add(0xc0000000, BAT_BL_256M); + oea_iobat_add(0xc0000000, BAT_BL_256M); /* * Map VA==PA the region that includes the System registers. */ - mpc6xx_iobat_add(0xf0000000, BAT_BL_256M); + oea_iobat_add(0xf0000000, BAT_BL_256M); firepower_intr_init(); } diff --git a/sys/arch/ofppc/include/pmap.h b/sys/arch/ofppc/include/pmap.h index c972210b97b..f430a568446 100644 --- a/sys/arch/ofppc/include/pmap.h +++ b/sys/arch/ofppc/include/pmap.h @@ -1,3 +1,3 @@ -/* $NetBSD: pmap.h,v 1.11 2003/02/03 05:15:52 matt Exp $ */ +/* $NetBSD: pmap.h,v 1.12 2003/02/03 17:09:59 matt Exp $ */ -#include <powerpc/mpc6xx/pmap.h> +#include <powerpc/pmap.h> diff --git a/sys/arch/ofppc/include/vmparam.h b/sys/arch/ofppc/include/vmparam.h index b409749e437..4edefa07f29 100644 --- a/sys/arch/ofppc/include/vmparam.h +++ b/sys/arch/ofppc/include/vmparam.h @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.20 2003/02/02 21:22:11 matt Exp $ */ +/* $NetBSD: vmparam.h,v 1.21 2003/02/03 17:09:59 matt Exp $ */ #define USER_SR 11 -#include <powerpc/mpc6xx/vmparam.h> +#include <powerpc/oea/vmparam.h> diff --git a/sys/arch/ofppc/ofppc/locore.S b/sys/arch/ofppc/ofppc/locore.S index b21b30fe823..86875d62a11 100644 --- a/sys/arch/ofppc/ofppc/locore.S +++ b/sys/arch/ofppc/ofppc/locore.S @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.30 2003/02/03 05:15:52 matt Exp $ */ +/* $NetBSD: locore.S,v 1.31 2003/02/03 17:09:59 matt Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -141,7 +141,7 @@ __start: /* * Pull in common OFW code. */ -#include <powerpc/mpc6xx/ofw_subr.S> +#include <powerpc/oea/ofw_subr.S> /* * Pull in common switch / setfault code. diff --git a/sys/arch/ofppc/ofppc/machdep.c b/sys/arch/ofppc/ofppc/machdep.c index 87d1deb8f31..a1d3aa279a5 100644 --- a/sys/arch/ofppc/ofppc/machdep.c +++ b/sys/arch/ofppc/ofppc/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.81 2003/01/22 21:55:16 kleink Exp $ */ +/* $NetBSD: machdep.c,v 1.82 2003/02/03 17:09:59 matt Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -113,7 +113,7 @@ initppc(startkernel, endkernel, args) /* * Initialize the bat registers */ - mpc6xx_batinit(0); + oea_batinit(0); /* * Initialize the platform structure. This may add entries @@ -125,7 +125,7 @@ initppc(startkernel, endkernel, args) OF_set_callback(callback); #endif - mpc6xx_init(NULL); + oea_init(NULL); /* * Now that translation is enabled (and we can access bus space), @@ -175,7 +175,7 @@ void cpu_startup() { - mpc6xx_startup(NULL); + oea_startup(NULL); /* * Now allow hardware interrupts. @@ -288,7 +288,7 @@ cpu_reboot(howto, what) ppc_exit(); } if (!cold && (howto & RB_DUMP)) - mpc6xx_dumpsys(); + oea_dumpsys(); doshutdownhooks(); printf("rebooting\n\n"); if (what && *what) { diff --git a/sys/arch/pmppc/conf/std.pmppc b/sys/arch/pmppc/conf/std.pmppc index 9969aee87a4..d1e16285137 100644 --- a/sys/arch/pmppc/conf/std.pmppc +++ b/sys/arch/pmppc/conf/std.pmppc @@ -1,11 +1,11 @@ -# $NetBSD: std.pmppc,v 1.3 2003/02/02 20:43:22 matt Exp $ +# $NetBSD: std.pmppc,v 1.4 2003/02/03 17:09:59 matt Exp $ # # standard, required NetBSD/pmppc 'options' machine pmppc powerpc -options PPC_MPC6XX # Artesyn PMPPC uses Motorola PPC750 CPUs -makeoptions PPCDIR="mpc6xx" # Tell Makefile.powerpc what dir to use +options PPC_OEA # Artesyn PMPPC uses Motorola PPC750 CPUs +makeoptions PPCDIR="oea" # Tell Makefile.powerpc what dir to use # Executable support: options EXEC_ELF32 # exec ELF binaries diff --git a/sys/arch/pmppc/include/pmap.h b/sys/arch/pmppc/include/pmap.h index e3214d97154..341a201199e 100644 --- a/sys/arch/pmppc/include/pmap.h +++ b/sys/arch/pmppc/include/pmap.h @@ -1,3 +1,3 @@ -/* $NetBSD: pmap.h,v 1.2 2003/02/03 05:15:52 matt Exp $ */ +/* $NetBSD: pmap.h,v 1.3 2003/02/03 17:10:00 matt Exp $ */ -#include <powerpc/mpc6xx/pmap.h> +#include <powerpc/pmap.h> diff --git a/sys/arch/pmppc/include/vmparam.h b/sys/arch/pmppc/include/vmparam.h index 0e72333a1e9..d7d4f7ce838 100644 --- a/sys/arch/pmppc/include/vmparam.h +++ b/sys/arch/pmppc/include/vmparam.h @@ -1,3 +1,3 @@ -/* $NetBSD: vmparam.h,v 1.3 2003/02/02 21:22:12 matt Exp $ */ +/* $NetBSD: vmparam.h,v 1.4 2003/02/03 17:10:00 matt Exp $ */ -#include <powerpc/mpc6xx/vmparam.h> +#include <powerpc/oea/vmparam.h> diff --git a/sys/arch/pmppc/pmppc/autoconf.c b/sys/arch/pmppc/pmppc/autoconf.c index 1c965541f9d..8be272467d5 100644 --- a/sys/arch/pmppc/pmppc/autoconf.c +++ b/sys/arch/pmppc/pmppc/autoconf.c @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.2 2002/09/06 13:18:43 gehenna Exp $ */ +/* $NetBSD: autoconf.c,v 1.3 2003/02/03 17:10:00 matt Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -55,7 +55,7 @@ #include <sys/reboot.h> #include <sys/device.h> -#include <powerpc/mpc6xx/pte.h> +#include <powerpc/pte.h> struct device *booted_device; int booted_partition; diff --git a/sys/arch/pmppc/pmppc/locore.S b/sys/arch/pmppc/pmppc/locore.S index 629463498e9..f1f99ee5db0 100644 --- a/sys/arch/pmppc/pmppc/locore.S +++ b/sys/arch/pmppc/pmppc/locore.S @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.3 2003/02/02 20:43:22 matt Exp $ */ +/* $NetBSD: locore.S,v 1.4 2003/02/03 17:10:00 matt Exp $ */ /* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */ /* @@ -51,7 +51,7 @@ #include <machine/asm.h> #include <powerpc/spr.h> -#include <powerpc/mpc6xx/hid.h> +#include <powerpc/oea/hid.h> /* * Some instructions gas doesn't understand (yet?) diff --git a/sys/arch/pmppc/pmppc/machdep.c b/sys/arch/pmppc/pmppc/machdep.c index 7c69ad77b02..d8d4b763955 100644 --- a/sys/arch/pmppc/pmppc/machdep.c +++ b/sys/arch/pmppc/pmppc/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.11 2003/01/24 11:55:19 augustss Exp $ */ +/* $NetBSD: machdep.c,v 1.12 2003/02/03 17:10:00 matt Exp $ */ /* * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -101,7 +101,7 @@ #include <net/netisr.h> -#include <powerpc/mpc6xx/bat.h> +#include <powerpc/bat.h> #include <machine/bus.h> #include <machine/db_machdep.h> #include <machine/intr.h> @@ -196,7 +196,7 @@ initppc(u_int startkernel, u_int endkernel, u_int args, void *btinfo) /* * Initialize the BAT registers */ - mpc6xx_batinit( + oea_batinit( PMPPC_FLASH_BASE, BAT_BL_256M, /* flash (etc) memory 256M area */ CPC_PCI_MEM_BASE, BAT_BL_256M, /* PCI memory 256M area */ CPC_PCI_IO_BASE, BAT_BL_128M, /* PCI I/O 128M area */ @@ -205,7 +205,7 @@ initppc(u_int startkernel, u_int endkernel, u_int args, void *btinfo) /* * Set up trap vectors */ - mpc6xx_init(ext_intr); + oea_init(ext_intr); /* * Set the page size. @@ -256,7 +256,7 @@ cpu_startup() { int msr; - mpc6xx_startup(NULL); + oea_startup(NULL); /* * Now that we have VM, malloc()s are OK in bus_space. @@ -352,7 +352,7 @@ cpu_reboot(int howto, char *what) while(1); } if (!cold && (howto & RB_DUMP)) - mpc6xx_dumpsys(); + oea_dumpsys(); doshutdownhooks(); printf("rebooting\n\n"); if (what && *what) { diff --git a/sys/arch/powerpc/Makefile b/sys/arch/powerpc/Makefile index 10a9be928fe..137a0265786 100644 --- a/sys/arch/powerpc/Makefile +++ b/sys/arch/powerpc/Makefile @@ -1,5 +1,5 @@ -# $NetBSD: Makefile,v 1.7 2001/06/13 06:01:46 simonb Exp $ +# $NetBSD: Makefile,v 1.8 2003/02/03 17:10:00 matt Exp $ -SUBDIR= include include/ibm4xx include/mpc6xx +SUBDIR= include include/ibm4xx include/oea .include <bsd.kinc.mk> diff --git a/sys/arch/powerpc/conf/files.powerpc b/sys/arch/powerpc/conf/files.powerpc index df692405b45..4526efc05ca 100644 --- a/sys/arch/powerpc/conf/files.powerpc +++ b/sys/arch/powerpc/conf/files.powerpc @@ -1,9 +1,9 @@ -# $NetBSD: files.powerpc,v 1.44 2003/02/02 21:22:12 matt Exp $ +# $NetBSD: files.powerpc,v 1.45 2003/02/03 17:10:01 matt Exp $ defflag opt_altivec.h ALTIVEC K_ALTIVEC defflag opt_openpic.h OPENPIC OPENPIC_SERIAL_MODE defparam opt_ppcparam.h L2CR_CONFIG INTSTK SPILLSTK -defflag opt_ppcarch.h PPC_MPC6XX PPC_MPC8XX PPC_IBM4XX +defflag opt_ppcarch.h PPC_OEA PPC_MPC8XX PPC_IBM4XX defflag opt_pmap.h PMAPDEBUG PMAPCHECK PMAPCOUNTERS file arch/powerpc/powerpc/Locore.c @@ -15,7 +15,7 @@ file arch/powerpc/powerpc/ipkdb_glue.c ipkdb file arch/powerpc/powerpc/kgdb_machdep.c kgdb file arch/powerpc/powerpc/mem.c file arch/powerpc/powerpc/openpic.c openpic -file arch/powerpc/powerpc/pmap_subr.c ppc_mpc6xx +file arch/powerpc/powerpc/pmap_subr.c ppc_oea file arch/powerpc/powerpc/powerpc_machdep.c file arch/powerpc/powerpc/process_machdep.c file arch/powerpc/powerpc/setfault.S @@ -43,12 +43,12 @@ file arch/powerpc/ibm4xx/intr.c ppc_ibm4xx # MPC (Motorola PowerPC) 6xx Family files (60x,74x,75x,74xx) # -file arch/powerpc/mpc6xx/altivec.c ppc_mpc6xx & altivec -file arch/powerpc/mpc6xx/cpu_subr.c ppc_mpc6xx -file arch/powerpc/mpc6xx/mpc6xx_machdep.c ppc_mpc6xx -file arch/powerpc/mpc6xx/pmap.c ppc_mpc6xx -file arch/powerpc/powerpc/fpu.c ppc_mpc6xx -file arch/powerpc/powerpc/trap.c ppc_mpc6xx +file arch/powerpc/oea/altivec.c ppc_oea & altivec +file arch/powerpc/oea/cpu_subr.c ppc_oea +file arch/powerpc/oea/oea_machdep.c ppc_oea +file arch/powerpc/oea/pmap.c ppc_oea +file arch/powerpc/powerpc/fpu.c ppc_oea +file arch/powerpc/powerpc/trap.c ppc_oea # Binary compatibility with previous NetBSD releases (COMPAT_XX) file arch/powerpc/powerpc/compat_13_machdep.c compat_13 @@ -72,6 +72,6 @@ include "compat/ossaudio/files.ossaudio" # Linux binary compatibility (COMPAT_LINUX) include "compat/linux/files.linux" include "compat/linux/arch/powerpc/files.linux_powerpc" -file arch/powerpc/powerpc/linux_sigcode.S compat_linux -file arch/powerpc/powerpc/linux_trap.c compat_linux -file arch/powerpc/powerpc/linux_syscall.c compat_linux +file arch/powerpc/powerpc/linux_sigcode.S compat_linux +file arch/powerpc/powerpc/linux_trap.c compat_linux +file arch/powerpc/powerpc/linux_syscall.c compat_linux diff --git a/sys/arch/powerpc/include/bat.h b/sys/arch/powerpc/include/bat.h index 773a2cc8d68..05b801ef58a 100644 --- a/sys/arch/powerpc/include/bat.h +++ b/sys/arch/powerpc/include/bat.h @@ -1,9 +1,9 @@ -/* $NetBSD: bat.h,v 1.4 2001/06/12 17:20:50 tsubai Exp $ */ +/* $NetBSD: bat.h,v 1.5 2003/02/03 17:10:01 matt Exp $ */ #ifdef _KERNEL_OPT #include "opt_ppcarch.h" #endif -#ifdef PPC_MPC6XX -#include <powerpc/mpc6xx/bat.h> +#ifdef PPC_OEA +#include <powerpc/oea/bat.h> #endif diff --git a/sys/arch/powerpc/include/cpu.h b/sys/arch/powerpc/include/cpu.h index bc7285ccfea..9d4a974f869 100644 --- a/sys/arch/powerpc/include/cpu.h +++ b/sys/arch/powerpc/include/cpu.h @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.25 2003/02/02 20:43:23 matt Exp $ */ +/* $NetBSD: cpu.h,v 1.26 2003/02/03 17:10:01 matt Exp $ */ /* * Copyright (C) 1999 Wolfgang Solfrank. @@ -261,11 +261,11 @@ void icache_flush(vaddr_t, vsize_t); #define need_proftick(p) ((p)->p_flag |= P_OWEUPC, curcpu()->ci_astpending = 1) #define signotify(p) (curcpu()->ci_astpending = 1) -#ifdef PPC_MPC6XX -void mpc6xx_init(void (*)(void)); -void mpc6xx_startup(const char *); -void mpc6xx_dumpsys(void); -void mpc6xx_install_extint(void (*)(void)); +#ifdef PPC_OEA +void oea_init(void (*)(void)); +void oea_startup(const char *); +void oea_dumpsys(void); +void oea_install_extint(void (*)(void)); void *mapiodev(paddr_t, psize_t); paddr_t kvtop(caddr_t); void softnet(int); diff --git a/sys/arch/powerpc/include/fpu.h b/sys/arch/powerpc/include/fpu.h index 85b8e89f79c..9e438d6e9c2 100644 --- a/sys/arch/powerpc/include/fpu.h +++ b/sys/arch/powerpc/include/fpu.h @@ -1,4 +1,4 @@ -/* $NetBSD: fpu.h,v 1.9 2003/01/18 06:23:29 thorpej Exp $ */ +/* $NetBSD: fpu.h,v 1.10 2003/02/03 17:10:01 matt Exp $ */ /*- * Copyright (C) 1996 Wolfgang Solfrank. @@ -73,7 +73,7 @@ #endif /* List of PowerPC architectures that support FPUs. */ -#if defined(PPC_MPC6XX) +#if defined(PPC_OEA) #define PPC_HAVE_FPU void enable_fpu(void); diff --git a/sys/arch/powerpc/include/mpc6xx/Makefile b/sys/arch/powerpc/include/oea/Makefile index 02bbb492c71..c91bae38d60 100644 --- a/sys/arch/powerpc/include/mpc6xx/Makefile +++ b/sys/arch/powerpc/include/oea/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.3 2002/11/26 23:30:22 lukem Exp $ +# $NetBSD: Makefile,v 1.1 2003/02/03 17:10:05 matt Exp $ -INCSDIR= /usr/include/powerpc/mpc6xx +INCSDIR= /usr/include/powerpc/oea INCS= bat.h \ hid.h hid_601.h \ diff --git a/sys/arch/powerpc/include/mpc6xx/bat.h b/sys/arch/powerpc/include/oea/bat.h index 5483f8976c8..6eb08a5df09 100644 --- a/sys/arch/powerpc/include/mpc6xx/bat.h +++ b/sys/arch/powerpc/include/oea/bat.h @@ -1,4 +1,4 @@ -/* $NetBSD: bat.h,v 1.5 2002/07/05 18:45:21 matt Exp $ */ +/* $NetBSD: bat.h,v 1.1 2003/02/03 17:10:05 matt Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -67,8 +67,8 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _MPC6XX_BAT_H_ -#define _MPC6XX_BAT_H_ +#ifndef _POWERPC_OEA_BAT_H_ +#define _POWERPC_OEA_BAT_H_ struct bat { u_int32_t batu; @@ -178,9 +178,9 @@ struct bat { ((batl) & BAT601_V) #ifdef _KERNEL -void mpc6xx_batinit(paddr_t, ...); -void mpc6xx_iobat_add(paddr_t, register_t); +void oea_batinit(paddr_t, ...); +void oea_iobat_add(paddr_t, register_t); extern struct bat battable[]; #endif -#endif /* _MPC6XX_BAT_H_ */ +#endif /* _POWERPC_OEA_BAT_H_ */ diff --git a/sys/arch/powerpc/include/mpc6xx/hid.h b/sys/arch/powerpc/include/oea/hid.h index 26074c3a0c1..94b2a5a723f 100644 --- a/sys/arch/powerpc/include/mpc6xx/hid.h +++ b/sys/arch/powerpc/include/oea/hid.h @@ -1,4 +1,4 @@ -/* $NetBSD: hid.h,v 1.2 2001/08/22 21:05:25 matt Exp $ */ +/* $NetBSD: hid.h,v 1.1 2003/02/03 17:10:05 matt Exp $ */ /*- * Copyright (c) 2000 Tsubai Masanari. All rights reserved. @@ -26,8 +26,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _MPC6XX_HID_H_ -#define _MPC6XX_HID_H_ +#ifndef _POWERPC_OEA_HID_H_ +#define _POWERPC_OEA_HID_H_ /* Hardware Implementation Dependent registers for the PowerPC */ @@ -123,4 +123,4 @@ * 7450: FOLD = Branch folding enable */ -#endif /* _MPC6XX_HID_H_ */ +#endif /* _POWERPC_OEA_HID_H_ */ diff --git a/sys/arch/powerpc/include/mpc6xx/hid_601.h b/sys/arch/powerpc/include/oea/hid_601.h index bb6c1cb037c..a026ed19482 100644 --- a/sys/arch/powerpc/include/mpc6xx/hid_601.h +++ b/sys/arch/powerpc/include/oea/hid_601.h @@ -1,4 +1,4 @@ -/* $NetBSD: hid_601.h,v 1.2 2002/02/06 19:59:30 kleink Exp $ */ +/* $NetBSD: hid_601.h,v 1.1 2003/02/03 17:10:05 matt Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -36,8 +36,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _MPC6XX_HID_601_H_ -#define _MPC6XX_HID_601_H_ +#ifndef _POWERPC_OEA_HID_601_H_ +#define _POWERPC_OEA_HID_601_H_ /* * Hardware Implementation Dependent registers for the PowerPC 601. */ @@ -110,4 +110,4 @@ */ #define HID15_601_PID 0x0000000f /* processor ID mask */ -#endif /* _MPC6XX_HID_601_H_ */ +#endif /* _POWERPC_OEA_HID_601_H_ */ diff --git a/sys/arch/powerpc/include/mpc6xx/pmap.h b/sys/arch/powerpc/include/oea/pmap.h index ad2fa6a083d..97c301b9ed9 100644 --- a/sys/arch/powerpc/include/mpc6xx/pmap.h +++ b/sys/arch/powerpc/include/oea/pmap.h @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.h,v 1.10 2003/01/22 21:44:55 kleink Exp $ */ +/* $NetBSD: pmap.h,v 1.1 2003/02/03 17:10:05 matt Exp $ */ /*- * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -31,10 +31,10 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _MPC6XX_PMAP_H_ -#define _MPC6XX_PMAP_H_ +#ifndef _POWERPC_OEA_PMAP_H_ +#define _POWERPC_OEA_PMAP_H_ -#include <powerpc/mpc6xx/pte.h> +#include <powerpc/oea/pte.h> /* * Segment registers @@ -127,4 +127,4 @@ vtophys(vaddr_t va) #endif /* _KERNEL */ #endif /* _LOCORE */ -#endif /* _MPC6XX_PMAP_H_ */ +#endif /* _POWERPC_OEA_PMAP_H_ */ diff --git a/sys/arch/powerpc/include/mpc6xx/pte.h b/sys/arch/powerpc/include/oea/pte.h index 7a84112f2b0..f8fe661b67f 100644 --- a/sys/arch/powerpc/include/mpc6xx/pte.h +++ b/sys/arch/powerpc/include/oea/pte.h @@ -1,4 +1,4 @@ -/* $NetBSD: pte.h,v 1.9 2002/07/25 23:33:04 matt Exp $ */ +/* $NetBSD: pte.h,v 1.1 2003/02/03 17:10:05 matt Exp $ */ /*- * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -31,8 +31,8 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _MPC6XX_PTE_H_ -#define _MPC6XX_PTE_H_ +#ifndef _POWERPC_OEA_PTE_H_ +#define _POWERPC_OEA_PTE_H_ #include <sys/queue.h> @@ -84,4 +84,4 @@ typedef struct pte pte_t; #define ADDR_API_SHFT 22 #define ADDR_POFF 0x00000fff -#endif /* _MPC6XX_PTE_H_ */ +#endif /* _POWERPC_OEA_PTE_H_ */ diff --git a/sys/arch/powerpc/include/mpc6xx/sr_601.h b/sys/arch/powerpc/include/oea/sr_601.h index ecbe72365b2..749632915ea 100644 --- a/sys/arch/powerpc/include/mpc6xx/sr_601.h +++ b/sys/arch/powerpc/include/oea/sr_601.h @@ -1,4 +1,4 @@ -/* $NetBSD: sr_601.h,v 1.2 2003/01/22 21:44:55 kleink Exp $ */ +/* $NetBSD: sr_601.h,v 1.1 2003/02/03 17:10:06 matt Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -36,8 +36,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _MPC6XX_SR_601_H_ -#define _MPC6XX_SR_601_H_ +#ifndef _POWERPC_OEA_SR_601_H_ +#define _POWERPC_OEA_SR_601_H_ /* * I/O Controller Interface Address Translation segment register @@ -69,4 +69,4 @@ void mpc601_ioseg_add(paddr_t, register_t); #endif -#endif /* !_MPC6XX_SR_601_H_ */ +#endif /* !_POWERPC_OEA_SR_601_H_ */ diff --git a/sys/arch/powerpc/include/mpc6xx/vmparam.h b/sys/arch/powerpc/include/oea/vmparam.h index adeca9d990c..05f380eae61 100644 --- a/sys/arch/powerpc/include/mpc6xx/vmparam.h +++ b/sys/arch/powerpc/include/oea/vmparam.h @@ -34,8 +34,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _MPC6XX_VMPARAM_H_ -#define _MPC6XX_VMPARAM_H_ +#ifndef _POWERPC_OEA_VMPARAM_H_ +#define _POWERPC_OEA_VMPARAM_H_ #include <sys/queue.h> @@ -137,11 +137,6 @@ #define NPMAPS 32768 /* Number of pmaps in system */ #endif -/* - * Eventually VM_MAXUSER_ADDRESS should be defined as - * (USER_SR << ADDR_SR_SHFT) - PAGE_SIZE - * Well, USER_SR should die too. Say 0xbffff000. - */ #define VM_MIN_ADDRESS ((vaddr_t) 0) #define VM_MAXUSER_ADDRESS ((vaddr_t) 0xfffff000) #define VM_MAX_ADDRESS VM_MAXUSER_ADDRESS @@ -165,7 +160,8 @@ #define VM_NFREELIST 16 /* 16 distinct memory segments */ #define VM_FREELIST_DEFAULT 0 #define VM_FREELIST_FIRST256 1 -#define VM_FREELIST_MAX 2 +#define VM_FREELIST_FIRST16 2 +#define VM_FREELIST_MAX 3 #ifndef _LOCORE @@ -197,4 +193,4 @@ struct pmap_physseg { #endif /* _LOCORE */ -#endif /* _MPC6XX_VMPARAM_H_ */ +#endif /* _POWERPC_OEA_VMPARAM_H_ */ diff --git a/sys/arch/powerpc/include/pmap.h b/sys/arch/powerpc/include/pmap.h new file mode 100644 index 00000000000..8cf341cd9fe --- /dev/null +++ b/sys/arch/powerpc/include/pmap.h @@ -0,0 +1,11 @@ +/* $NetBSD: pmap.h,v 1.30 2003/02/03 17:10:01 matt Exp $ */ + +#ifdef _KERNEL_OPT +#include "opt_ppcarch.h" +#endif + +#ifdef PPC_IBM4XX +#include <powerpc/ibm4xx/pmap.h> +#elif defined(PPC_OEA) +#include <powerpc/oea/pmap.h> +#endif diff --git a/sys/arch/powerpc/include/pte.h b/sys/arch/powerpc/include/pte.h index ab842df809b..39ee2bf0bb2 100644 --- a/sys/arch/powerpc/include/pte.h +++ b/sys/arch/powerpc/include/pte.h @@ -1,11 +1,11 @@ -/* $NetBSD: pte.h,v 1.5 2002/12/09 12:28:13 scw Exp $ */ +/* $NetBSD: pte.h,v 1.6 2003/02/03 17:10:02 matt Exp $ */ #ifdef _KERNEL_OPT #include "opt_ppcarch.h" #endif -#ifdef PPC_MPC6XX -#include <powerpc/mpc6xx/pte.h> +#ifdef PPC_OEA +#include <powerpc/oea/pte.h> #elif defined(PPC_IBM4XX) #include <powerpc/ibm4xx/pte.h> #endif diff --git a/sys/arch/powerpc/mpc6xx/altivec.c b/sys/arch/powerpc/oea/altivec.c index 2c93d5a383b..bf705774b77 100644 --- a/sys/arch/powerpc/mpc6xx/altivec.c +++ b/sys/arch/powerpc/oea/altivec.c @@ -1,4 +1,4 @@ -/* $NetBSD: altivec.c,v 1.8 2003/02/02 20:43:23 matt Exp $ */ +/* $NetBSD: altivec.c,v 1.1 2003/02/03 17:10:09 matt Exp $ */ /* * Copyright (C) 1996 Wolfgang Solfrank. diff --git a/sys/arch/powerpc/mpc6xx/cpu_subr.c b/sys/arch/powerpc/oea/cpu_subr.c index 7bd57099fd3..861b03e7187 100644 --- a/sys/arch/powerpc/mpc6xx/cpu_subr.c +++ b/sys/arch/powerpc/oea/cpu_subr.c @@ -1,4 +1,4 @@ -/* $NetBSD: cpu_subr.c,v 1.29 2003/02/02 20:43:23 matt Exp $ */ +/* $NetBSD: cpu_subr.c,v 1.1 2003/02/03 17:10:09 matt Exp $ */ /*- * Copyright (c) 2001 Matt Thomas. @@ -44,8 +44,8 @@ #include <uvm/uvm_extern.h> -#include <powerpc/mpc6xx/hid.h> -#include <powerpc/mpc6xx/hid_601.h> +#include <powerpc/oea/hid.h> +#include <powerpc/oea/hid_601.h> #include <powerpc/spr.h> #include <dev/sysmon/sysmonvar.h> diff --git a/sys/arch/powerpc/mpc6xx/genassym.cf b/sys/arch/powerpc/oea/genassym.cf index 35389dbc97e..4de74114cf4 100644 --- a/sys/arch/powerpc/mpc6xx/genassym.cf +++ b/sys/arch/powerpc/oea/genassym.cf @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.10 2003/02/02 20:43:23 matt Exp $ +# $NetBSD: genassym.cf,v 1.1 2003/02/03 17:10:09 matt Exp $ # # Copyright (C) 1995, 1996 Wolfgang Solfrank. diff --git a/sys/arch/powerpc/mpc6xx/mpc6xx_machdep.c b/sys/arch/powerpc/oea/oea_machdep.c index 1d9b6b81473..9d411e82269 100644 --- a/sys/arch/powerpc/mpc6xx/mpc6xx_machdep.c +++ b/sys/arch/powerpc/oea/oea_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: mpc6xx_machdep.c,v 1.14 2003/02/02 20:43:23 matt Exp $ */ +/* $NetBSD: oea_machdep.c,v 1.1 2003/02/03 17:10:10 matt Exp $ */ /* * Copyright (C) 2002 Matt Thomas @@ -73,8 +73,8 @@ #include <ipkdb/ipkdb.h> #endif -#include <powerpc/mpc6xx/bat.h> -#include <powerpc/mpc6xx/sr_601.h> +#include <powerpc/oea/bat.h> +#include <powerpc/oea/sr_601.h> #include <powerpc/trap.h> #include <powerpc/stdarg.h> #include <powerpc/spr.h> @@ -99,7 +99,7 @@ sr_t iosrtable[16]; /* I/O segments, for kernel_pmap setup */ paddr_t msgbuf_paddr; void -mpc6xx_init(void (*handler)(void)) +oea_init(void (*handler)(void)) { extern int trapstart[], trapend[]; extern int trapcode, trapsize; @@ -306,7 +306,7 @@ mpc6xx_init(void (*handler)(void)) * external interrupt handler install */ if (handler) - mpc6xx_install_extint(handler); + oea_install_extint(handler); __syncicache(0, EXC_LAST + 0x100); @@ -339,7 +339,7 @@ mpc601_ioseg_add(paddr_t pa, register_t len) } void -mpc6xx_iobat_add(paddr_t pa, register_t len) +oea_iobat_add(paddr_t pa, register_t len) { static int n = 1; const u_int i = pa >> 28; @@ -374,7 +374,7 @@ mpc6xx_iobat_add(paddr_t pa, register_t len) } void -mpc6xx_batinit(paddr_t pa, ...) +oea_batinit(paddr_t pa, ...) { struct mem_region *allmem, *availmem, *mp; int i; @@ -472,7 +472,7 @@ mpc6xx_batinit(paddr_t pa, ...) } else { while (pa != 0) { register_t len = va_arg(ap, register_t); - mpc6xx_iobat_add(pa, len); + oea_iobat_add(pa, len); pa = va_arg(ap, paddr_t); } } @@ -518,7 +518,7 @@ mpc6xx_batinit(paddr_t pa, ...) } void -mpc6xx_install_extint(void (*handler)(void)) +oea_install_extint(void (*handler)(void)) { extern int extint, extsize; extern int extint_call; @@ -544,7 +544,7 @@ mpc6xx_install_extint(void (*handler)(void)) * Machine dependent startup code. */ void -mpc6xx_startup(const char *model) +oea_startup(const char *model) { uintptr_t sz; u_int i; @@ -649,7 +649,7 @@ mpc6xx_startup(const char *model) UVM_MAPFLAG(UVM_PROT_NONE, UVM_PROT_NONE, UVM_INH_NONE, UVM_ADV_NORMAL, UVM_FLAG_FIXED)); if (error != 0 || minaddr != 0xDEAC0000) { - printf("mpc6xx_startup: failed to allocate DEAD " + printf("oea_startup: failed to allocate DEAD " "ZONE: error=%d\n", error); minaddr = 0; } @@ -699,7 +699,7 @@ mpc6xx_startup(const char *model) */ void -mpc6xx_dumpsys(void) +oea_dumpsys(void) { printf("dumpsys: TBD\n"); } diff --git a/sys/arch/powerpc/mpc6xx/ofw_subr.S b/sys/arch/powerpc/oea/ofw_subr.S index 138f784dfe4..4d460ece435 100644 --- a/sys/arch/powerpc/mpc6xx/ofw_subr.S +++ b/sys/arch/powerpc/oea/ofw_subr.S @@ -1,4 +1,4 @@ -/* $NetBSD: ofw_subr.S,v 1.4 2003/02/02 20:43:23 matt Exp $ */ +/* $NetBSD: ofw_subr.S,v 1.1 2003/02/03 17:10:10 matt Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. diff --git a/sys/arch/powerpc/mpc6xx/pmap.c b/sys/arch/powerpc/oea/pmap.c index dd38f1b84d1..b0fb441c029 100644 --- a/sys/arch/powerpc/mpc6xx/pmap.c +++ b/sys/arch/powerpc/oea/pmap.c @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.64 2003/01/22 21:44:55 kleink Exp $ */ +/* $NetBSD: pmap.c,v 1.1 2003/02/03 17:10:10 matt Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. * All rights reserved. @@ -88,9 +88,9 @@ #include <machine/pcb.h> #include <machine/powerpc.h> #include <powerpc/spr.h> -#include <powerpc/mpc6xx/sr_601.h> +#include <powerpc/oea/sr_601.h> #if __NetBSD_Version__ > 105010000 -#include <powerpc/mpc6xx/bat.h> +#include <powerpc/oea/bat.h> #else #include <powerpc/bat.h> #endif diff --git a/sys/arch/powerpc/powerpc/db_interface.c b/sys/arch/powerpc/powerpc/db_interface.c index 92e6f0f17e9..d30f969c0bc 100644 --- a/sys/arch/powerpc/powerpc/db_interface.c +++ b/sys/arch/powerpc/powerpc/db_interface.c @@ -1,4 +1,4 @@ -/* $NetBSD: db_interface.c,v 1.27 2003/02/02 20:43:24 matt Exp $ */ +/* $NetBSD: db_interface.c,v 1.28 2003/02/03 17:10:11 matt Exp $ */ /* $OpenBSD: db_interface.c,v 1.2 1996/12/28 06:21:50 rahnds Exp $ */ #define USERACC @@ -72,7 +72,7 @@ ddb_trap_glue(frame) #ifdef PPC_IBM4XX if ((frame->srr1 & PSL_PR) == 0) return kdb_trap(frame->exc, frame); -#else /* PPC_MPC6XX */ +#else /* PPC_OEA */ if ((frame->srr1 & PSL_PR) == 0 && (frame->exc == EXC_TRC || frame->exc == EXC_RUNMODETRC || (frame->exc == EXC_PGM && (frame->srr1 & 0x20000)) || @@ -118,7 +118,7 @@ kdb_trap(type, v) DDB_REGS->ctr = frame->ctr; DDB_REGS->cr = frame->cr; DDB_REGS->xer = frame->xer; -#ifdef PPC_MPC6XX +#ifdef PPC_OEA DDB_REGS->mq = frame->tf_xtra[TF_MQ]; #endif #ifdef PPC_IBM4XX @@ -157,7 +157,7 @@ kdb_trap(type, v) frame->ctr = DDB_REGS->ctr; frame->cr = DDB_REGS->cr; frame->xer = DDB_REGS->xer; -#ifdef PPC_MPC6XX +#ifdef PPC_OEA frame->tf_xtra[TF_MQ] = DDB_REGS->mq; #endif #ifdef PPC_IBM4XX diff --git a/sys/arch/powerpc/powerpc/db_trace.c b/sys/arch/powerpc/powerpc/db_trace.c index e5338c99641..2e62f905e36 100644 --- a/sys/arch/powerpc/powerpc/db_trace.c +++ b/sys/arch/powerpc/powerpc/db_trace.c @@ -1,4 +1,4 @@ -/* $NetBSD: db_trace.c,v 1.25 2003/02/02 20:43:24 matt Exp $ */ +/* $NetBSD: db_trace.c,v 1.26 2003/02/03 17:10:11 matt Exp $ */ /* $OpenBSD: db_trace.c,v 1.3 1997/03/21 02:10:48 niklas Exp $ */ /* @@ -112,7 +112,7 @@ db_stack_trace_print(addr, have_addr, count, modif, pr) boolean_t kernel_only = TRUE; boolean_t trace_thread = FALSE; extern int trapexit[]; -#ifdef PPC_MPC6XX +#ifdef PPC_OEA extern int end[]; #endif boolean_t full = FALSE; @@ -159,7 +159,7 @@ db_stack_trace_print(addr, have_addr, count, modif, pr) for (;;) { if (frame < NBPG) break; -#ifdef PPC_MPC6XX +#ifdef PPC_OEA if (kernel_only && !cold && ((frame > (db_addr_t) end && frame < VM_MIN_KERNEL_ADDRESS) || @@ -171,7 +171,7 @@ db_stack_trace_print(addr, have_addr, count, modif, pr) args = (db_addr_t *)(frame + 8); if (frame < NBPG) break; -#ifdef PPC_MPC6XX +#ifdef PPC_OEA if (kernel_only && !cold && ((frame > (db_addr_t) end && frame < VM_MIN_KERNEL_ADDRESS) || @@ -200,7 +200,7 @@ db_stack_trace_print(addr, have_addr, count, modif, pr) (*pr)("%s ", tf->srr1 & PSL_PR ? "user" : "kernel"); switch (tf->exc) { case EXC_DSI: -#ifdef PPC_MPC6XX +#ifdef PPC_OEA (*pr)("DSI %s trap @ %#x by ", tf->dsisr & DSISR_STORE ? "write" : "read", tf->dar); @@ -250,7 +250,7 @@ db_stack_trace_print(addr, have_addr, count, modif, pr) } (*pr)("%-10s r1=%#x cr=%#x xer=%#x ctr=%#x", "", tf->fixreg[1], tf->cr, tf->xer, tf->ctr); -#ifdef PPC_MPC6XX +#ifdef PPC_OEA if (tf->exc == EXC_DSI) (*pr)(" dsisr=%#x", tf->dsisr); if ((mfpvr() >> 16) == MPC601) diff --git a/sys/arch/powerpc/powerpc/kgdb_machdep.c b/sys/arch/powerpc/powerpc/kgdb_machdep.c index ba76c0345ab..1044998f7cf 100644 --- a/sys/arch/powerpc/powerpc/kgdb_machdep.c +++ b/sys/arch/powerpc/powerpc/kgdb_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: kgdb_machdep.c,v 1.5 2003/01/22 21:44:56 kleink Exp $ */ +/* $NetBSD: kgdb_machdep.c,v 1.6 2003/02/03 17:10:11 matt Exp $ */ /* * Copyright 2001 Wasabi Systems, Inc. @@ -51,15 +51,12 @@ #include <uvm/uvm_extern.h> -#ifdef PPC_MPC6XX -#include <powerpc/mpc6xx/bat.h> -#else -#include <machine/bat.h> -#endif #include <machine/reg.h> #include <machine/trap.h> #include <machine/pmap.h> +#include <powerpc/bat.h> + /* * Determine if the memory at va..(va+len) is valid. */ @@ -168,7 +165,7 @@ kgdb_signal(type) return SIGSEGV; #endif -#ifdef PPC_MPC6XX +#ifdef PPC_OEA case EXC_PERF: /* 604/750/7400 - Performance monitoring */ case EXC_BPT: /* 604/750/7400 - Instruction breakpoint */ case EXC_SMI: /* 604/750/7400 - System management interrupt */ diff --git a/sys/arch/powerpc/powerpc/locore_subr.S b/sys/arch/powerpc/powerpc/locore_subr.S index 43b94275237..fb46ee727fd 100644 --- a/sys/arch/powerpc/powerpc/locore_subr.S +++ b/sys/arch/powerpc/powerpc/locore_subr.S @@ -1,4 +1,4 @@ -/* $NetBSD: locore_subr.S,v 1.8 2003/02/02 20:43:24 matt Exp $ */ +/* $NetBSD: locore_subr.S,v 1.9 2003/02/03 17:10:11 matt Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -99,7 +99,7 @@ ASENTRY(Idle) #if defined(PPC_IBM4XX) wrteei 1 /* reenable ints again */ -#else /* PPC_MPC6XX */ +#else /* PPC_OEA */ mfmsr 3 ori 3,3,PSL_EE@l /* reenable ints again */ mtmsr 3 @@ -113,18 +113,18 @@ ASENTRY(Idle) add. 9,9,9 ble 1f -#if defined(PPC_MPC6XX) +#if defined(PPC_OEA) sync oris 3,3,PSL_POW@h /* enter power saving mode */ mtmsr 3 isync -#endif /* PPC_MPC6XX */ +#endif /* PPC_OEA */ 1: #if defined(PPC_IBM4XX) wrteei 0 /* disable interrupts while manipulating runque */ -#else /* PPC_MPC6XX */ +#else /* PPC_OEA */ andi. 3,3,~PSL_EE@l /* disable interrupts while manipulating runque */ mtmsr 3 @@ -221,7 +221,7 @@ ENTRY_NOPROFILE(cpu_switch) #if defined(PPC_IBM4XX) wrteei 0 /* disable interrupts while manipulating runque */ -#else /* PPC_MPC6XX */ +#else /* PPC_OEA */ mfmsr 3 andi. 3,3,~PSL_EE@l /* disable interrupts while manipulating runque */ @@ -288,7 +288,7 @@ switch_common: #if defined(PPC_IBM4XX) li 10,0 /* no SR for 4xx CPUs */ -#else /* PPC_MPC6XX */ +#else /* PPC_OEA */ mfsr 10,USER_SR /* save USER_SR for copyin/copyout */ #endif mfcr 11 /* save cr */ @@ -322,7 +322,7 @@ switch_exited: * Don't have to do anything here; TLB PID gets updated on * return from trap. */ -#else /* PPC_MPC6XX */ +#else /* PPC_OEA */ mtsr USER_SR,10 /* get saved USER_SR */ isync #endif @@ -338,7 +338,7 @@ switch_return: #if defined(PPC_IBM4XX) wrteei 1 /* interrupts are okay again */ -#else /* PPC_MPC6XX */ +#else /* PPC_OEA */ mfmsr 3 ori 3,3,PSL_EE@l /* interrupts are okay again */ mtmsr 3 @@ -360,7 +360,7 @@ switch_return: mr 3,30 /* restore return value */ b 0b /* reload */ 1: -#else /* PPC_MPC6XX */ +#else /* PPC_OEA */ mr 3,30 /* restore return value */ #endif @@ -437,7 +437,7 @@ ENTRY(cpu_switchto) #if defined(PPC_IBM4XX) wrteei 0 /* disable interrupts while manipulating runque */ -#else /* PPC_MPC6XX */ +#else /* PPC_OEA */ mfmsr 3 andi. 3,3,~PSL_EE@l /* disable interrupts while manipulating runque */ diff --git a/sys/arch/powerpc/powerpc/mach_machdep.c b/sys/arch/powerpc/powerpc/mach_machdep.c index 7437d89590e..f3a4baffb49 100644 --- a/sys/arch/powerpc/powerpc/mach_machdep.c +++ b/sys/arch/powerpc/powerpc/mach_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: mach_machdep.c,v 1.12 2003/02/02 20:43:24 matt Exp $ */ +/* $NetBSD: mach_machdep.c,v 1.13 2003/02/03 17:10:11 matt Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mach_machdep.c,v 1.12 2003/02/02 20:43:24 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mach_machdep.c,v 1.13 2003/02/03 17:10:11 matt Exp $"); #include "opt_ppcarch.h" #include <sys/param.h> @@ -157,7 +157,7 @@ mach_create_thread_child(arg) tf->xer = regs->xer; tf->lr = regs->lr; tf->ctr = regs->ctr; -#ifdef PPC_MPC6XX +#ifdef PPC_OEA tf->tf_xtra[TF_MQ] = regs->mq; tf->tf_xtra[TF_VRSAVE] = regs->vrsave; #endif diff --git a/sys/arch/powerpc/powerpc/pmap_subr.c b/sys/arch/powerpc/powerpc/pmap_subr.c index 268a04860ea..dd6d6a999a3 100644 --- a/sys/arch/powerpc/powerpc/pmap_subr.c +++ b/sys/arch/powerpc/powerpc/pmap_subr.c @@ -1,4 +1,4 @@ -/* $NetBSD: pmap_subr.c,v 1.7 2002/11/13 21:08:50 matt Exp $ */ +/* $NetBSD: pmap_subr.c,v 1.8 2003/02/03 17:10:11 matt Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. * All rights reserved. @@ -46,8 +46,8 @@ #include <sys/systm.h> #include <uvm/uvm_extern.h> -#ifdef PPC_MPC6XX -#include <powerpc/mpc6xx/vmparam.h> +#ifdef PPC_OEA +#include <powerpc/oea/vmparam.h> #ifdef ALTIVEC #include <powerpc/altivec.h> #endif @@ -67,7 +67,7 @@ struct evcnt pmap_evcnt_copied_pages = struct evcnt pmap_evcnt_idlezeroed_pages = EVCNT_INITIALIZER(EVCNT_TYPE_MISC, NULL, "pmap", "pages idle zeroed"); -#ifdef PPC_MPC6XX +#ifdef PPC_OEA extern struct evcnt pmap_evcnt_exec_uncached_zero_page; extern struct evcnt pmap_evcnt_exec_uncached_copy_page; #endif @@ -104,7 +104,7 @@ pmap_zero_page(paddr_t pa) size_t linewidth; register_t msr; -#if defined(PPC_MPC6XX) +#if defined(PPC_OEA) { /* * If we are zeroing this page, we must clear the EXEC-ness @@ -134,12 +134,12 @@ pmap_zero_page(paddr_t pa) /* * Turn off data relocation (DMMU off). */ -#ifdef PPC_MPC6XX +#ifdef PPC_OEA if (pa >= SEGMENT_LENGTH) { #endif msr = MFMSR(); MTMSR(msr & ~PSL_DR); -#ifdef PPC_MPC6XX +#ifdef PPC_OEA } #endif @@ -166,7 +166,7 @@ pmap_zero_page(paddr_t pa) /* * Restore data relocation (DMMU on). */ -#ifdef PPC_MPC6XX +#ifdef PPC_OEA if (pa >= SEGMENT_LENGTH) #endif MTMSR(msr); @@ -183,7 +183,7 @@ pmap_copy_page(paddr_t src, paddr_t dst) register_t msr; size_t i; -#if defined(PPC_MPC6XX) +#if defined(PPC_OEA) { /* * If we are copying to the destination page, we must clear @@ -211,7 +211,7 @@ pmap_copy_page(paddr_t src, paddr_t dst) } #endif -#ifdef PPC_MPC6XX +#ifdef PPC_OEA if (src < SEGMENT_LENGTH && dst < SEGMENT_LENGTH) { /* * Copy the page (memcpy is optimized, right? :) @@ -254,7 +254,7 @@ pmap_syncicache(paddr_t pa, psize_t len) register_t msr; size_t i; -#ifdef PPC_MPC6XX +#ifdef PPC_OEA if (pa + len <= SEGMENT_LENGTH) { __syncicache((void *)pa, len); return; @@ -310,7 +310,7 @@ pmap_pageidlezero(paddr_t pa) boolean_t rv = TRUE; int i; -#ifdef PPC_MPC6XX +#ifdef PPC_OEA if (pa < SEGMENT_LENGTH) { for (i = 0; i < NBPG / sizeof(dp[0]); i++) { if (sched_whichqs != 0) diff --git a/sys/arch/powerpc/powerpc/powerpc_machdep.c b/sys/arch/powerpc/powerpc/powerpc_machdep.c index e4b6548fcd3..ccb954958f9 100644 --- a/sys/arch/powerpc/powerpc/powerpc_machdep.c +++ b/sys/arch/powerpc/powerpc/powerpc_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: powerpc_machdep.c,v 1.17 2003/02/02 20:43:24 matt Exp $ */ +/* $NetBSD: powerpc_machdep.c,v 1.18 2003/02/03 17:10:11 matt Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -48,7 +48,7 @@ int cpu_timebase; int cpu_printfataltraps; -#ifdef PPC_MPC6XX +#ifdef PPC_OEA extern int powersave; #endif @@ -138,7 +138,7 @@ cpu_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p) return sysctl_rdstruct(oldp, oldlenp, newp, &curcpu()->ci_ci, sizeof(curcpu()->ci_ci)); -#ifdef PPC_MPC6XX +#ifdef PPC_OEA case CPU_POWERSAVE: if (powersave < 0) return sysctl_rdint(oldp, oldlenp, newp, powersave); diff --git a/sys/arch/powerpc/powerpc/trap_subr.S b/sys/arch/powerpc/powerpc/trap_subr.S index 76d662a00bd..6f15d7f6ef5 100644 --- a/sys/arch/powerpc/powerpc/trap_subr.S +++ b/sys/arch/powerpc/powerpc/trap_subr.S @@ -1,4 +1,4 @@ -/* $NetBSD: trap_subr.S,v 1.33 2003/02/02 20:43:24 matt Exp $ */ +/* $NetBSD: trap_subr.S,v 1.34 2003/02/03 17:10:11 matt Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -87,7 +87,7 @@ /* * Save/restore MPC601 MQ register. - * Note: mpc6xx_init() relies on this instruction sequence. + * Note: oea_init() relies on this instruction sequence. */ #define SAVE_MQ(tf,b) \ mfspr b,SPR_MQ; \ diff --git a/sys/arch/powerpc/powerpc/vm_machdep.c b/sys/arch/powerpc/powerpc/vm_machdep.c index 8b742b90687..0b9d43d9ba7 100644 --- a/sys/arch/powerpc/powerpc/vm_machdep.c +++ b/sys/arch/powerpc/powerpc/vm_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: vm_machdep.c,v 1.46 2003/02/03 05:15:53 matt Exp $ */ +/* $NetBSD: vm_machdep.c,v 1.47 2003/02/03 17:10:12 matt Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -191,7 +191,7 @@ cpu_setfunc(l, func, arg) sf = (struct switchframe *) vaddr; memset((void *)sf, 0, sizeof *sf); /* just in case */ sf->sp = (register_t) cf; -#ifdef PPC_MPC6XX +#ifdef PPC_OEA sf->user_sr = pmap_kernel()->pm_sr[USER_SR]; /* again, just in case */ #endif pcb->pcb_sp = (register_t)sf; diff --git a/sys/arch/prep/conf/std.prep b/sys/arch/prep/conf/std.prep index 85a1002db94..49a65dc6ec6 100644 --- a/sys/arch/prep/conf/std.prep +++ b/sys/arch/prep/conf/std.prep @@ -1,11 +1,11 @@ -# $NetBSD: std.prep,v 1.5 2003/02/02 20:43:25 matt Exp $ +# $NetBSD: std.prep,v 1.6 2003/02/03 17:10:12 matt Exp $ # # standard, required NetBSD/prep 'options' machine prep powerpc -options PPC_MPC6XX -makeoptions PPCDIR="mpc6xx" # Tell Makefile.powerpc what dir to use +options PPC_OEA +makeoptions PPCDIR="oea" # Tell Makefile.powerpc what dir to use options EXEC_SCRIPT # exec #! scripts options EXEC_ELF32 # exec ELF binaries diff --git a/sys/arch/prep/include/pmap.h b/sys/arch/prep/include/pmap.h index bc58e5eddbf..e307189a88a 100644 --- a/sys/arch/prep/include/pmap.h +++ b/sys/arch/prep/include/pmap.h @@ -1,3 +1,3 @@ -/* $NetBSD: pmap.h,v 1.4 2003/02/03 05:15:53 matt Exp $ */ +/* $NetBSD: pmap.h,v 1.5 2003/02/03 17:10:12 matt Exp $ */ -#include <powerpc/mpc6xx/pmap.h> +#include <powerpc/pmap.h> diff --git a/sys/arch/prep/include/vmparam.h b/sys/arch/prep/include/vmparam.h index 59aaae42f06..3b7adfa43ce 100644 --- a/sys/arch/prep/include/vmparam.h +++ b/sys/arch/prep/include/vmparam.h @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.11 2003/02/02 21:22:13 matt Exp $ */ +/* $NetBSD: vmparam.h,v 1.12 2003/02/03 17:10:12 matt Exp $ */ #define USER_SR 11 -#include <powerpc/mpc6xx/vmparam.h> +#include <powerpc/oea/vmparam.h> diff --git a/sys/arch/prep/prep/machdep.c b/sys/arch/prep/prep/machdep.c index b7c29bd7cd1..c571a5db33f 100644 --- a/sys/arch/prep/prep/machdep.c +++ b/sys/arch/prep/prep/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.44 2003/01/22 21:55:17 kleink Exp $ */ +/* $NetBSD: machdep.c,v 1.45 2003/02/03 17:10:13 matt Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -188,12 +188,12 @@ initppc(startkernel, endkernel, args, btinfo) /* * Now setup fixed bat registers */ - mpc6xx_batinit( + oea_batinit( PREP_BUS_SPACE_MEM, BAT_BL_256M, PREP_BUS_SPACE_IO, BAT_BL_256M, 0); - mpc6xx_init(NULL); + oea_init(NULL); /* * external interrupt handler install @@ -243,7 +243,7 @@ cpu_startup() /* * Do common startup. */ - mpc6xx_startup(res->VitalProductData.PrintableModel); + oea_startup(res->VitalProductData.PrintableModel); /* * Now allow hardware interrupts. @@ -334,7 +334,7 @@ cpu_reboot(howto, what) /* Do dump if requested */ if ((howto & (RB_DUMP | RB_HALT)) == RB_DUMP) - mpc6xx_dumpsys(); + oea_dumpsys(); halt_sys: doshutdownhooks(); diff --git a/sys/arch/sandpoint/conf/std.sandpoint b/sys/arch/sandpoint/conf/std.sandpoint index 89cd150c1ed..705dba7a05a 100644 --- a/sys/arch/sandpoint/conf/std.sandpoint +++ b/sys/arch/sandpoint/conf/std.sandpoint @@ -1,11 +1,11 @@ -# $NetBSD: std.sandpoint,v 1.7 2003/02/02 20:43:25 matt Exp $ +# $NetBSD: std.sandpoint,v 1.8 2003/02/03 17:10:13 matt Exp $ # # standard, required NetBSD/sandpoint 'options' machine sandpoint powerpc -options PPC_MPC6XX # Sandpoint uses Motorola PPC60x CPUs -makeoptions PPCDIR="mpc6xx" # Tell Makefile.powerpc what dir to use +options PPC_OEA # Sandpoint uses OEA compliant CPUs +makeoptions PPCDIR="oea" # Tell Makefile.powerpc what dir to use # Executable support: options EXEC_ELF32 # exec ELF binaries diff --git a/sys/arch/sandpoint/include/pmap.h b/sys/arch/sandpoint/include/pmap.h index f31a8f2b86f..d53cf4d0c6f 100644 --- a/sys/arch/sandpoint/include/pmap.h +++ b/sys/arch/sandpoint/include/pmap.h @@ -1,3 +1,3 @@ -/* $NetBSD: pmap.h,v 1.5 2003/02/03 05:15:54 matt Exp $ */ +/* $NetBSD: pmap.h,v 1.6 2003/02/03 17:10:13 matt Exp $ */ -#include <powerpc/mpc6xx/pmap.h> +#include <powerpc/oea/pmap.h> diff --git a/sys/arch/sandpoint/include/vmparam.h b/sys/arch/sandpoint/include/vmparam.h index 7493e7d3f58..c82729d7028 100644 --- a/sys/arch/sandpoint/include/vmparam.h +++ b/sys/arch/sandpoint/include/vmparam.h @@ -1,3 +1,3 @@ -/* $NetBSD: vmparam.h,v 1.10 2003/02/02 21:22:13 matt Exp $ */ +/* $NetBSD: vmparam.h,v 1.11 2003/02/03 17:10:13 matt Exp $ */ -#include <powerpc/mpc6xx/vmparam.h> +#include <powerpc/oea/vmparam.h> diff --git a/sys/arch/sandpoint/sandpoint/autoconf.c b/sys/arch/sandpoint/sandpoint/autoconf.c index 39e076346e4..7d367c21fff 100644 --- a/sys/arch/sandpoint/sandpoint/autoconf.c +++ b/sys/arch/sandpoint/sandpoint/autoconf.c @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.6 2002/09/06 13:18:43 gehenna Exp $ */ +/* $NetBSD: autoconf.c,v 1.7 2003/02/03 17:10:13 matt Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -55,7 +55,7 @@ #include <sys/reboot.h> #include <sys/device.h> -#include <powerpc/mpc6xx/pte.h> +#include <powerpc/pte.h> struct device *booted_device; int booted_partition; diff --git a/sys/arch/sandpoint/sandpoint/locore.S b/sys/arch/sandpoint/sandpoint/locore.S index bfd4f0a421d..36098d760c7 100644 --- a/sys/arch/sandpoint/sandpoint/locore.S +++ b/sys/arch/sandpoint/sandpoint/locore.S @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.5 2003/02/02 20:43:25 matt Exp $ */ +/* $NetBSD: locore.S,v 1.6 2003/02/03 17:10:14 matt Exp $ */ /* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */ /* @@ -50,7 +50,7 @@ #include <machine/asm.h> #include <powerpc/spr.h> -#include <powerpc/mpc6xx/hid.h> +#include <powerpc/oea/hid.h> /* * Some instructions gas doesn't understand (yet?) diff --git a/sys/arch/sandpoint/sandpoint/machdep.c b/sys/arch/sandpoint/sandpoint/machdep.c index 9568aa30dd1..46ff27753d5 100644 --- a/sys/arch/sandpoint/sandpoint/machdep.c +++ b/sys/arch/sandpoint/sandpoint/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.23 2003/01/22 21:55:17 kleink Exp $ */ +/* $NetBSD: machdep.c,v 1.24 2003/02/03 17:10:14 matt Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -63,7 +63,7 @@ #include <net/netisr.h> -#include <powerpc/mpc6xx/bat.h> +#include <powerpc/bat.h> #include <machine/bus.h> #include <machine/db_machdep.h> #include <machine/intr.h> @@ -184,7 +184,7 @@ printf("availmemr[0].size %x\n", (unsigned) availmemr[0].size); * end of the address space This includes the PCI/ISA 16M I/O space, * PCI configuration registers, etc. */ - mpc6xx_batinit( + oea_batinit( SANDPOINT_BUS_SPACE_EUMB, BAT_BL_64M, SANDPOINT_BUS_SPACE_MEM, BAT_BL_256M, 0); @@ -195,7 +195,7 @@ printf("availmemr[0].size %x\n", (unsigned) availmemr[0].size); /* * Set up trap vectors and interrupt handler */ - mpc6xx_init(ext_intr); + oea_init(ext_intr); /* * Set EUMB base address @@ -247,7 +247,7 @@ cpu_startup(void) { int msr; - mpc6xx_startup(NULL); + oea_startup(NULL); /* * Now that we have VM, malloc()s are OK in bus_space. @@ -341,7 +341,7 @@ cpu_reboot(int howto, char *what) while(1); } if (!cold && (howto & RB_DUMP)) - mpc6xx_dumpsys(); + oea_dumpsys(); doshutdownhooks(); printf("rebooting\n\n"); if (what && *what) { |
