From nobody Mon Oct 20 23:42:14 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 4crBmQ2VdBz6DLYT; Mon, 20 Oct 2025 23:42: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 4crBmQ1xM1z3qJ4; Mon, 20 Oct 2025 23:42:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761003734; 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=kaJEYTd/+PpzP0d73Q+KePySCSA/Ie6+TQFB0GFXl5M=; b=jt9/hYg9iL4ewhVxHWTWuHzZDHEjoXD607JkUs3pCeD07GBb/5c1o39p92XcO7lkobaGdo hdgmag5M8egKWFsP6jZWrB84Ry2NcFEeDBZVo0QzlaJwLrUXO9s6VnwAg42zTk7viL3wHh Pmwsmggy4zYtB6omDwIS00p8LKzzjIbCpYYZd/fQgj5YZ9ev4K0GOKNTSrUFFCabX7IOFQ v5KpkTqoYaOv0BODkGivd2SNXrO/HX5YJEkoMw/Je7bQ8QEb0JenGHO4DPLnDfv3oGCXWo kP9unYDUm9KqlKbUcs7zf1Qs/CNgJ1i/3dRa2sKjh/B6xAgkckdikJkssvJrDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761003734; 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=kaJEYTd/+PpzP0d73Q+KePySCSA/Ie6+TQFB0GFXl5M=; b=DQh4hOVNKxsOL6i3zqZmNxb2ri/znrZ9Ql/e4PIPH4weCNBIIyYTwygr443RlXKpF1b5gu 3DvUo5ONyhqRHyOEyZ0zEdTbYAiK/inYPpYsnFj8lmJIoWlGRZWIl1l0XIcCkmXF4n/bW1 VEaxZ2qztTHgHHMKdGPWl3SPLs5NROYxp4Ei7v5iMcAMSeXXm+SHk3j2cuk8Iy4eme07F9 uTv6H/+wseW0LZA/eciYM2IkubzMaY9Q4JCXmDFQdEhwsLbHWE1L20C/kLLaDifVOQMQbi 4LDqjnLDzUJ5RlLkK+EGG0bR6xibNsRy+w6YDfytLyP+nVgRmC9BaAbkMSej+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761003734; a=rsa-sha256; cv=none; b=xoxM4oW1Hzmz2+F9yO17VhRkVI8tOlMtqOnDuuaA5/adFOgzpb3I10h3HlbcQIU6D33LNM wvpv2YoXN/wkWa9+glPh4Y9oz276b48EeQD3/0vTZBiQae/qSSPLMhHxP88XLzetdOnMtr X3qu1aJstivB4cfW1fw882GUIhqxN6HBzQgn5881z0HjjjC3xMUZV+XlXbgfprcby1AfSF hN1QjQ6v/ssTEJOQfn3Dr1WgVlbjczRzzImqPOXKyYWP9E07FQ42cToIKG57pbSiNEY2iT 9ZK32ykQ7WFBSQToEYXeLh/4iofiKotlz1Ya+UVG9xpFUi/9C43bajp3VFL4DA== 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 4crBmQ1XS1zbk2; Mon, 20 Oct 2025 23:42: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 59KNgElF090314; Mon, 20 Oct 2025 23:42:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KNgEPY090311; Mon, 20 Oct 2025 23:42:14 GMT (envelope-from git) Date: Mon, 20 Oct 2025 23:42:14 GMT Message-Id: <202510202342.59KNgEPY090311@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: cf202819af23 - main - dtb: sort by vendor 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: cf202819af2337c0b652ac9290964c2ef7a1ae3c Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=cf202819af2337c0b652ac9290964c2ef7a1ae3c commit cf202819af2337c0b652ac9290964c2ef7a1ae3c Author: Mitchell Horne AuthorDate: 2025-10-20 14:24:45 +0000 Commit: Mitchell Horne CommitDate: 2025-10-20 23:37:13 +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 --- 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 7eb0db5e8b80..f0cd8f8d515c 100644 --- a/sys/conf/dtb.build.mk +++ b/sys/conf/dtb.build.mk @@ -15,9 +15,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/} @@ -54,7 +55,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,