Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm/cortex Make this compile where gtmr isn't used.



details:   https://anonhg.NetBSD.org/src/rev/cf4c5e813ff4
branches:  trunk
changeset: 806553:cf4c5e813ff4
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sat Feb 28 15:45:12 2015 +0000

description:
Make this compile where gtmr isn't used.

diffstat:

 sys/arch/arm/cortex/armperiph.c |  5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diffs (32 lines):

diff -r 35feeb7b5bc5 -r cf4c5e813ff4 sys/arch/arm/cortex/armperiph.c
--- a/sys/arch/arm/cortex/armperiph.c   Sat Feb 28 15:21:07 2015 +0000
+++ b/sys/arch/arm/cortex/armperiph.c   Sat Feb 28 15:45:12 2015 +0000
@@ -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 @@
 
 #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 @@
                        .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);
        }



Home | Main Index | Thread Index | Old Index