? Makefile.kern.inc.diff
? dtc.mk
? dtc.sh
? ktrace.out
? mk
? tprof.out
Index: Makefile.kern.inc
===================================================================
RCS file: /cvsroot/src/sys/conf/Makefile.kern.inc,v
retrieving revision 1.258
diff -u -u -r1.258 Makefile.kern.inc
--- Makefile.kern.inc	17 Jun 2017 17:08:49 -0000	1.258
+++ Makefile.kern.inc	7 Sep 2017 16:51:37 -0000
@@ -537,14 +537,19 @@
 # Begin DTS handling
 
 DTSINC?=$S/external/gpl2/dts/dist/include
-DTSPATH?=$S/external/gpl2/dts/dist/arch/${MACHINE_CPU}/boot/dts
+.if !defined(DTSPATH)
+DTSPATH+=$S/external/gpl2/dts/dist/arch/${MACHINE_CPU}/boot/dts
+.if exists($S/external/gpl2/dts/dist/arch/${MACHINE_CPU}64/boot/dts)
+DTSPATH+=$S/external/gpl2/dts/dist/arch/${MACHINE_CPU}64/boot/dts
+.endif
+.endif
 DTSPADDING?=1024
 
 .SUFFIXES: .dtb .dts
 .dts.dtb:
-	${CPP} -P -xassembler-with-cpp -I ${DTSINC} -I ${DTSPATH} \
+	${CPP} -P -xassembler-with-cpp -I ${DTSINC} ${DTSPATH:@v@-I ${v}@} \
 	    -include ${.IMPSRC} /dev/null | \
-	${TOOL_DTC} -i ${DTSINC} -i ${DTSPATH} -I dts -O dtb \
+	${TOOL_DTC} -i ${DTSINC} ${DTSPATH:@v@-i ${v}@} -I dts -O dtb \
 	    -p ${DTSPADDING} -b 0 -o ${.TARGET}
 
 .PATH.dts: ${DTSPATH}