Module Name: src
Committed By: skrll
Date: Sat Feb 28 15:45:12 UTC 2015
Modified Files:
src/sys/arch/arm/cortex: armperiph.c
Log Message:
Make this compile where gtmr isn't used.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/cortex/armperiph.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/cortex/armperiph.c
diff -u src/sys/arch/arm/cortex/armperiph.c:1.8 src/sys/arch/arm/cortex/armperiph.c:1.9
--- src/sys/arch/arm/cortex/armperiph.c:1.8 Sat Feb 28 09:34:35 2015
+++ src/sys/arch/arm/cortex/armperiph.c Sat Feb 28 15:45:12 2015
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: armperiph.c,v 1.8 2015/02/28 09:34:35 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: armperiph.c,v 1.9 2015/02/28 15:45:12 skrll Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -40,6 +40,7 @@ __KERNEL_RCSID(1, "$NetBSD: armperiph.c,
#include <arm/mainbus/mainbus.h>
#include <arm/cortex/mpcore_var.h>
+#include <arm/cortex/gtmr_intr.h>
static int armperiph_match(device_t, cfdata_t, void *);
static void armperiph_attach(device_t, device_t, void *);
@@ -205,9 +206,11 @@ armperiph_attach(device_t parent, device
.mpcaa_off1 = cfg->cfg_devices[i].pi_off1,
.mpcaa_off2 = cfg->cfg_devices[i].pi_off2,
};
+#if defined(CPU_CORTEXA7) || defined(CPU_CORTEXA15)
if (strcmp(mpcaa.mpcaa_name, "armgtmr") == 0) {
mpcaa.mpcaa_irq = IRQ_GTMR_PPI_VTIMER;
}
+#endif
config_found(self, &mpcaa, NULL);
}
