summaryrefslogtreecommitdiff
path: root/sys/arch/prep
diff options
context:
space:
mode:
authormatt <matt@NetBSD.org>2003-02-03 17:09:53 +0000
committermatt <matt@NetBSD.org>2003-02-03 17:09:53 +0000
commit2b0e97a5619ac2e4a64b40a360da40e4ca00a272 (patch)
tree3944ed9e947967dbeb5562c8db853dd0c9979e99 /sys/arch/prep
parent023b82a8068094654c32a63a44f628f6db187834 (diff)
Rename PPC_MPC6XX to PPC_OEA (and any mpc6xx reference to oea).
Diffstat (limited to 'sys/arch/prep')
-rw-r--r--sys/arch/prep/conf/std.prep6
-rw-r--r--sys/arch/prep/include/pmap.h4
-rw-r--r--sys/arch/prep/include/vmparam.h4
-rw-r--r--sys/arch/prep/prep/machdep.c10
4 files changed, 12 insertions, 12 deletions
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();