From 84b439beea28b4d92a4e44efd09154310495f1dd Mon Sep 17 00:00:00 2001
From: bz <bz@FreeBSD.org>
Date: Thu, 12 Oct 2017 14:32:45 +0000
Subject: [PATCH] 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
---
 sys/arm/conf/GENERIC | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys/arm/conf/GENERIC b/sys/arm/conf/GENERIC
index abf16fda7ebd..c272e6e6f551 100644
--- a/sys/arm/conf/GENERIC
+++ b/sys/arm/conf/GENERIC
@@ -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