diff options
author | andrew <andrew@FreeBSD.org> | 2015-05-10 09:33:03 +0000 |
---|---|---|
committer | andrew <andrew@FreeBSD.org> | 2015-05-10 09:33:03 +0000 |
commit | 599ec55705413d440b32d892a5418638d4c6b207 (patch) | |
tree | 4e178aebe8bff257c7db51d3e2707e1679a9657e | |
parent | dc69de53bf242232ae51673bc4da7393c7a2b6ce (diff) | |
download | FreeBSD-src-599ec55705413d440b32d892a5418638d4c6b207.zip FreeBSD-src-599ec55705413d440b32d892a5418638d4c6b207.tar.gz |
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.
-rw-r--r-- | sys/arm/allwinner/a20/files.a20 | 2 | ||||
-rw-r--r-- | sys/arm/conf/CUBIEBOARD2 | 3 | ||||
-rw-r--r-- | sys/conf/files.arm | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/sys/arm/allwinner/a20/files.a20 b/sys/arm/allwinner/a20/files.a20 index f8d8f6f..25fd880 100644 --- a/sys/arm/allwinner/a20/files.a20 +++ b/sys/arm/allwinner/a20/files.a20 @@ -1,5 +1,3 @@ # $FreeBSD$ -arm/arm/gic.c standard - arm/allwinner/a20/a20_mp.c optional smp diff --git a/sys/arm/conf/CUBIEBOARD2 b/sys/arm/conf/CUBIEBOARD2 index 45311c3..40ac957 100644 --- a/sys/arm/conf/CUBIEBOARD2 +++ b/sys/arm/conf/CUBIEBOARD2 @@ -53,6 +53,9 @@ options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed # 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 diff --git a/sys/conf/files.arm b/sys/conf/files.arm index b40f7c9..a406d33 100644 --- a/sys/conf/files.arm +++ b/sys/conf/files.arm @@ -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 |