Enable ARM_INTRNG on the pandaboard platform.

Differential Revision:	https://reviews.freebsd.org/D2048

diff --git a/sys/arm/conf/PANDABOARD b/sys/arm/conf/PANDABOARD
index d04b81a637fa00aae8f0395eb4df0983fb46313d..fe62e899365574896e18084f8130a0c5969692da 100644 (file)
--- 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 27ec5ff4bbe988305bffcc4da0a2877a22d463a5..02fc8a2d28a593c9a74ed3ff0bb2fe15519fea97 100644 (file)
--- 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 50072f2acfa33abcf63556d68bd830f3013f19f4..31a6a32eed7afe5dd1c0c2886e98e8e48183bab2 100644 (file)
--- 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