From nobody Thu Oct 23 18:21:14 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 4csvVf5RfNz6D8mj; Thu, 23 Oct 2025 18:21:14 +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 4csvVf3T68z3xkx; Thu, 23 Oct 2025 18:21:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761243674; 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=00WN+ctHEELPHWi0e++d0DRUBKcsRXpg0U92XVT/eRk=; b=WKRsIz6Nea3dVtv1aTa4JGKOX/D8GOcKsmOuw8+GcCXC+wP2Bn5g8f0Yjumsl0iuLlEf6i IFsy34gmoaZe0/CO4xqAD1fDR0EDuWYt7g/Nw0+Crgox4axE62nO6LAOrRc+14zIvsAJWA FdSvuo70L1maHUB0Br+lyjUdZ1pYgVa/f/WTtRWJINuCTJCITPmc2V9151bzs1wGGnB7v8 4zv7h2a+bxJUxT5hYHw0F7nXSvRiev4uOG7V19gCQ/TY7Is7MVm8CUsQ2QJ8sezsSrPFDq a4mHZ5br4PmA0hQXAqP4w5pXGkZgKu7y+TSu95FhsJ9QLU6Oyx7zfr3rZYZWMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761243674; 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=00WN+ctHEELPHWi0e++d0DRUBKcsRXpg0U92XVT/eRk=; b=kc2aV+5N5n/6shT32QluVWMTGNZIsEBvAYmDyBPnwCDURJFipMVvAZ/OHQd1kDxCQ8/v8v 3M0b/oE0rLsEhs1Kif0Kh43c7Mk9IEI1v7ZUBC8J2kPNvabSpmfV9XGfL82GvGNcTbo35X y/MylMJSdFWWvk37QNeF8j5QzknSqOU5Zn7NYNql0EbtZrJVaf0lu3abYQM4ayeUpS1SlN q070WIxcTYZUf8ah6s/30GZMEHMDagubV7DvdSu0VdEOlZSLQi47xh/k62OLQywEEGIeO7 LAl9Uy13J8C0Kb2xMYY2IxgRcKcyhyivaTkYAV0/jubI+V8wQXscrBxyw/SORg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761243674; a=rsa-sha256; cv=none; b=j045ldMi93JWWBhli83uDFDPKjvLbMTc92eh2ZTe6qgMGxEmwEhFTUXZ0dOPuunVu3g7B6 vejr5z5lPnf2TMy21B3zcUYkXlqP9R2Dvm4eyaYfrUaic9aUoAUsvOyeYyaqFsJo64Xcx3 3q3M9zOtfsY3JngzUfo9/KZ68uXDenpy+i5awk63LMY4yzMGHxP8qFLplNPBOQnn5sciQ9 FK18Xyo4codhYfkEIlmoncSJo49MLt6h/1E2leZViWEJzUIV1Nh0jrE+58l9hZfdRMbxsi Qd8V8Nv8t4d0FA6fxmz8k0K/4Gq59Sm5cj44ZIrzy/8QEHzPFhVXn6Y5iSs/bQ== 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 4csvVf32ftz9Sr; Thu, 23 Oct 2025 18:21:14 +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 59NILEQ2033547; Thu, 23 Oct 2025 18:21:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59NILEOS033544; Thu, 23 Oct 2025 18:21:14 GMT (envelope-from git) Date: Thu, 23 Oct 2025 18:21:14 GMT Message-Id: <202510231821.59NILEOS033544@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: 0cc2448fc2a2 - stable/15 - 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0cc2448fc2a2e194473d04512c1a83db3913de72 Auto-Submitted: auto-generated The branch stable/15 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=0cc2448fc2a2e194473d04512c1a83db3913de72 commit 0cc2448fc2a2e194473d04512c1a83db3913de72 Author: Mitchell Horne AuthorDate: 2025-10-20 14:24:45 +0000 Commit: Mitchell Horne CommitDate: 2025-10-23 18:11:41 +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 MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53116 (cherry picked from commit cf202819af2337c0b652ac9290964c2ef7a1ae3c) --- 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,