The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=ee2e56c6d7f604e7aab8a8414753951a5809a985
commit ee2e56c6d7f604e7aab8a8414753951a5809a985 Author: Emmanuel Vadot <[email protected]> AuthorDate: 2022-01-11 09:51:52 +0000 Commit: Emmanuel Vadot <[email protected]> CommitDate: 2022-02-21 16:29:04 +0000 armv7: allwinner: Make ext_resources non-optional The only valid condition for if_awg and aw_syscon is syscon. EXT_RESOURCES is enabled in GENERIC since 12-CURRENT. MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D33833 --- sys/arm/allwinner/files.allwinner | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm/allwinner/files.allwinner b/sys/arm/allwinner/files.allwinner index 57e27a962ec0..40775ac3212b 100644 --- a/sys/arm/allwinner/files.allwinner +++ b/sys/arm/allwinner/files.allwinner @@ -14,13 +14,13 @@ arm/allwinner/aw_nmi.c standard arm/allwinner/aw_r_intc.c optional aw_r_intc arm/allwinner/aw_rsb.c optional rsb | p2wi arm/allwinner/aw_rtc.c optional aw_rtc -arm/allwinner/aw_syscon.c optional ext_resources syscon +arm/allwinner/aw_syscon.c optional syscon arm/allwinner/aw_ts.c optional aw_thermal arm/allwinner/aw_usbphy.c optional ehci | ohci arm/allwinner/aw_wdog.c optional aw_wdog arm/allwinner/axp209.c optional axp209 arm/allwinner/axp81x.c optional axp81x -arm/allwinner/if_awg.c optional awg ext_resources syscon +arm/allwinner/if_awg.c optional awg syscon arm/allwinner/if_emac.c optional emac arm/allwinner/sunxi_dma_if.m optional a10_dmac | a31_dmac dev/iicbus/twsi/a10_twsi.c optional twsi
