From nobody Mon Oct 20 23:42:18 2025 X-Original-To: dev-commits-src-main@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 4crBmW1cwwz6DLTl; Mon, 20 Oct 2025 23:42:19 +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 4crBmV5dBSz3qPb; Mon, 20 Oct 2025 23:42:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761003738; 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=MxdD8gDDz9eQRKX43Isgg/I3XMpLvJAtd/LDN/s3M8M=; b=l+JuJPp4bc8SCagucB9mTdgaGp+CDuK8HTPgHBJi7AdPcmRi9Ay9w0Z8lkmiW+mPy7+1KF gV53VBXZF0avwz3W46DDELj20GQqfYB1KKIUIpRlRdV5tA+JnA6VTtLalXZ/yq/YXJGdYa r0UC8tufgtUrz81bPZFdIHcTz+07miiwY7SMZH526DvOppPn7NxcSTcUhlMXaKsDU/xlA/ kbMCvwd5fXN1HG+OPrziEMPrc/lv24MQj37CIHd76/2jeOPgJiCc2wgHKO3iNdbWyGpsrT fLYkCVUNBBnN+C+//LjT0aAaGhw2butJx1Gb+/Py1zPquSYYa2MOrguBnGUQgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761003738; 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=MxdD8gDDz9eQRKX43Isgg/I3XMpLvJAtd/LDN/s3M8M=; b=PleWO61r05CnyGvgOGQiF0Mq88xlk24BWmYuAJjKoIozcq9AGyb5fKqIJLPP7gZYshLU+D f6lM8ZcKO9Tqf7Nnu0twqMqWuEnkqsNv50sgIMMgKbAaGiMUm8TtqEBcscmjx9q3LAel0O pKxa3uBi3EPfqBt0oJ0Gc4bRDSS8qJ5OOX5Se21x3UgD73j8fdunCSspAgvxyesKH+9UQj 6Wd3hkLZYqsjQPWcS/9cIuAdWWl8iaPczACNW2nm1CsXlHqdG4Iv3iIr2UlZZgQ6FmWycH iE5DaMBGpjRZkyMTpu9sjRwddPKpRjPp5Iv8txg1ANtP193f1/VH0521vMcqyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761003738; a=rsa-sha256; cv=none; b=XU9HAPQsdUX+XW/m2gZE1qBVW3wtP+dfkClcGIFPpTus8xag7sKz4TtO63il/oVlltiK+A hF8RUVMHF+hLexPXFp+d1bZR8JdKoGzEiq/cmMdOUcEKqUqsoKDx1Ugr9BILBJV3Przpss 6V1j0A9rZPC6o6PBM4R72rr/8lTlBoxSu27H741ddTu3JFj2F+1YtawnwM6T+NBmAsH3/w +Z41aKIXYlwyB940LmtPPbOE2LHR2U04wTXFhnaQ3bwxCY46xgDvVyva6FeDJz/9Gx4wSP mPp2I18tW+RDNomfV8OvPtc1mTwK4PRRKVZ7WkYp0RICxUiWrkqXwnjwY89dVA== 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 4crBmV55Pbzbk6; Mon, 20 Oct 2025 23:42:18 +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 59KNgIp1091749; Mon, 20 Oct 2025 23:42:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KNgIeW091746; Mon, 20 Oct 2025 23:42:18 GMT (envelope-from git) Date: Mon, 20 Oct 2025 23:42:18 GMT Message-Id: <202510202342.59KNgIeW091746@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 5aefe9f16f24 - main - arm: tweak imx module build logic List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 5aefe9f16f240696142894bdeabcebbb057c7053 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=5aefe9f16f240696142894bdeabcebbb057c7053 commit 5aefe9f16f240696142894bdeabcebbb057c7053 Author: Mitchell Horne AuthorDate: 2025-10-20 23:06:26 +0000 Commit: Mitchell Horne CommitDate: 2025-10-20 23:37:13 +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 --- 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 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)