Module Name: src
Committed By: christos
Date: Sat Jul 15 15:53:48 UTC 2017
Modified Files:
src/sys/conf: dts.mk
Log Message:
do dts depend processing in two passes, one for /include/ and one for #include
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/conf/dts.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/dts.mk
diff -u src/sys/conf/dts.mk:1.1 src/sys/conf/dts.mk:1.2
--- src/sys/conf/dts.mk:1.1 Sat Jul 15 11:20:52 2017
+++ src/sys/conf/dts.mk Sat Jul 15 11:53:48 2017
@@ -1,4 +1,4 @@
-# $NetBSD: dts.mk,v 1.1 2017/07/15 15:20:52 christos Exp $
+# $NetBSD: dts.mk,v 1.2 2017/07/15 15:53:48 christos Exp $
DTSINC?=$S/external/gpl2/dts/dist/include
DTSGNUPATH?=$S/external/gpl2/dts/dist/arch/${MACHINE_CPU}/boot/dts
@@ -8,9 +8,17 @@ DTSPADDING?=1024
.SUFFIXES: .dtd .dtb .dts
.dts.dtd:
+ (${CPP} -P -xassembler-with-cpp -I ${DTSINC} -I ${DTSPATH} \
+ -I ${DTSGNUPATH} -include ${.IMPSRC} /dev/null | \
${TOOL_DTC} -i ${DTSINC} -i ${DTSPATH} -i ${DTSGNUPATH} -I dts -O dtb \
- -p ${DTSPADDING} -b 0 -o /dev/null -d /dev/stdout ${.IMPSRC} | \
- ${TOOL_SED} -e 's@/dev/null@${.TARGET:.dtd=.dtb}@' > ${.TARGET}
+ -p ${DTSPADDING} -b 0 -o /dev/null -d /dev/stdout | \
+ ${TOOL_SED} -e 's@/dev/null@${.TARGET:.dtd=.dtb}@' \
+ -e 's@<stdin>@${.IMPSRC}@' && \
+ ${CPP} -P -xassembler-with-cpp -I ${DTSINC} -I ${DTSPATH} \
+ -I ${DTSGNUPATH} -include ${.IMPSRC} -M /dev/null | \
+ ${TOOL_SED} -e '[email protected]@${.TARGET:.dtd=.dtb}@' \
+ -e 's@/dev/null@@') > ${.TARGET}
+
.dts.dtb:
${CPP} -P -xassembler-with-cpp -I ${DTSINC} -I ${DTSPATH} \
