diff options
| author | ian <ian@FreeBSD.org> | 2015-10-18 18:39:16 +0000 |
|---|---|---|
| committer | ian <ian@FreeBSD.org> | 2015-10-18 18:39:16 +0000 |
| commit | fbeda1e06d2489d7521e1a679200cd7ae0f59a8e (patch) | |
| tree | 5c99d3e784ac5f2dd52bbda03a94bf32aaec6d4e /sys/arm | |
| parent | 14f613391579f707498faa0327abbbdbe979a1bb (diff) | |
| download | FreeBSD-src-fbeda1e06d2489d7521e1a679200cd7ae0f59a8e.zip FreeBSD-src-fbeda1e06d2489d7521e1a679200cd7ae0f59a8e.tar.gz | |
Enable ARM_INTRNG on the pandaboard platform.
Differential Revision: https://reviews.freebsd.org/D2048
Diffstat (limited to 'sys/arm')
| -rw-r--r-- | sys/arm/conf/PANDABOARD | 2 | ||||
| -rw-r--r-- | sys/arm/ti/omap4/std.omap4 | 4 | ||||
| -rw-r--r-- | sys/arm/ti/ti_common.c | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/sys/arm/conf/PANDABOARD b/sys/arm/conf/PANDABOARD index d04b81a..fe62e89 100644 --- a/sys/arm/conf/PANDABOARD +++ b/sys/arm/conf/PANDABOARD @@ -30,6 +30,8 @@ hints "PANDABOARD.hints" include "std.armv6" include "../ti/omap4/pandaboard/std.pandaboard" +options ARM_INTRNG # new interrupt framework + options HZ=100 options SCHED_ULE # ULE scheduler options PLATFORM diff --git a/sys/arm/ti/omap4/std.omap4 b/sys/arm/ti/omap4/std.omap4 index 27ec5ff..02fc8a2 100644 --- a/sys/arm/ti/omap4/std.omap4 +++ b/sys/arm/ti/omap4/std.omap4 @@ -17,7 +17,3 @@ makeoptions KERNVIRTADDR=0xc0200000 options SOC_OMAP4 options ARM_L2_PIPT - -options IPI_IRQ_START=0 -options IPI_IRQ_END=15 - diff --git a/sys/arm/ti/ti_common.c b/sys/arm/ti/ti_common.c index 50072f2..31a6a32 100644 --- a/sys/arm/ti/ti_common.c +++ b/sys/arm/ti/ti_common.c @@ -70,7 +70,7 @@ fdt_aintc_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig, #endif fdt_pic_decode_t fdt_pic_table[] = { -#ifdef SOC_OMAP4 +#if defined(SOC_OMAP4) && !defined(ARM_INTRNG) &gic_decode_fdt, #endif #ifdef SOC_TI_AM335X |
