d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Turns out this .if evaluated not in the context of the makedtb target

Browse Source 
sometimes due to Makefile expansion rules. Make the test for things
being NULL elsewhere...
This commit is contained in:
Warner Losh 2014-04-30 20:47:40 +00:00
parent 51ad63daae
commit 56d78e82f0
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.inc1
View File

@ -1830,9 +1830,6 @@ DTBOUTPUTPATH= ${.CURDIR}
# Build 'standalone' Device Tree Blob # Build 'standalone' Device Tree Blob
# #
builddtb: builddtb:
.if !defined(FDT_DTS_FILE)
.error "FDT_DTS_FILE must be specified!"
.endif
@PATH=${TMPPATH} MACHINE=${TARGET} \ @PATH=${TMPPATH} MACHINE=${TARGET} \
${.CURDIR}/sys/tools/fdt/make_dtb.sh ${.CURDIR}/sys \ ${.CURDIR}/sys/tools/fdt/make_dtb.sh ${.CURDIR}/sys \
"${FDT_DTS_FILE}" ${DTBOUTPUTPATH} "${FDT_DTS_FILE}" ${DTBOUTPUTPATH}

5
sys/tools/fdt/make_dtb.sh
View File

@ -7,6 +7,11 @@ S=$1
dts="$2" dts="$2"
dtb_path=$3 dtb_path=$3
if [ -n "$dts" ]; then
echo "No DTS specified"
exit 1
fi
for d in ${dts}; do for d in ${dts}; do
dtb=${dtb_path}/`basename $d .dts`.dtb dtb=${dtb_path}/`basename $d .dts`.dtb
echo "converting $d -> $dtb" echo "converting $d -> $dtb"