From nobody Mon Oct 20 23:42:17 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 4crBmT6dBjz6DLNS; Mon, 20 Oct 2025 23:42:17 +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 4crBmT4fxWz3qLc; Mon, 20 Oct 2025 23:42:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761003737; 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=9qn8W4+KKylEHaBfnCz23WWqtdMIqz6+rBuUgoHaHBE=; b=Ej6WE1S15pUG9UpAxDB4xl1R7wVFmi6fmOqdZ5BMpHQlwtI8hqubgRCppc769vqg0ltKjT did9QQziZFHzy7NlQd0FfRprutYInfxd1j+5/R12rMW8djOtkLqXYrM4pFehczSzXh9HE4 FyimkZc4Aoz3MESK43HfJ8MGwgmLLQpbwZgoKOegDuco5y3eNTI/D/0qrSaBTUWaN1gMKV UcpZ4YyjvToittEoXiS98v7+001BJyhDriAAWF3zbWD2dlxc65w7qhcHLHMwaOBAP0eEVj G6V8nGP8xQ6ixs4eI9F3sBgiNyl/zJqI2l3TWMayGy6K9uUbt79o67rBbnwCSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761003737; 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=9qn8W4+KKylEHaBfnCz23WWqtdMIqz6+rBuUgoHaHBE=; b=G4HovtsBoptWbySB79W+2qOf3zAfw3cpbTWfJSLgkBngQzrMch/RSGDK9EMwsTW+YHc7lH zvnr0DVTma+1IkZMPggq5tC7XOVEg8p2Z1M5TV4Op2Q8L+fz95ggzwv7QazbkFXt0QDmD9 Kuzi+ImoJ6h/a0h8fIcn+FpuBhA0YS5p2hM/u4RtWIBLPHZ6AVxJJrnlag0q7odvc3YKbu 1iASZH5nM05Wg5m25RvAYV56n666A9m/oPxMK2sgF0u7dR/B8693qgFLSEImQrNCdlQawV XJ55T4J4zr9uW8HqcWZzT0IVefS9bWOjGmOhGyBSxl80CPLZupJBe+3Ye/0qfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761003737; a=rsa-sha256; cv=none; b=qjYPNxLvFa9Si0bXe2dLeI9nJI/tGVyvqU6h6W2Um/zh8B0dHfWiLIpn0eqivo5bj1FGJF loePWHl3RbkkSf20fJvdvvqNH7k1v4NxwXRyjXbv5+2GRyfipg6gkZ6lB+XdmUIFSTwUu9 t4MneLZ3bmBkmMDwIdOVG/5cWXagvStjfTce5CnTQ2g4Z6oKVbtXBYKw6iyXzfyXFfEMUf JFTY5lA6PViB3YzghQOA0G/DPpoc2q3JtmZSER2hz0LmlK9iPL+2ldD+PUmfKcOLW1/Y6x 2Mcqk0u6QI0JJFMa//YXQNQlxFu6yVE/tlH9aHMc3soMpzlCQRMUpbeZXNsWHw== 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 4crBmT45CPzb1Y; Mon, 20 Oct 2025 23:42:17 +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 59KNgHWq091170; Mon, 20 Oct 2025 23:42:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KNgHDl091154; Mon, 20 Oct 2025 23:42:17 GMT (envelope-from git) Date: Mon, 20 Oct 2025 23:42:17 GMT Message-Id: <202510202342.59KNgHDl091154@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: 5522519731b7 - main - modules: enable allwinner kmods on riscv 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: 5522519731b74e7b56c710ec5ea4d34065f3ed32 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=5522519731b74e7b56c710ec5ea4d34065f3ed32 commit 5522519731b74e7b56c710ec5ea4d34065f3ed32 Author: Mitchell Horne AuthorDate: 2024-09-18 17:19:16 +0000 Commit: Mitchell Horne CommitDate: 2025-10-20 23:37:13 +0000 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 --- sys/arm/conf/GENERIC | 1 - sys/arm/conf/NOTES | 1 - sys/modules/Makefile | 2 +- 3 files changed, 1 insertion(+), 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