From owner-svn-src-head@FreeBSD.ORG Sun May 10 09:33:05 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 11855FE5; Sun, 10 May 2015 09:33:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 F36DF170B; Sun, 10 May 2015 09:33:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4A9X46H016654; Sun, 10 May 2015 09:33:04 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4A9X4O7016651; Sun, 10 May 2015 09:33:04 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201505100933.t4A9X4O7016651@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Sun, 10 May 2015 09:33:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r282715 - in head/sys: arm/allwinner/a20 arm/conf conf 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, 10 May 2015 09:33:05 -0000 Author: andrew Date: Sun May 10 09:33:03 2015 New Revision: 282715 URL: https://svnweb.freebsd.org/changeset/base/282715 Log: Add the gic to files.arm under "device gic" and use it with the CUBIEBOARD2 config. This is common across a few SoCs so should be a common option. Modified: head/sys/arm/allwinner/a20/files.a20 head/sys/arm/conf/CUBIEBOARD2 head/sys/conf/files.arm Modified: head/sys/arm/allwinner/a20/files.a20 ============================================================================== --- head/sys/arm/allwinner/a20/files.a20 Sun May 10 09:23:49 2015 (r282714) +++ head/sys/arm/allwinner/a20/files.a20 Sun May 10 09:33:03 2015 (r282715) @@ -1,5 +1,3 @@ # $FreeBSD$ -arm/arm/gic.c standard - arm/allwinner/a20/a20_mp.c optional smp Modified: head/sys/arm/conf/CUBIEBOARD2 ============================================================================== --- head/sys/arm/conf/CUBIEBOARD2 Sun May 10 09:23:49 2015 (r282714) +++ head/sys/arm/conf/CUBIEBOARD2 Sun May 10 09:33:03 2015 (r282715) @@ -53,6 +53,9 @@ options WITNESS_SKIPSPIN # Don't run wi # Boot device is 2nd slice on MMC/SD card options ROOTDEVNAME=\"ufs:/dev/da0s2\" +# Interrupt controller +device gic + # MMC/SD/SDIO Card slot support #device mmc # mmc/sd bus #device mmcsd # mmc/sd flash cards Modified: head/sys/conf/files.arm ============================================================================== --- head/sys/conf/files.arm Sun May 10 09:23:49 2015 (r282714) +++ head/sys/conf/files.arm Sun May 10 09:33:03 2015 (r282715) @@ -37,6 +37,7 @@ arm/arm/fiq.c standard arm/arm/fiq_subr.S standard arm/arm/fusu.S standard arm/arm/gdb_machdep.c optional gdb +arm/arm/gic.c optional gic arm/arm/identcpu.c standard arm/arm/in_cksum.c optional inet | inet6 arm/arm/in_cksum_arm.S optional inet | inet6