diff options
author | Miod Vallat <miod@cvs.openbsd.org> | 2011-09-20 22:02:14 +0000 |
---|---|---|
committer | Miod Vallat <miod@cvs.openbsd.org> | 2011-09-20 22:02:14 +0000 |
commit | 488065df1de76d41e2b7f88decd9744099653643 (patch) | |
tree | a4391c2e241e18ec8d7b19aa0858e18006b8d24c /sys/arch/palm | |
parent | 701d4c1371a08afa82267d8f66e4122fd525f274 (diff) |
Late spring cleaning of the arm code for old dusty bits we do not want to
keep:
- remove bootconfig parameter passing feature (unused).
- unifdef __PROG32 and remove all remains of arm26 code.
- remove ARMFPE support (unused).
- remove support for ARM2, ARM2AS, ARM3, ARM6, ARM7, ARM7TDMI and StrongARM
processor families, and the related silicon bug workarounds (especially
the SA-110 STM^ bug).
- remove cpu_functions no longer necessary after previous removals.
- remove ARM32_DISABLE_ALIGNMENT_FAULTS option (unused).
- make FIQ support conditional on option FIQ (unused, but may be eventually).
Discussed with drahn@ and jasper@ long ago, I was sitting on this commit for
no good reason.
Diffstat (limited to 'sys/arch/palm')
-rw-r--r-- | sys/arch/palm/include/bootconfig.h | 15 | ||||
-rw-r--r-- | sys/arch/palm/palm/autoconf.c | 3 |
2 files changed, 4 insertions, 14 deletions
diff --git a/sys/arch/palm/include/bootconfig.h b/sys/arch/palm/include/bootconfig.h index 1250503f3d2..6e9e95dd59b 100644 --- a/sys/arch/palm/include/bootconfig.h +++ b/sys/arch/palm/include/bootconfig.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bootconfig.h,v 1.1 2009/09/05 01:22:11 marex Exp $ */ +/* $OpenBSD: bootconfig.h,v 1.2 2011/09/20 22:02:13 miod Exp $ */ /* $NetBSD: bootconfig.h,v 1.2 2001/06/21 22:08:28 chris Exp $ */ /* @@ -43,13 +43,13 @@ * Based on kate/boot/bootconfig.h */ +#if defined(_KERNEL) + typedef struct _PhysMem { u_int address; u_int pages; } PhysMem; -#if defined(_KERNEL) - #define DRAM_BLOCKS 1 typedef struct _BootConfig { @@ -60,15 +60,6 @@ typedef struct _BootConfig { extern BootConfig bootconfig; #define MAX_BOOT_STRING 255 -#define BOOTOPT_TYPE_BOOLEAN 0 -#define BOOTOPT_TYPE_STRING 1 -#define BOOTOPT_TYPE_INT 2 -#define BOOTOPT_TYPE_BININT 3 -#define BOOTOPT_TYPE_HEXINT 4 -#define BOOTOPT_TYPE_MASK 7 - -int get_bootconf_option (char *string, char *option, int type, void *result); - extern char *boot_args; extern char *boot_file; #endif /* _KERNEL */ diff --git a/sys/arch/palm/palm/autoconf.c b/sys/arch/palm/palm/autoconf.c index a47cc627c39..480a4e72b56 100644 --- a/sys/arch/palm/palm/autoconf.c +++ b/sys/arch/palm/palm/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.2 2010/11/28 20:44:20 miod Exp $ */ +/* $OpenBSD: autoconf.c,v 1.3 2011/09/20 22:02:13 miod Exp $ */ /* $NetBSD: autoconf.c,v 1.2 2001/09/05 16:17:36 matt Exp $ */ /* @@ -58,7 +58,6 @@ #include <dev/cons.h> struct device *bootdv = NULL; -extern char *boot_file; void dumpconf(void); |