From owner-svn-src-head@freebsd.org Sun Oct 18 18:39:18 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 78522A18026; Sun, 18 Oct 2015 18:39:18 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 42F72144B; Sun, 18 Oct 2015 18:39:18 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9IIdHgu064078; Sun, 18 Oct 2015 18:39:17 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9IIdHOJ064075; Sun, 18 Oct 2015 18:39:17 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201510181839.t9IIdHOJ064075@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Sun, 18 Oct 2015 18:39:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r289532 - in head/sys/arm: conf ti ti/omap4 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Oct 2015 18:39:18 -0000 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