diff options
| author | Mitchell Horne <mhorne@FreeBSD.org> | 2025-10-20 23:06:26 +0000 |
|---|---|---|
| committer | Mitchell Horne <mhorne@FreeBSD.org> | 2025-10-20 23:37:13 +0000 |
| commit | 5aefe9f16f240696142894bdeabcebbb057c7053 (patch) | |
| tree | 218458aeab9eeef121634f200d8be08eab8fed03 | |
| parent | 5522519731b74e7b56c710ec5ea4d34065f3ed32 (diff) | |
arm: tweak imx module build logic
Add the subdirectory in the Makefile, not the config.
No functional change intended.
MFC after: 3 days
Sponsored by: The FreeBSD Foundation
| -rw-r--r-- | sys/arm/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/arm/conf/NOTES | 4 | ||||
| -rw-r--r-- | sys/modules/Makefile | 5 |
3 files changed, 5 insertions, 7 deletions
diff --git a/sys/arm/conf/GENERIC b/sys/arm/conf/GENERIC index 9607b16756ea..22bb75993834 100644 --- a/sys/arm/conf/GENERIC +++ b/sys/arm/conf/GENERIC @@ -270,6 +270,3 @@ makeoptions MODULES_EXTRA+="dtb/nvidia" makeoptions MODULES_EXTRA+="dtb/rockchip" makeoptions MODULES_EXTRA+="dtb/rpi" makeoptions MODULES_EXTRA+="dtb/zynq" - -# SOC-specific modules -makeoptions MODULES_EXTRA+="imx" diff --git a/sys/arm/conf/NOTES b/sys/arm/conf/NOTES index 0a5d34c3849a..2bd41d911124 100644 --- a/sys/arm/conf/NOTES +++ b/sys/arm/conf/NOTES @@ -92,10 +92,6 @@ nodevice mps nodevice bnxt -# Build SOC-specific modules... - -makeoptions MODULES_EXTRA+="imx" - # Build dtb files... makeoptions MODULES_EXTRA+="dtb/allwinner" diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 9ec7c33465f3..02ed6a0480e6 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -173,6 +173,7 @@ SUBDIR= \ iflib \ ${_igc} \ imgact_binmisc \ + ${_imx} \ ${_intelspi} \ ${_io} \ ${_ioat} \ @@ -721,6 +722,10 @@ _rockchip= rockchip .endif .endif +.if ${MACHINE_CPUARCH} == "arm" +_imx= imx +.endif + .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm" || \ ${MACHINE_CPUARCH} == "riscv" .if !empty(OPT_FDT) |