From nobody Thu Mar 21 20:11:15 2024 X-Original-To: dev-commits-src-all@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 4V0xRl4J2tz5FPx2; Thu, 21 Mar 2024 20:11:15 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V0xRl3LKfz4P7l; Thu, 21 Mar 2024 20:11:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711051875; 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=gZuRxnj+tZX7LV2upkKLruBJics7ykaiwnm8OM5qIb0=; b=M2WBVq9D1vCaaQzOBAg8/XmDs69qJ6273CpjETkBmn/Pcz8xBkvP2vobfosrIb+lwWw09X R4by3vbuIYtgoC2T4GOYJlWcH4UATL2zcQpZzF2wSQ9WZPcBqyL2AxEqehfNy4bUXBZLSP lsczAmsic1j9bBdNp0Pvf8aStIsU2Pl1GoSrF6mjSMdCnV8yoCvFPa+slJEaT+cHjCNNXH cLbDvG4iaT8Bxmb0NOqMQP/YPBL8LVuWh8ht7l4EJvScj4dAUtoo2hTvR41QC+VpGbA+PI Z2VZMh4Ew0U5a2mZYmvPqauC/rqlqkqHDIdLZI+NAY1toJ6qfC8pOcGNl+M8kg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711051875; a=rsa-sha256; cv=none; b=KChEnd7J1L88AZTbipokMhbxe+RhuVJzlU6kAP9GblFLKAtlgApTt74Aet3haCxdg5JgTm bbpcq0WTfVy1oc2/gchkkP6K+0emDe16hxGy10Z6X3OCz8FGB4NEXFnxcLyQd0TxlUbfXo OWWN1Bw7iuJvUmuAWVRYfvz4yc+/3G1xT2Ce2MdI/hgDaMJq5MaB/E9Q+qmNRqiJyiYwVa peYijACTXtlS0WfHFYiybAutt+8YcShcpSZof6jpk3ikKAEazdH705slG+4VF88yhY6V/w zjELIGN87LmBSk+Q4UAN1J7R93o/Gjnjto8in8aFaiWZnVpgdPFN92xycn0wTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711051875; 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=gZuRxnj+tZX7LV2upkKLruBJics7ykaiwnm8OM5qIb0=; b=owJpaTQA1PaUzU4/jHMhZDB75o2AVMfNFl9+7hr9AQNJaNQPBvYgyqjpCjNhzNsBOony7S cJ3JThgRessj+wJe3IzvUvU9BcJphGFfLk3Wg9SoPbJ/pFHG3BsccpLt+2eAvaYu2Uhzmu /9NHdDszRaylBNdU5ieyrwbuqX2obVwGQzw9UJlHVdQNkO0/m3vsRezwUHQsBWLzhx61al zErsh/oAyUzpnHxTWaNHSSzlcGUuSmGALreBcEBJxdpJyxTogdqXu4saa/aVazUbkt50fI e+YyIe/2t43+B+eb6LJYu1cQZO0f+00H+XD2RkvAmddfJSK3PlT210m78WhpGA== 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 4V0xRl2tFczqG9; Thu, 21 Mar 2024 20:11:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42LKBFaJ040107; Thu, 21 Mar 2024 20:11:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42LKBF6K040104; Thu, 21 Mar 2024 20:11:15 GMT (envelope-from git) Date: Thu, 21 Mar 2024 20:11:15 GMT Message-Id: <202403212011.42LKBF6K040104@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 4ea295aba2b6 - main - dts: Fix arm dts path List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4ea295aba2b6472f86d5f668371d9b4c89d2b462 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=4ea295aba2b6472f86d5f668371d9b4c89d2b462 commit 4ea295aba2b6472f86d5f668371d9b4c89d2b462 Author: Emmanuel Vadot AuthorDate: 2024-03-21 20:06:12 +0000 Commit: Emmanuel Vadot CommitDate: 2024-03-21 20:11:02 +0000 dts: Fix arm dts path Linux 6.5 moved to a vendor-based subdirectory for arm DTS, change our Makefiles accordingly. Sponsored by: Beckhoff Automation GmbH & Co. KG --- sys/modules/dtb/allwinner/Makefile | 40 +++++++++++++++++++------------------- sys/modules/dtb/imx6/Makefile | 28 +++++++++++++------------- sys/modules/dtb/nvidia/Makefile | 2 +- sys/modules/dtb/rockchip/Makefile | 4 ++-- 4 files changed, 37 insertions(+), 37 deletions(-) diff --git a/sys/modules/dtb/allwinner/Makefile b/sys/modules/dtb/allwinner/Makefile index f04be9ca0dc9..5320e5a7681f 100644 --- a/sys/modules/dtb/allwinner/Makefile +++ b/sys/modules/dtb/allwinner/Makefile @@ -2,26 +2,26 @@ .if ${MACHINE_ARCH} == "armv7" DTS= \ - sun4i-a10-cubieboard.dts \ - sun4i-a10-olinuxino-lime.dts \ - sun6i-a31s-sinovoip-bpi-m2.dts \ - sun5i-a13-olinuxino.dts \ - sun5i-r8-chip.dts \ - sun7i-a20-bananapi.dts \ - sun7i-a20-cubieboard2.dts \ - sun7i-a20-lamobo-r1.dts \ - sun7i-a20-olimex-som-evb.dts \ - sun7i-a20-pcduino3.dts \ - sun8i-a83t-bananapi-m3.dts \ - sun8i-h2-plus-orangepi-r1.dts \ - sun8i-h2-plus-orangepi-zero.dts \ - sun8i-h3-nanopi-m1.dts \ - sun8i-h3-nanopi-m1-plus.dts \ - sun8i-h3-nanopi-neo.dts \ - sun8i-h3-orangepi-one.dts \ - sun8i-h3-orangepi-pc.dts \ - sun8i-h3-orangepi-pc-plus.dts \ - sun8i-h3-orangepi-plus2e.dts + allwinner/sun4i-a10-cubieboard.dts \ + allwinner/sun4i-a10-olinuxino-lime.dts \ + allwinner/sun6i-a31s-sinovoip-bpi-m2.dts \ + allwinner/sun5i-a13-olinuxino.dts \ + allwinner/sun5i-r8-chip.dts \ + allwinner/sun7i-a20-bananapi.dts \ + allwinner/sun7i-a20-cubieboard2.dts \ + allwinner/sun7i-a20-lamobo-r1.dts \ + allwinner/sun7i-a20-olimex-som-evb.dts \ + allwinner/sun7i-a20-pcduino3.dts \ + allwinner/sun8i-a83t-bananapi-m3.dts \ + allwinner/sun8i-h2-plus-orangepi-r1.dts \ + allwinner/sun8i-h2-plus-orangepi-zero.dts \ + allwinner/sun8i-h3-nanopi-m1.dts \ + allwinner/sun8i-h3-nanopi-m1-plus.dts \ + allwinner/sun8i-h3-nanopi-neo.dts \ + allwinner/sun8i-h3-orangepi-one.dts \ + allwinner/sun8i-h3-orangepi-pc.dts \ + allwinner/sun8i-h3-orangepi-pc-plus.dts \ + allwinner/sun8i-h3-orangepi-plus2e.dts DTSO= sun8i-a83t-sid.dtso \ sun8i-h3-i2c0.dtso \ diff --git a/sys/modules/dtb/imx6/Makefile b/sys/modules/dtb/imx6/Makefile index 46daa29188bc..7d210e8109a6 100644 --- a/sys/modules/dtb/imx6/Makefile +++ b/sys/modules/dtb/imx6/Makefile @@ -1,18 +1,18 @@ # All the dts files for imx6 systems we support. DTS= \ - imx6dl-cubox-i.dts \ - imx6q-cubox-i.dts \ - imx6dl-hummingboard.dts \ - imx6q-hummingboard.dts \ - imx6dl-nitrogen6x.dts \ - imx6q-nitrogen6_max.dts \ - imx6q-nitrogen6x.dts \ - imx6qp-nitrogen6_max.dts \ - imx6sx-nitrogen6sx.dts \ - imx6dl-riotboard.dts \ - imx6dl-wandboard.dts \ - imx6dl-wandboard-revb1.dts \ - imx6q-wandboard.dts \ - imx6q-wandboard-revb1.dts \ + nxp/imx/imx6dl-cubox-i.dts \ + nxp/imx/imx6q-cubox-i.dts \ + nxp/imx/imx6dl-hummingboard.dts \ + nxp/imx/imx6q-hummingboard.dts \ + nxp/imx/imx6dl-nitrogen6x.dts \ + nxp/imx/imx6q-nitrogen6_max.dts \ + nxp/imx/imx6q-nitrogen6x.dts \ + nxp/imx/imx6qp-nitrogen6_max.dts \ + nxp/imx/imx6sx-nitrogen6sx.dts \ + nxp/imx/imx6dl-riotboard.dts \ + nxp/imx/imx6dl-wandboard.dts \ + nxp/imx/imx6dl-wandboard-revb1.dts \ + nxp/imx/imx6q-wandboard.dts \ + nxp/imx/imx6q-wandboard-revb1.dts \ .include diff --git a/sys/modules/dtb/nvidia/Makefile b/sys/modules/dtb/nvidia/Makefile index 1bda4d1085af..c032ee7c563c 100644 --- a/sys/modules/dtb/nvidia/Makefile +++ b/sys/modules/dtb/nvidia/Makefile @@ -1,7 +1,7 @@ # All the dts files for Nvidia ARM systems we support. .if ${MACHINE_ARCH} == "armv7" DTS= tegra124-jetson-tk1-fbsd.dts -DTS+= tegra124-jetson-tk1.dts +DTS+= nvidia/tegra124-jetson-tk1.dts .elif ${MACHINE_ARCH} == "aarch64" DTS= nvidia/tegra210-p2371-2180.dts DTS+= nvidia/tegra210-p3450-0000.dts diff --git a/sys/modules/dtb/rockchip/Makefile b/sys/modules/dtb/rockchip/Makefile index f8796ebb17af..70d8269f7b3f 100644 --- a/sys/modules/dtb/rockchip/Makefile +++ b/sys/modules/dtb/rockchip/Makefile @@ -2,8 +2,8 @@ .if ${MACHINE_ARCH} == "armv7" DTS= \ - rk3288-tinker.dts \ - rk3288-tinker-s.dts + rockchip/rk3288-tinker.dts \ + rockchip/rk3288-tinker-s.dts .elif ${MACHINE_ARCH} == "aarch64" DTS= \ rockchip/rk3399-khadas-edge-captain.dts \