Author: kevans
Date: Thu May 2 16:56:03 2019
New Revision: 347021
URL: https://svnweb.freebsd.org/changeset/base/347021
Log:
fdt: Fix installation of aarch64 dtb
r345519 rewrote parts of how we build .dtb, but mistakenly dropped the
vendor dir for aarch64. Simply drop the :T for building ${DTB} in the
aarch64 case- it'll get applied at install-time as-needed, with :H:T for
determining the vendor dir.
Reported by: manu
Tested by: manu
Reviewed by: manu
MFC after: 3 days
Modified:
head/sys/conf/dtb.build.mk
Modified: head/sys/conf/dtb.build.mk
==============================================================================
--- head/sys/conf/dtb.build.mk Thu May 2 16:28:33 2019 (r347020)
+++ head/sys/conf/dtb.build.mk Thu May 2 16:56:03 2019 (r347021)
@@ -24,7 +24,16 @@ SYSDIR= ${_dir:tA}
.error "can't find kernel source tree"
.endif
-DTB=${DTS:T:R:S/$/.dtb/}
+.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_ARCH} == "aarch64"
+DTB+= ${_dts:R:S/$/.dtb/}
+.else
+DTB+= ${_dts:T:R:S/$/.dtb/}
+.endif
+.endfor
+
DTBO=${DTSO:T:R:S/$/.dtbo/}
.SUFFIXES: .dtb .dts .dtbo .dtso
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
