diff --git a/sys/modules/Makefile b/sys/modules/Makefile --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -611,8 +611,10 @@ .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm" || \ ${MACHINE_CPUARCH} == "riscv" +.if !empty(OPT_FDT) _if_cgem= if_cgem .endif +.endif # These rely on 64bit atomics .if ${MACHINE_ARCH} != "powerpc" && ${MACHINE_ARCH} != "powerpcspe" @@ -638,18 +640,23 @@ .endif .if ${MACHINE_CPUARCH} == "aarch64" -_allwinner= allwinner _armv8crypto= armv8crypto _dpaa2= dpaa2 -_dwwdt= dwwdt _em= em + +.if !empty(OPT_FDT) +_allwinner= allwinner +_dwwdt= dwwdt _enetc= enetc _felix= felix _rockchip= rockchip .endif +.endif .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm" +.if !empty(OPT_FDT) _sdhci_fdt= sdhci_fdt +.endif _e6000sw= e6000sw _neta= neta _hyperv= hyperv diff --git a/sys/modules/uart/Makefile b/sys/modules/uart/Makefile --- a/sys/modules/uart/Makefile +++ b/sys/modules/uart/Makefile @@ -24,8 +24,10 @@ .if ${MACHINE} == "arm64" uart_dev_mvebu=uart_dev_mvebu.c +.if !empty(OPT_FDT) uart_dev_mu=uart_dev_mu.c .endif +.endif KMOD= uart SRCS= ${uart_bus_acpi} uart_bus_isa.c \