fdt: stop installing FDT_DTS_FILE
r346307 inadvertently started installing FDT_DTS_FILE along with the kernel. While this isn't necessarily bad, it was not intended or discussed and it actively breaks some current setups that don't anticipate any .dtb being installed when it's using static fdt. This change could be reconsidered down the line, but it needs to be done with prior discussion. Fix it by pushing FDT_DTS_FILE build down into the raw dtb.build.mk bits. This technically allows modules building DTS to accidentally specify an FDT_DTS_FILE that gets built but isn't otherwise useful (since it's not installed), but I suspect this isn't a big deal and would get caught with any kind of testing -- and perhaps this might end up useful in some other way, for example by some module wanting to embed fdt in some other way than our current/normal mechanism. Reported by: Mori Hiroki <yamori813@yahoo.co.jp> MFC after: 3 days X-MFC-With: r346307
This commit is contained in:
parent
151f0ca897
commit
af44a26351
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=346618
@ -43,7 +43,7 @@ DTBO=${DTSO:T:R:S/$/.dtbo/}
|
||||
|
||||
# Add dependencies on the source file so that out-of-tree things can be included
|
||||
# without any .PATH additions.
|
||||
.for _dts in ${DTS}
|
||||
.for _dts in ${DTS} ${FDT_DTS_FILE}
|
||||
${_dts:R:T}.dtb: ${_dts}
|
||||
.endfor
|
||||
|
||||
|
@ -8,10 +8,7 @@
|
||||
# should be defined in the kern.pre.mk so that port makefiles can
|
||||
# override or augment them.
|
||||
|
||||
.if !empty(FDT_DTS_FILE)
|
||||
DTS+= ${FDT_DTS_FILE}
|
||||
.endif
|
||||
.if defined(DTS) || defined(DTSO)
|
||||
.if defined(DTS) || defined(DTSO) || defined(FDT_DTS_FILE)
|
||||
.include "dtb.build.mk"
|
||||
|
||||
KERNEL_EXTRA+= ${DTB} ${DTBO}
|
||||
|
Loading…
Reference in New Issue
Block a user