git: 7b6068eec1e0 - stable/13 - arm64: Add a SOC_BRCM_NS2 option

[Emmanuel Vadot]

The branch stable/13 has been updated by manu:

URL: https://cgit.FreeBSD.org/src/commit/?id=7b6068eec1e01286b63f8c95d193e7c998f275a7

commit 7b6068eec1e01286b63f8c95d193e7c998f275a7
Author:     Emmanuel Vadot <manu at FreeBSD.org>
AuthorDate: 2021-02-04 14:40:54 +0000
Commit:     Emmanuel Vadot <manu at FreeBSD.org>
CommitDate: 2021-02-19 18:03:56 +0000

    arm64: Add a SOC_BRCM_NS2 option
    
    Only compile files needed for this platform if the option is enabled in the
    kernel config file.
    Add the option to GENERIC.
    
    MFC after:      3 days
---
 sys/arm64/conf/GENERIC | 1 +
 sys/conf/files.arm64   | 6 +++---
 sys/conf/options.arm64 | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/sys/arm64/conf/GENERIC b/sys/arm64/conf/GENERIC
index 43d891eb4ccd..7f0b6b84ad41 100644
--- a/sys/arm64/conf/GENERIC
+++ b/sys/arm64/conf/GENERIC
@@ -113,6 +113,7 @@ options 	SOC_HISI_HI6220
 options 	SOC_INTEL_STRATIX10
 options 	SOC_BRCM_BCM2837
 options 	SOC_BRCM_BCM2838
+options 	SOC_BRCM_NS2
 options 	SOC_MARVELL_8K
 options 	SOC_NVIDIA_TEGRA210
 options		SOC_NXP_LS
diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64
index 5c9cc1ca7b76..c01fa64133d2 100644
--- a/sys/conf/files.arm64
+++ b/sys/conf/files.arm64
@@ -349,9 +349,9 @@ arm/annapurna/alpine/alpine_serdes.c		optional al_serdes fdt		\
 	compile-with "${CC} -c -o ${.TARGET} ${CFLAGS} -I$S/contrib/alpine-hal -I$S/contrib/alpine-hal/eth ${PROF} ${.IMPSRC}"
 
 # Broadcom
-arm64/broadcom/brcmmdio/mdio_mux_iproc.c		optional fdt
-arm64/broadcom/brcmmdio/mdio_nexus_iproc.c		optional fdt
-arm64/broadcom/brcmmdio/mdio_ns2_pcie_phy.c		optional fdt pci
+arm64/broadcom/brcmmdio/mdio_mux_iproc.c		optional soc_brcm_ns2 fdt
+arm64/broadcom/brcmmdio/mdio_nexus_iproc.c		optional soc_brcm_ns2 fdt
+arm64/broadcom/brcmmdio/mdio_ns2_pcie_phy.c		optional soc_brcm_ns2 fdt pci
 arm64/broadcom/genet/if_genet.c				optional SOC_BRCM_BCM2838 fdt genet
 arm/broadcom/bcm2835/bcm2835_audio.c			optional sound vchiq fdt \
 	compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq"
diff --git a/sys/conf/options.arm64 b/sys/conf/options.arm64
index 24e34c1e3b6a..5a97fd6b3ef6 100644
--- a/sys/conf/options.arm64
+++ b/sys/conf/options.arm64
@@ -21,6 +21,7 @@ SOC_ALLWINNER_H5		opt_soc.h
 SOC_ALLWINNER_H6		opt_soc.h
 SOC_BRCM_BCM2837		opt_soc.h
 SOC_BRCM_BCM2838		opt_soc.h
+SOC_BRCM_NS2			opt_soc.h
 SOC_CAVM_THUNDERX		opt_soc.h
 SOC_FREESCALE_IMX8		opt_soc.h
 SOC_HISI_HI6220			opt_soc.h