The branch main has been updated by manu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=4ea295aba2b6472f86d5f668371d9b4c89d2b462
commit 4ea295aba2b6472f86d5f668371d9b4c89d2b462
Author: Emmanuel Vadot <m...@freebsd.org>
AuthorDate: 2024-03-21 20:06:12 +0000
Commit: Emmanuel Vadot <m...@freebsd.org>
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 <bsd.dtb.mk>
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 \
