svn commit: r282715 - in head/sys: arm/allwinner/a20 arm/conf conf

[Andrew Turner]

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