svn commit: r324549 - head/sys/arm/conf

[Bjoern A. Zeeb]

Author: bz
Date: Thu Oct 12 14:32:45 2017
New Revision: 324549
URL: https://svnweb.freebsd.org/changeset/base/324549

Log:
  Previously there was a VIRT kernel to which I had added these options.
  With that gone they need to go into GENERIC now.
  
  Makes FreeBSD/arm usable on gem5 by default.
  
  Reviewed by:		andrew
  Differential Revision:	https://reviews.freebsd.org/D12566

Modified:
  head/sys/arm/conf/GENERIC

Modified: head/sys/arm/conf/GENERIC
==============================================================================
--- head/sys/arm/conf/GENERIC	Thu Oct 12 14:08:55 2017	(r324548)
+++ head/sys/arm/conf/GENERIC	Thu Oct 12 14:32:45 2017	(r324549)
@@ -99,6 +99,7 @@ device		ahci			# AHCI-compatible SATA controllers
 # PCI
 options 	NEW_PCIB
 device		pci
+device		pci_host_generic
 
 # PCI NICs
 device		re			# RealTek 8139C+/8169/8169S/8110S
@@ -106,6 +107,7 @@ device		re			# RealTek 8139C+/8169/8169S/8110S
 # VirtIO
 device		virtio
 device		virtio_mmio
+device		virtio_pci
 device		virtio_blk
 device		vtnet