diff --git a/sys/arm/conf/GENERIC b/sys/arm/conf/GENERIC index 7394f3842d4..9607b16756e 100644 --- a/sys/arm/conf/GENERIC +++ b/sys/arm/conf/GENERIC @@ -272,5 +272,4 @@ makeoptions MODULES_EXTRA+="dtb/rpi" makeoptions MODULES_EXTRA+="dtb/zynq" # SOC-specific modules -makeoptions MODULES_EXTRA+="allwinner" makeoptions MODULES_EXTRA+="imx" diff --git a/sys/arm/conf/NOTES b/sys/arm/conf/NOTES index 920d721dc3b..0a5d34c3849 100644 --- a/sys/arm/conf/NOTES +++ b/sys/arm/conf/NOTES @@ -94,7 +94,6 @@ nodevice bnxt # Build SOC-specific modules... -makeoptions MODULES_EXTRA+="allwinner" makeoptions MODULES_EXTRA+="imx" # Build dtb files... diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 63a0b3260e6..9ec7c33465f 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -680,6 +680,7 @@ _irdma= irdma .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm" || \ ${MACHINE_CPUARCH} == "riscv" .if !empty(OPT_FDT) +_allwinner= allwinner _if_cgem= if_cgem .endif .endif @@ -713,7 +714,6 @@ _hyperv= hyperv _vf_i2c= vf_i2c .if !empty(OPT_FDT) -_allwinner= allwinner _dwwdt= dwwdt _enetc= enetc _felix= felix