From nobody Thu Oct 23 23:37:22 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 4ct2WQ4Wcmz6DsGH; Thu, 23 Oct 2025 23:37:22 +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 4ct2WQ2LBjz3Rkv; Thu, 23 Oct 2025 23:37:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761262642; 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=iOUzGPPmVeqhbxZTtNJcfndzvK5raYttLW87Gq/xnlM=; b=fTtT7ZjHUlWpvQO6jk1Jfy5CCaG8TxFScGMBkdod9NdHFrCasraS85GdaHYyX5jlNjhE7a Pt+SnOSVJQeqIi7lPxGeqbVQRIRff3/+3IMbU1zdWy07cMUJpCXqJReJRs+kWUiV8LotYO jRARMnnz6KZEFnz3qJhKVOu1xw0GV8weIxA++WvORJWcafeEmLtCnF94TQ0ATYRpcuk+A0 ZHgp6goMG3lF8gEEjGQbO7XnZEU9fvARdzKbpNXapBo9TcrhvEPv5lj8YriQgolPhAEII1 vrh4Tog85FdpXk35ejac1znV7gp+txQdde9y1sZ6mA1dOCE193CWDQuvjqBNdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761262642; 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=iOUzGPPmVeqhbxZTtNJcfndzvK5raYttLW87Gq/xnlM=; b=Z/s5OvjxPWBeGKet8vv9u6JFq6D4O2TbK8TFSHTT9I5G7tXhh6FACoDEBJYBeQ2+yWZjNd DWwTkY82ddwRK9UDAs4ALGjQPa21txO+abNQZBUqffJr/EGaAJAgSLjKn5/b/YcAAsggjZ rt+7qGyACc3Ke2qQrEyDeGlOwYrlpRxPsTSpfWIQOcC2ou2z+XfmWaogzXTrptHzVPTaPe wWP6sntRFoM8v6Z5GdZptEuhcZMaOQjPE18rhl1ImiSSmzTJsk+BrOZ4JtXGK2bH1ANK0q u6KpvvY4Um8jEjk6W2On5cRfTbepZ3RtWB7qojrZ2QTmB0xn8tRtHbHqs8kHtA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761262642; a=rsa-sha256; cv=none; b=sJJuhmYyjUV2F7kwdc2sNnb1WKk624yqfHHrbPmZBQbw2zK7O5U8B7QqShpCZW4QpSpPWA N9pb4uexV5kZXtOIlJAMp0mndH6uTn3HBDCLTVNyGrZ59m3YrJ5xElXGWJvjY19a4vMQef D7fgEx5m0mcszxCL/3uu8858m+w/ThS/UdeNLYQURuxI6OHZqZ1PI67u8eaM9GRYOoaMhg mzrFFq5lzLp+6pyA0aBrjSUCSAwmyTCwPixki5SJ9uezTFFjVRh+1g/drcO1tbNoPFEDNQ ImqQMuC2xvc0KkfLRvU5iHj6Qc5agP8F3Y10jvdydkfcXeqaIiKaqOhiNzomrw== 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 4ct2WQ1yBLzcrx; Thu, 23 Oct 2025 23:37:22 +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 59NNbMjV026655; Thu, 23 Oct 2025 23:37:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59NNbMgs026652; Thu, 23 Oct 2025 23:37:22 GMT (envelope-from git) Date: Thu, 23 Oct 2025 23:37:22 GMT Message-Id: <202510232337.59NNbMgs026652@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 24718d1db0bb - releng/15.0 - dtb: sort by vendor 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 24718d1db0bba5fa55b36efcf5acdbe9c91e9e1b Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=24718d1db0bba5fa55b36efcf5acdbe9c91e9e1b commit 24718d1db0bba5fa55b36efcf5acdbe9c91e9e1b Author: Mitchell Horne AuthorDate: 2025-10-20 14:24:45 +0000 Commit: Colin Percival CommitDate: 2025-10-23 23:32:37 +0000 dtb: sort by vendor on riscv Just like arm64, our DTS comes from Linux and is correctly sorted into subdirectories by vendor. Enable the logic to preserve these directories in the installation, for example: /boot/dtb/sifive/hifive-unmatched-a00.dtb Approved by: re (cperciva) MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53116 (cherry picked from commit cf202819af2337c0b652ac9290964c2ef7a1ae3c) (cherry picked from commit 0cc2448fc2a2e194473d04512c1a83db3913de72) --- sys/conf/dtb.build.mk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/conf/dtb.build.mk b/sys/conf/dtb.build.mk index 327d69106244..b81ba439d8ad 100644 --- a/sys/conf/dtb.build.mk +++ b/sys/conf/dtb.build.mk @@ -19,9 +19,10 @@ SYSDIR= ${S} .endif .for _dts in ${DTS} -# DTB for aarch64 needs to preserve the immediate parent of the .dts, because -# these DTS are vendored and should be installed into their vendored directory. -.if ${MACHINE_CPUARCH} == "aarch64" +# DTBs for aarch64 and riscv need to preserve the immediate parent of the .dts, +# because these DTS are vendored and should be installed into their vendored +# directories. +.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "riscv" DTB+= ${_dts:R:S/$/.dtb/} .else DTB+= ${_dts:T:R:S/$/.dtb/} @@ -58,7 +59,7 @@ _dtbinstall: # entries in the NO_ROOT case. test -d ${DESTDIR}${DTBDIR} || ${INSTALL} -d -o ${DTBOWN} -g ${DTBGRP} ${DESTDIR}${DTBDIR} .for _dtb in ${DTB} -.if ${MACHINE_CPUARCH} == "aarch64" +.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "riscv" # :H:T here to grab the vendor component of the DTB path in a way that # allows out-of-tree DTS builds, too. We make the assumption that # out-of-tree DTS will have a similar directory structure to in-tree,