diff options
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/hp300/conf/files.hp300 | 20 | ||||
| -rw-r--r-- | sys/arch/hp300/dev/hd.c | 4 | ||||
| -rw-r--r-- | sys/arch/hp300/dev/if_le.c | 3 | ||||
| -rw-r--r-- | sys/arch/hp300/dev/sd.c | 4 | ||||
| -rw-r--r-- | sys/arch/hp300/hp300/locore.s | 5 | ||||
| -rw-r--r-- | sys/arch/hp300/hp300/machdep.c | 4 | ||||
| -rw-r--r-- | sys/arch/hp300/include/hp300spu.h | 21 |
7 files changed, 9 insertions, 52 deletions
diff --git a/sys/arch/hp300/conf/files.hp300 b/sys/arch/hp300/conf/files.hp300 index 6dfa433d0ac..5ea840bbe7e 100644 --- a/sys/arch/hp300/conf/files.hp300 +++ b/sys/arch/hp300/conf/files.hp300 @@ -1,4 +1,4 @@ -# $OpenBSD: files.hp300,v 1.14 2001/05/11 07:55:33 deraadt Exp $ +# $OpenBSD: files.hp300,v 1.15 2001/08/26 00:15:33 miod Exp $ # $NetBSD: files.hp300,v 1.28 1997/05/12 08:23:28 thorpej Exp $ # # hp300-specific configuration info @@ -8,24 +8,6 @@ maxpartitions 16 maxusers 2 8 64 -# SPU configuration options. -defopt HP320 -defopt HP330 -defopt HP340 -defopt HP345 -defopt HP350 -defopt HP360 -defopt HP370 -defopt HP375 -defopt HP380 -defopt HP385 -defopt HP400 -defopt HP425 -defopt HP433 - -# Misc. options. -defopt USELEDS # make the lights twinkle - # NOTE! The order of these lines is significant! Don't change them # unless you absolutely know what you're doing! diff --git a/sys/arch/hp300/dev/hd.c b/sys/arch/hp300/dev/hd.c index d6d2501afff..e607f116233 100644 --- a/sys/arch/hp300/dev/hd.c +++ b/sys/arch/hp300/dev/hd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hd.c,v 1.12 2001/05/01 16:51:09 millert Exp $ */ +/* $OpenBSD: hd.c,v 1.13 2001/08/26 00:15:36 miod Exp $ */ /* $NetBSD: rd.c,v 1.33 1997/07/10 18:14:08 kleink Exp $ */ /* @@ -67,8 +67,6 @@ #include <hp300/dev/hdreg.h> #include <hp300/dev/hdvar.h> -#include "opt_useleds.h" - #ifdef USELEDS #include <hp300/hp300/leds.h> #endif diff --git a/sys/arch/hp300/dev/if_le.c b/sys/arch/hp300/dev/if_le.c index faac9aff311..af6d92831e4 100644 --- a/sys/arch/hp300/dev/if_le.c +++ b/sys/arch/hp300/dev/if_le.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le.c,v 1.12 1998/09/16 22:41:17 jason Exp $ */ +/* $OpenBSD: if_le.c,v 1.13 2001/08/26 00:15:37 miod Exp $ */ /* $NetBSD: if_le.c,v 1.43 1997/05/05 21:05:32 thorpej Exp $ */ /*- @@ -71,7 +71,6 @@ #include <hp300/dev/if_lereg.h> #include <hp300/dev/if_levar.h> -#include "opt_useleds.h" #ifdef USELEDS #include <hp300/hp300/leds.h> #endif diff --git a/sys/arch/hp300/dev/sd.c b/sys/arch/hp300/dev/sd.c index f9a29d42c37..74fa53ad8b9 100644 --- a/sys/arch/hp300/dev/sd.c +++ b/sys/arch/hp300/dev/sd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sd.c,v 1.22 2001/05/31 10:22:35 art Exp $ */ +/* $OpenBSD: sd.c,v 1.23 2001/08/26 00:15:37 miod Exp $ */ /* $NetBSD: sd.c,v 1.34 1997/07/10 18:14:10 kleink Exp $ */ /* @@ -62,8 +62,6 @@ #include <hp300/dev/scsivar.h> #include <hp300/dev/sdvar.h> -#include "opt_useleds.h" - #ifdef USELEDS #include <hp300/hp300/leds.h> #endif diff --git a/sys/arch/hp300/hp300/locore.s b/sys/arch/hp300/hp300/locore.s index 9c0c9dd22df..e6a0e0ddd74 100644 --- a/sys/arch/hp300/hp300/locore.s +++ b/sys/arch/hp300/hp300/locore.s @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.s,v 1.29 2001/08/25 16:16:03 miod Exp $ */ +/* $OpenBSD: locore.s,v 1.30 2001/08/26 00:15:37 miod Exp $ */ /* $NetBSD: locore.s,v 1.91 1998/11/11 06:41:25 thorpej Exp $ */ /* @@ -78,7 +78,6 @@ #include <machine/trap.h> #include "ksyms.h" -#include "opt_useleds.h" #ifdef USELEDS #include <hp300/hp300/leds.h> #endif @@ -100,7 +99,7 @@ GLOBAL(kernel_text) /* * Temporary stack for a variety of purposes. - * Try and make this the first thing is the data segment so it + * Try and make this the first thing in the data segment so it * is page aligned. Note that if we overflow here, we run into * our text segment. */ diff --git a/sys/arch/hp300/hp300/machdep.c b/sys/arch/hp300/hp300/machdep.c index d87d827bb76..435ee80dfc7 100644 --- a/sys/arch/hp300/hp300/machdep.c +++ b/sys/arch/hp300/hp300/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.61 2001/08/25 16:15:15 miod Exp $ */ +/* $OpenBSD: machdep.c,v 1.62 2001/08/26 00:15:37 miod Exp $ */ /* $NetBSD: machdep.c,v 1.121 1999/03/26 23:41:29 mycroft Exp $ */ /* @@ -103,8 +103,6 @@ #include <uvm/uvm_extern.h> -#include "opt_useleds.h" - #include <arch/hp300/dev/hilreg.h> #include <arch/hp300/dev/hilioctl.h> #include <arch/hp300/dev/hilvar.h> diff --git a/sys/arch/hp300/include/hp300spu.h b/sys/arch/hp300/include/hp300spu.h index 944f09506c3..5b81e18b1a3 100644 --- a/sys/arch/hp300/include/hp300spu.h +++ b/sys/arch/hp300/include/hp300spu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: hp300spu.h,v 1.3 1998/05/10 11:31:56 downsj Exp $ */ +/* $OpenBSD: hp300spu.h,v 1.4 2001/08/26 00:15:37 miod Exp $ */ /* $NetBSD: hp300spu.h,v 1.2 1997/05/01 05:26:48 thorpej Exp $ */ /*- @@ -83,27 +83,10 @@ extern int mmuid; /* MMU id */ /* * This section associates hp300 model configurations with certain - * combindations of CPU, MMU, and cache. + * combinations of CPU, MMU, and cache. */ /* - * Pull in user-defined SPU configuration options. - */ -#include "opt_hp320.h" -#include "opt_hp330.h" -#include "opt_hp340.h" -#include "opt_hp345.h" -#include "opt_hp350.h" -#include "opt_hp360.h" -#include "opt_hp370.h" -#include "opt_hp375.h" -#include "opt_hp380.h" -#include "opt_hp385.h" -#include "opt_hp400.h" -#include "opt_hp425.h" -#include "opt_hp433.h" - -/* * CPU configuration. */ #if defined(HP320) || defined(HP330) || defined(HP350) |