[src/trunk]: src/sys/conf Add support for dts files outside of external/gpl2.

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/aed099f5e0ee
branches:  trunk
changeset: 355097:aed099f5e0ee
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Thu Jul 13 01:17:03 2017 +0000

description:
Add support for dts files outside of external/gpl2.

diffstat:

 sys/conf/Makefile.kern.inc |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (32 lines):

diff -r aa9eb3a3bf2e -r aed099f5e0ee sys/conf/Makefile.kern.inc
--- a/sys/conf/Makefile.kern.inc        Thu Jul 13 00:44:14 2017 +0000
+++ b/sys/conf/Makefile.kern.inc        Thu Jul 13 01:17:03 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.kern.inc,v 1.258 2017/06/17 17:08:49 christos Exp $
+#      $NetBSD: Makefile.kern.inc,v 1.259 2017/07/13 01:17:03 jmcneill Exp $
 #
 # This file contains common `MI' targets and definitions and it is included
 # at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -537,17 +537,18 @@
 # Begin DTS handling
 
 DTSINC?=$S/external/gpl2/dts/dist/include
-DTSPATH?=$S/external/gpl2/dts/dist/arch/${MACHINE_CPU}/boot/dts
+DTSGNUPATH?=$S/external/gpl2/dts/dist/arch/${MACHINE_CPU}/boot/dts
+DTSPATH?=$S/arch/${MACHINE_CPU}/dts
 DTSPADDING?=1024
 
 .SUFFIXES: .dtb .dts
 .dts.dtb:
-       ${CPP} -P -xassembler-with-cpp -I ${DTSINC} -I ${DTSPATH} \
+       ${CPP} -P -xassembler-with-cpp -I ${DTSINC} -I ${DTSPATH} -I ${DTSGNUPATH} \
            -include ${.IMPSRC} /dev/null | \
-       ${TOOL_DTC} -i ${DTSINC} -i ${DTSPATH} -I dts -O dtb \
+       ${TOOL_DTC} -i ${DTSINC} -i ${DTSPATH} -i ${DTSGNUPATH} -I dts -O dtb \
            -p ${DTSPADDING} -b 0 -o ${.TARGET}
 
-.PATH.dts: ${DTSPATH}
+.PATH.dts: ${DTSPATH} ${DTSGNUPATH}
 
 DTB= ${DTS:.dts=.dtb}
 all: ${DTB}