From nobody Thu Oct 23 18:37:33 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csvsV1S6Bz6DCH3; Thu, 23 Oct 2025 18:37:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csvsT6Z6Xz429c; Thu, 23 Oct 2025 18:37:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761244653; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GrLys9LLMAeY1OAWan+le86rKmnRZhd4nnG/jrygyzA=; b=HLTWBsVB2SUtLld40CAT+jJ5oGirDg/oKWU+b4HXT1OROUYuaVudOCBp6d+GKXg1FBTnwp keHt1SuKdWjhmGz8x90dwqa+WJsop4d5RC22sbi0cPRm16D2EvYxgFsF7GACr2gU3fnfg+ Th344VOBiumqLXPe2+oMVRNBI24sNUxifyej+rqLuwii0BBkw6w7hd3IxF2N+GIIe1PNZf SKIx8Znq/1qxl8vEJuC7DPBIHGoYxAgvI3hvefnpFg9tNR92RTiuwa9vTFlSZ3Lj8MGq1M bT5vwbB0a3J1MShzWH1ywEeFIssfRbMsChuC9oDYdYB3v5tNMh7zAb21wZPdbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761244653; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GrLys9LLMAeY1OAWan+le86rKmnRZhd4nnG/jrygyzA=; b=Q8yb7rDfXQ/cEXicUV9K7oSlJoXMR+GGzds17dZPA9WHzTTz3kokDGqBuY9jHKD8XNsQTf fyBip/f0SsWEyO9Ib6JVop8gP/fkPP9u8NCrX/vQftC3Ao8vtwpza9ntbIPPpN36D+/K7b cfrVPicqmY1B+yKhSWecOCKJx5KGgne9+LqOqEvXmZCaI8V1+1qGTT4ULP0ztivrV/K859 2eoEPU9Gjjo+hWVDrKXkGnnd2WnBxYGULSySIwQ3HtpAxbXLQ8OQa9goHUa2M/g24opfSL rp9UMtgzGNyQ28IupCseLRKnrhKi3lwToZhSadE3Sx3CzRCyEHFQFzocRm2TxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761244653; a=rsa-sha256; cv=none; b=liQBH5UXNrVEBg0NXBv3ZCSXo2UsSwbd1ZEi6sgJYsOhHroDDS0SCpic+jVEZverCXR7kJ /CaRj1ZZiFWeGZhRWSs0ju7DAPDrfOgddeBiZyQuEaUT734ta5TYUNt+Qs6ZSgoSdCjgAu 81Uu713r11cAROdbU921hEeoNVVNVkzLqPaaN75Cj28xHz+rh3gxIjj+uqmbSNfZeq/Z4g BbshQk4hh/ydFGWRihadNhtHchvdfUVNTApGHKuBI1bVWTSAcpB7LFl0kHsFDYRdNwavLl QXqcRRUZjZMZsnDWHpMf4DrSBKj6K7k4C3ZoYFNpYnf7kz7/h0jnJZgwrSyvZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csvsT69L0zBcJ; Thu, 23 Oct 2025 18:37:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59NIbXLO059662; Thu, 23 Oct 2025 18:37:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59NIbXw3059659; Thu, 23 Oct 2025 18:37:33 GMT (envelope-from git) Date: Thu, 23 Oct 2025 18:37:33 GMT Message-Id: <202510231837.59NIbXw3059659@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 898aea3d847c - stable/15 - arm: tweak imx module build logic List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 898aea3d847cbea7c7455dca202846cfbfef4956 Auto-Submitted: auto-generated The branch stable/15 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=898aea3d847cbea7c7455dca202846cfbfef4956 commit 898aea3d847cbea7c7455dca202846cfbfef4956 Author: Mitchell Horne AuthorDate: 2025-10-20 23:06:26 +0000 Commit: Mitchell Horne 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)