Author: ian
Date: Sun Oct 18 18:39:16 2015
New Revision: 289532
URL: https://svnweb.freebsd.org/changeset/base/289532

Log:
  Enable ARM_INTRNG on the pandaboard platform.
  
  Differential Revision:        https://reviews.freebsd.org/D2048

Modified:
  head/sys/arm/conf/PANDABOARD
  head/sys/arm/ti/omap4/std.omap4
  head/sys/arm/ti/ti_common.c

Modified: head/sys/arm/conf/PANDABOARD
==============================================================================
--- head/sys/arm/conf/PANDABOARD        Sun Oct 18 18:32:22 2015        
(r289531)
+++ head/sys/arm/conf/PANDABOARD        Sun Oct 18 18:39:16 2015        
(r289532)
@@ -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

Modified: head/sys/arm/ti/omap4/std.omap4
==============================================================================
--- head/sys/arm/ti/omap4/std.omap4     Sun Oct 18 18:32:22 2015        
(r289531)
+++ head/sys/arm/ti/omap4/std.omap4     Sun Oct 18 18:39:16 2015        
(r289532)
@@ -17,7 +17,3 @@ makeoptions   KERNVIRTADDR=0xc0200000
 options                SOC_OMAP4
 
 options                ARM_L2_PIPT
-
-options                IPI_IRQ_START=0
-options                IPI_IRQ_END=15
-

Modified: head/sys/arm/ti/ti_common.c
==============================================================================
--- head/sys/arm/ti/ti_common.c Sun Oct 18 18:32:22 2015        (r289531)
+++ head/sys/arm/ti/ti_common.c Sun Oct 18 18:39:16 2015        (r289532)
@@ -70,7 +70,7 @@ fdt_aintc_decode_ic(phandle_t node, pcel
 #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
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to