The branch main has been updated by andrew:
URL:
https://cgit.FreeBSD.org/src/commit/?id=e590c9eff81caf43592c075215cf8c9b3dc826c5
commit e590c9eff81caf43592c075215cf8c9b3dc826c5
Author: Andrew Turner <and...@freebsd.org>
AuthorDate: 2022-10-05 10:45:45 +0000
Commit: Andrew Turner <and...@freebsd.org>
CommitDate: 2022-10-06 13:30:18 +0000
Fix the options to build rk_usb2phy.c
We need to check for fdt rk_usb2phy on both sides of the '|'.
Sponsored by: The FreeBSD Foundation
---
sys/conf/files.arm64 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64
index 3a92f05bea63..f793bf9863af 100644
--- a/sys/conf/files.arm64
+++ b/sys/conf/files.arm64
@@ -582,7 +582,7 @@ arm64/rockchip/rk_pinctrl.c optional fdt
rk_pinctrl soc_rockchip_rk3328 | fdt
arm64/rockchip/rk_gpio.c optional fdt rk_gpio
soc_rockchip_rk3328 | fdt rk_gpio soc_rockchip_rk3399
arm64/rockchip/rk_iodomain.c optional fdt rk_iodomain
arm64/rockchip/rk_spi.c optional fdt rk_spi
-arm64/rockchip/rk_usb2phy.c optional fdt rk_usb2phy
soc_rockchip_rk3328 | soc_rockchip_rk3399
+arm64/rockchip/rk_usb2phy.c optional fdt rk_usb2phy
soc_rockchip_rk3328 | fdt rk_usb2phy soc_rockchip_rk3399
arm64/rockchip/rk_typec_phy.c optional fdt rk_typec_phy
soc_rockchip_rk3399
arm64/rockchip/if_dwc_rk.c optional fdt dwc_rk
soc_rockchip_rk3328 | fdt dwc_rk soc_rockchip_rk3399
arm64/rockchip/rk_tsadc_if.m optional fdt soc_rockchip_rk3399
