git: 87eac7608343 - stable/13 - Enable pvscsi and vmx in arm64 GENERIC

[Ed Maste]

The branch stable/13 has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=87eac7608343d86f2d33d15139ca467565bd7623

commit 87eac7608343d86f2d33d15139ca467565bd7623
Author:     Ed Maste <emaste at FreeBSD.org>
AuthorDate: 2021-02-05 00:14:12 +0000
Commit:     Ed Maste <emaste at FreeBSD.org>
CommitDate: 2021-02-08 00:47:23 +0000

    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
    Sponsored by:   The FreeBSD Foundation
    
    (cherry picked from commit 375d797b81916eb3d16927c9dac8c42975784252)
---
 sys/arm64/conf/GENERIC | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys/arm64/conf/GENERIC b/sys/arm64/conf/GENERIC
index 3be3b5e7b706..43d891eb4ccd 100644
--- a/sys/arm64/conf/GENERIC
+++ b/sys/arm64/conf/GENERIC
@@ -147,6 +147,7 @@ options 	PCI_IOV		# PCI SR-IOV support
 device		ahci
 device		scbus
 device		da
+device		pvscsi			# VMware PVSCSI
 
 # ATA/SCSI peripherals
 device		cd		# CD
@@ -260,6 +261,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