git: 898aea3d847c - stable/15 - arm: tweak imx module build logic

The branch stable/15 has been updated by mhorne:

URL: https://cgit.FreeBSD.org/src/commit/?id=898aea3d847cbea7c7455dca202846cfbfef4956

commit 898aea3d847cbea7c7455dca202846cfbfef4956
Author:     Mitchell Horne <mhorne@FreeBSD.org>
AuthorDate: 2025-10-20 23:06:26 +0000
Commit:     Mitchell Horne <mhorne@FreeBSD.org>
CommitDate: 2025-10-23 18:31:32 +0000

    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
    
    (cherry picked from commit 5aefe9f16f240696142894bdeabcebbb057c7053)
---
 sys/arm/conf/GENERIC | 3 ---
 sys/arm/conf/NOTES   | 4 ----
 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 8584b2433671..cd91603d1421 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -173,6 +173,7 @@ SUBDIR=	\
 	iflib \
 	${_igc} \
 	imgact_binmisc \
+	${_imx} \
 	${_intelspi} \
 	${_io} \
 	${_ioat} \
@@ -717,6 +718,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)