The branch main has been updated by manu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=3b721b44955af8f915a6974b1012a5089c6a48ca
commit 3b721b44955af8f915a6974b1012a5089c6a48ca
Author: Emmanuel Vadot <m...@freebsd.org>
AuthorDate: 2021-02-04 14:40:54 +0000
Commit: Emmanuel Vadot <m...@freebsd.org>
CommitDate: 2021-02-10 20:15:50 +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 5eb0a270f006..bb790a1b6df9 100644
--- a/sys/arm64/conf/GENERIC
+++ b/sys/arm64/conf/GENERIC
@@ -125,6 +125,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
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
