diff options
| author | mrg <mrg@NetBSD.org> | 2017-07-24 09:56:45 +0000 |
|---|---|---|
| committer | mrg <mrg@NetBSD.org> | 2017-07-24 09:56:45 +0000 |
| commit | 1d3f88cf8377b59eb4e4d506cd260efa88b751ba (patch) | |
| tree | 752bd1458705b2c4bf7897cf92175a61bbc8e2bc /sys/arch/evbmips/include | |
| parent | f56918c9a6b2dd2a2781af703ec8bcc7a1317077 (diff) | |
mostly converted sbmips -> evbmips. the SBMIPS kernel builds fully
sans disksubr.c. intr.h does not need any additional fixes now,
only disklabel.h.
also test-built some other mips kernels.
Diffstat (limited to 'sys/arch/evbmips/include')
| -rw-r--r-- | sys/arch/evbmips/include/param.h | 4 | ||||
| -rw-r--r-- | sys/arch/evbmips/include/pci_machdep.h | 9 |
2 files changed, 10 insertions, 3 deletions
diff --git a/sys/arch/evbmips/include/param.h b/sys/arch/evbmips/include/param.h index e042fbe0261..fed210fd411 100644 --- a/sys/arch/evbmips/include/param.h +++ b/sys/arch/evbmips/include/param.h @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.9 2011/03/18 16:30:01 tsutsui Exp $ */ +/* $NetBSD: param.h,v 1.10 2017/07/24 09:56:45 mrg Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -55,7 +55,7 @@ #ifndef _LOCORE void delay(int n); -#define DELAY delay +#define DELAY(x) delay(x) #include <machine/intr.h> diff --git a/sys/arch/evbmips/include/pci_machdep.h b/sys/arch/evbmips/include/pci_machdep.h index bbdbb3fc6df..810c63ba0d3 100644 --- a/sys/arch/evbmips/include/pci_machdep.h +++ b/sys/arch/evbmips/include/pci_machdep.h @@ -1,6 +1,13 @@ -/* $NetBSD: pci_machdep.h,v 1.2 2002/03/18 10:10:15 simonb Exp $ */ +/* $NetBSD: pci_machdep.h,v 1.3 2017/07/24 09:56:45 mrg Exp $ */ +#ifdef _KERNEL_OPT +#include "opt_cputype.h" +#endif + +/* SB1 PCI isn't finished */ +#ifndef MIPS64_SB1 /* Before including <mips/pci_machdep.h> */ #define __HAVE_PCIIDE_MACHDEP_COMPAT_INTR_ESTABLISH +#endif #include <mips/pci_machdep.h> |
