From nobody Thu Oct 23 18:37:32 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 4csvsS6q6vz6DC3V; Thu, 23 Oct 2025 18:37:32 +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 4csvsS65FFz4276; Thu, 23 Oct 2025 18:37:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761244652; 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=hklGtdsJ7EfFUH438PVnfKCl0F6dncEvC+L0vozNcIg=; b=Mh2wRthMDVLyPkINh4omymjx44v4RYqAO57q/ejJQtLhGgELeAW/pX2nX5QpThArNziefO 0ffa/v3EF2NnwOEo6Mau7OWcPHSLHh8AynMNrxazoWSiRA8WhO5PoYw9scNRuW791rJSpC /QqaruQUq+6Jg+1VSjoYm+q7ZGR5va2PKVcikk4AT1rOWfiUg+wVOLFn6rzD5Xwpr4uMmS SSuO9+A8CBln7AWSSNJs70wWpn6TPQ4BH8VC9q/jWFoiLoSsQ5zMZAj0Xy26W4pBkPgbPe pkfVfDT3rxIhcpJFEwkfcTwt5rG6yYxmdXr3u8tsx23F19RmYfKHN3Ac8INKOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761244652; 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=hklGtdsJ7EfFUH438PVnfKCl0F6dncEvC+L0vozNcIg=; b=ioePkwp+6+87Nz30UVElQhvcQEpYGihRLvXorvYzD3Ogw8TgJGMFe1h/KCjxQWG836xG6W o54Vi8nEAuHCyiLNcPanK1KTrYtwP5FhIUudNWjmTTqeZDa92iabZk/+XmYmAN4RE6oMoj gZjzn8nAYs/8pCS0iI8g2PM9+iVjHmNXRWwTBNTthDoOjXQVcKXpjkA85zf5kdVejhik8Y ePFhzjEfsgwlloDR+iyIlEzbOjA0GTelicp+0Hvave+4r3ZCEkNRo1FoTtfF+8sXCJpwPu MqtruB65urcItElvdRO0h2xra47H7CPFRO/r5xdg4+BbLZdaOXWiiWGWqjgSog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761244652; a=rsa-sha256; cv=none; b=LVV2siLX/Jo+AmyX6FCAXCx4aq19jdKqkizWR5s5pojZWc1aA9ShK5Nzdxa//o8ovQ5yA7 7U0mXPYteEhpKA6/lwllxy4zFGfgGowvHC4WnUNVqtAqSTMRlbXPYiaI5MxxcWdNs4Inr4 mRtZYbvpetCL7kKU3cpDuWAuIu8u1QBp8YE6I7TmwdPqYElSzzssgpLMwlvJq/iv+7cbom agAOsXso1tIjKhy1kH8/AJiLrW9gAwN/SP1Ic7Vs7G64Iph+InpSqPXdsr7nBzbzpeyems Cmrn8X2z6acBH34RHrzX0Di6LZtdBZXOZtAudzZgCDRZIS3r5okE7XBBV3TL8A== 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 4csvsS5Y2LzBcH; Thu, 23 Oct 2025 18:37:32 +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 59NIbWpn059625; Thu, 23 Oct 2025 18:37:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59NIbWQ4059622; Thu, 23 Oct 2025 18:37:32 GMT (envelope-from git) Date: Thu, 23 Oct 2025 18:37:32 GMT Message-Id: <202510231837.59NIbWQ4059622@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: 7b5e4e5e35a5 - stable/15 - modules: enable allwinner kmods on riscv 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: 7b5e4e5e35a5c0684f417789e2d3725489a1ed37 Auto-Submitted: auto-generated The branch stable/15 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=7b5e4e5e35a5c0684f417789e2d3725489a1ed37 commit 7b5e4e5e35a5c0684f417789e2d3725489a1ed37 Author: Mitchell Horne AuthorDate: 2024-09-18 17:19:16 +0000 Commit: Mitchell Horne CommitDate: 2025-10-23 18:31:32 +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 (cherry picked from commit 5522519731b74e7b56c710ec5ea4d34065f3ed32) --- 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 2acf991f1b77..8584b2433671 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -676,6 +676,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 @@ -709,7 +710,6 @@ _hyperv= hyperv _vf_i2c= vf_i2c .if !empty(OPT_FDT) -_allwinner= allwinner _dwwdt= dwwdt _enetc= enetc _felix= felix