svn commit: r346793 - in stable/12/sys: arm64/conf modules

[Colin Percival]

Author: cperciva
Date: Sat Apr 27 19:48:15 2019
New Revision: 346793
URL: https://svnweb.freebsd.org/changeset/base/346793

Log:
  MFC r345407,r345408: Add nvme to arm64 GENERIC, and build if_ena on arm64.
  
  These allow stable/12 to boot on Amazon EC2 "A1" family (arm64) instances.
  
  Sponsored by:	https://www.patreon.com/cperciva

Modified:
  stable/12/sys/arm64/conf/GENERIC
  stable/12/sys/modules/Makefile
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/arm64/conf/GENERIC
==============================================================================
--- stable/12/sys/arm64/conf/GENERIC	Sat Apr 27 19:45:33 2019	(r346792)
+++ stable/12/sys/arm64/conf/GENERIC	Sat Apr 27 19:48:15 2019	(r346793)
@@ -151,6 +151,11 @@ device		da
 # ATA/SCSI peripherals
 device		pass		# Passthrough device (direct ATA/SCSI access)
 
+# NVM Express (NVMe) support
+device		nvme		# base NVMe driver
+options 	NVME_USE_NVD=0	# prefer the cam(4) based nda(4) driver
+device		nvd		# expose NVMe namespaces as disks, depends on nvme
+
 # MMC/SD/SDIO Card slot support
 device		sdhci
 device		sdhci_xenon		# Marvell Xenon SD/MMC controller

Modified: stable/12/sys/modules/Makefile
==============================================================================
--- stable/12/sys/modules/Makefile	Sat Apr 27 19:45:33 2019	(r346792)
+++ stable/12/sys/modules/Makefile	Sat Apr 27 19:48:15 2019	(r346793)
@@ -496,6 +496,7 @@ SUBDIR+=	fdt
     ${MACHINE_CPUARCH} == "i386"
 SUBDIR+=	linprocfs
 SUBDIR+=	linsysfs
+_ena=		ena
 .endif
 
 .if ${MK_NAND} != "no" || defined(ALL_MODULES)
@@ -600,7 +601,6 @@ _drm2=		drm2
 .endif
 _ed=		ed
 _em=		em
-_ena=		ena
 _ep=		ep
 _et=		et
 _exca=		exca