From 375d797b81916eb3d16927c9dac8c42975784252 Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Thu, 4 Feb 2021 19:14:12 -0500
Subject: [PATCH] Enable pvscsi and vmx in arm64 GENERIC

FreeBSD pvscsi and vmx work with VMware ESXi Arm "Fling"; provide these
in GENERIC for a convenient out-of-the-box experience.

PR:		253202
Reported by:	Vincent Milum Jr
MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
---
 sys/arm64/conf/GENERIC | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys/arm64/conf/GENERIC b/sys/arm64/conf/GENERIC
index 59f89555dd8..5eb0a270f00 100644
--- a/sys/arm64/conf/GENERIC
+++ b/sys/arm64/conf/GENERIC
@@ -159,6 +159,7 @@ options 	PCI_IOV		# PCI SR-IOV support
 device		ahci
 device		scbus
 device		da
+device		pvscsi			# VMware PVSCSI
 
 # ATA/SCSI peripherals
 device		cd		# CD
@@ -272,6 +273,7 @@ device		pl011
 device		iflib
 device		em			# Intel PRO/1000 Gigabit Ethernet Family
 device		ix			# Intel 10Gb Ethernet Family
+device		vmx			# VMware VMXNET3 Ethernet
 
 # Ethernet NICs
 device		mdio