svn commit: r287162 - in head/sys: arm64/conf conf

[Andrew Turner]

Author: andrew
Date: Wed Aug 26 11:36:23 2015
New Revision: 287162
URL: https://svnweb.freebsd.org/changeset/base/287162

Log:
  Add an option to select which SoCs we are building for. It is intended to
  be used with any SoC specific drivers, for example a ThunderX nic driver
  would use something like the following in files.arm64:
  
  arm64/cavium/thunder_nic.c optional soc_cavm_thunderx thndr_nic
  
  Reviewed by:	imp
  Sponsored by:	ABT Systems Ltd
  Differential Revision:	https://reviews.freebsd.org/D3479

Modified:
  head/sys/arm64/conf/GENERIC
  head/sys/conf/files.arm64
  head/sys/conf/options.arm64

Modified: head/sys/arm64/conf/GENERIC
==============================================================================
--- head/sys/arm64/conf/GENERIC	Wed Aug 26 10:54:14 2015	(r287161)
+++ head/sys/arm64/conf/GENERIC	Wed Aug 26 11:36:23 2015	(r287162)
@@ -84,6 +84,9 @@ options 	WITNESS			# Enable checks to de
 options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
 options 	MALLOC_DEBUG_MAXZONES=8	# Separate malloc(9) zones
 
+# SoC support
+options 	SOC_CAVM_THUNDERX
+
 # VirtIO support
 device		virtio
 device		virtio_mmio
@@ -92,7 +95,6 @@ device		vtnet
 
 # Bus drivers
 device		pci
-device		thunder_pci
 
 # Ethernet NICs
 device		em		# Intel PRO/1000 Gigabit Ethernet Family

Modified: head/sys/conf/files.arm64
==============================================================================
--- head/sys/conf/files.arm64	Wed Aug 26 10:54:14 2015	(r287161)
+++ head/sys/conf/files.arm64	Wed Aug 26 11:36:23 2015	(r287162)
@@ -50,9 +50,9 @@ arm64/arm64/uma_machdep.c	standard
 arm64/arm64/unwind.c		optional	ddb | kdtrace_hooks | stack
 arm64/arm64/vfp.c		standard
 arm64/arm64/vm_machdep.c	standard
-arm64/cavium/thunder_pcie.c	optional	thunder_pci fdt
-arm64/cavium/thunder_pcie_pem.c	optional	thunder_pci
-arm64/cavium/thunder_pcie_common.c	optional	thunder_pci
+arm64/cavium/thunder_pcie.c	optional	soc_cavm_thunderx pci fdt
+arm64/cavium/thunder_pcie_pem.c	optional	soc_cavm_thunderx pci
+arm64/cavium/thunder_pcie_common.c	optional soc_cavm_thunderx pci
 crypto/blowfish/bf_enc.c	optional	crypto | ipsec
 crypto/des/des_enc.c		optional	crypto | ipsec | netsmb
 dev/acpica/acpi_if.m		optional	acpi

Modified: head/sys/conf/options.arm64
==============================================================================
--- head/sys/conf/options.arm64	Wed Aug 26 10:54:14 2015	(r287161)
+++ head/sys/conf/options.arm64	Wed Aug 26 11:36:23 2015	(r287162)
@@ -5,3 +5,6 @@ SOCDEV_PA			opt_global.h
 SOCDEV_VA			opt_global.h
 THUNDERX_PASS_1_1_ERRATA	opt_global.h
 VFP				opt_global.h
+
+# SoC Support
+SOC_CAVM_THUNDERX		opt_soc.h