diff options
| author | Dale Rahn <drahn@cvs.openbsd.org> | 2004-02-06 17:30:39 +0000 |
|---|---|---|
| committer | Dale Rahn <drahn@cvs.openbsd.org> | 2004-02-06 17:30:39 +0000 |
| commit | 38741d28af47236ca3c1fb8a326ae5d188b23cf9 (patch) | |
| tree | c6d1105765418360ee06e38a34551b55c88b0e28 /sys/arch/arm/include | |
| parent | c5942e029b0bae37f8efbc675f71aa91d28eef0a (diff) | |
fix machine/machine_arch, machine_arch should be arm for all arm systems
and machine needs to be not set by arch/arm, but by cats.
Diffstat (limited to 'sys/arch/arm/include')
| -rw-r--r-- | sys/arch/arm/include/param.h | 35 |
1 files changed, 6 insertions, 29 deletions
diff --git a/sys/arch/arm/include/param.h b/sys/arch/arm/include/param.h index 72926990653..d5e3e304d2a 100644 --- a/sys/arch/arm/include/param.h +++ b/sys/arch/arm/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.1 2004/02/01 05:09:49 drahn Exp $ */ +/* $OpenBSD: param.h,v 1.2 2004/02/06 17:30:38 drahn Exp $ */ /* $NetBSD: param.h,v 1.9 2002/03/24 03:37:23 thorpej Exp $ */ /* @@ -33,9 +33,11 @@ * SUCH DAMAGE. */ -#ifndef _ARM_ARM_PARAM_H_ -#define _ARM_ARM_PARAM_H_ +#ifndef _ARM_PARAM_H_ +#define _ARM_PARAM_H_ +#define MACHINE_ARCH "arm" +#define _MACHINE_ARCH arm /* * Machine dependent constants for ARM6+ processors @@ -134,31 +136,6 @@ void delay __P((unsigned)); * If ELF, MACHINE and MACHINE_ARCH are forced to "arm/armeb". */ -#if defined(_KERNEL) -#ifndef MACHINE_ARCH /* XXX For now */ -#ifndef __ARMEB__ -#define _MACHINE_ARCH arm -#define MACHINE_ARCH "arm" -#else -#define _MACHINE_ARCH armeb -#define MACHINE_ARCH "armeb" -#endif /* __ARMEB__ */ -#endif /* MACHINE_ARCH */ -#elif defined(__ELF__) -#undef _MACHINE -#undef MACHINE -#undef _MACHINE_ARCH -#undef MACHINE_ARCH -#define _MACHINE arm -#define MACHINE "arm" -#ifndef __ARMEB__ -#define _MACHINE_ARCH arm -#define MACHINE_ARCH "arm" -#else -#define _MACHINE_ARCH armeb -#define MACHINE_ARCH "armeb" -#endif /* __ARMEB__ */ -#endif /* __ELF__ */ #define MID_MACHINE MID_ARM6 @@ -238,4 +215,4 @@ void delay __P((unsigned)); #endif #endif -#endif /* _ARM_ARM_PARAM_H_ */ +#endif /* _ARM_PARAM_H_ */ |