Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 10 May 2015 09:37:55 +0000 (UTC)
From:      Andrew Turner <andrew@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r282717 - in head/sys/arm: conf qemu
Message-ID:  <201505100937.t4A9btxU017379@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: andrew
Date: Sun May 10 09:37:54 2015
New Revision: 282717
URL: https://svnweb.freebsd.org/changeset/base/282717

Log:
  Use the new gic option. While here remove extra whitespace from the ned of
  a few lines.

Modified:
  head/sys/arm/conf/VIRT
  head/sys/arm/qemu/files.qemu

Modified: head/sys/arm/conf/VIRT
==============================================================================
--- head/sys/arm/conf/VIRT	Sun May 10 09:33:15 2015	(r282716)
+++ head/sys/arm/conf/VIRT	Sun May 10 09:37:54 2015	(r282717)
@@ -43,6 +43,9 @@ options 	INVARIANT_SUPPORT	# Extra sanit
 #options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
 #options 	DIAGNOSTIC
 
+# Interrupt controller
+device		gic
+
 device		bpf
 device		loop
 device		ether
@@ -52,9 +55,9 @@ device		snp
 device		pl011
 device		psci
 
-device		virtio                                                                                                                                           
-device		virtio_mmio                                                                                                                                      
-device		virtio_blk                                                                                                                                       
+device		virtio
+device		virtio_mmio
+device		virtio_blk
 device		vtnet
 
 device		md

Modified: head/sys/arm/qemu/files.qemu
==============================================================================
--- head/sys/arm/qemu/files.qemu	Sun May 10 09:33:15 2015	(r282716)
+++ head/sys/arm/qemu/files.qemu	Sun May 10 09:37:54 2015	(r282717)
@@ -10,7 +10,6 @@ kern/kern_clocksource.c			standard
 #
 # Standard qemu virt devices and support.
 #
-arm/arm/gic.c				standard
 arm/arm/generic_timer.c			standard
 arm/qemu/virt_common.c			standard
 arm/qemu/virt_machdep.c			standard



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505100937.t4A9btxU017379>