diff options
| author | Mitchell Horne <mhorne@FreeBSD.org> | 2024-09-18 17:19:16 +0000 |
|---|---|---|
| committer | Mitchell Horne <mhorne@FreeBSD.org> | 2025-10-20 23:37:13 +0000 |
| commit | 5522519731b74e7b56c710ec5ea4d34065f3ed32 (patch) | |
| tree | 34c21083c77eaa8b44889a6b446d2e1d5f3c332b | |
| parent | 3ed48eb085f7c4ae5c019ee882e694b432d43911 (diff) | |
modules: enable allwinner kmods on riscv
While here, standardize the place they are enabled in the Makefile. For
armv7 the module subdirectory was added explicitly in the config file,
but this is not idiomatic.
MFC after: 3 days
Sponsored by: The FreeBSD Foundation
| -rw-r--r-- | sys/arm/conf/GENERIC | 1 | ||||
| -rw-r--r-- | sys/arm/conf/NOTES | 1 | ||||
| -rw-r--r-- | sys/modules/Makefile | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/sys/arm/conf/GENERIC b/sys/arm/conf/GENERIC index 7394f3842d43..9607b16756ea 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 920d721dc3ba..0a5d34c3849a 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 63a0b3260e6d..9ec7c33465f3 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 |