diff options
| author | Kyle Evans <kevans@FreeBSD.org> | 2019-05-02 16:56:03 +0000 |
|---|---|---|
| committer | Kyle Evans <kevans@FreeBSD.org> | 2019-05-02 16:56:03 +0000 |
| commit | 2de4a7aa2100b947fc5d75f500e75ccbecbc82ec (patch) | |
| tree | c5ede43a9820f57990a767e4e320345ae6b33ea4 | |
| parent | b96fbd3cf3a65772b757ba3683f9843300fccc52 (diff) | |
| download | src-2de4a7aa2100b947fc5d75f500e75ccbecbc82ec.tar.gz src-2de4a7aa2100b947fc5d75f500e75ccbecbc82ec.zip | |
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
Notes
Notes:
svn path=/head/; revision=347021
| -rw-r--r-- | sys/conf/dtb.build.mk | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/sys/conf/dtb.build.mk b/sys/conf/dtb.build.mk index 33a6413e0521..140440336cad 100644 --- a/sys/conf/dtb.build.mk +++ b/sys/conf/dtb.build.mk @@ -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 |