[src/trunk]: src/distrib Build fix (really this time) from Harold Gutch

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

details:   https://anonhg.NetBSD.org/src/rev/53b84b6cc398
branches:  trunk
changeset: 358146:53b84b6cc398
user:      skrll <skrll%NetBSD.org@localhost>
date:      Thu Dec 14 06:29:15 2017 +0000

description:
Build fix (really this time) from Harold Gutch

diffstat:

 distrib/evbarm/instkernel/instkernel/Makefile |   8 ++++----
 distrib/utils/embedded/conf/rpi_inst.conf     |  10 ++++++++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diffs (66 lines):

diff -r 4eda4b857d80 -r 53b84b6cc398 distrib/evbarm/instkernel/instkernel/Makefile
--- a/distrib/evbarm/instkernel/instkernel/Makefile     Thu Dec 14 05:48:59 2017 +0000
+++ b/distrib/evbarm/instkernel/instkernel/Makefile     Thu Dec 14 06:29:15 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.29 2017/12/13 11:37:37 skrll Exp $
+#      $NetBSD: Makefile,v 1.30 2017/12/14 06:29:15 skrll Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -11,11 +11,10 @@
 .include "${NETBSDSRCDIR}/etc/etc.evbarm/Makefile.inc"
 
 MDSETTARGETS=
-MDSET_SUFFIXES.-=      srec create-srec  bin create-bin
 .for i in ${BUILD_KERNELS:M*_INSTALL}
 .if ${i} == "RPI_INSTALL" || ${i} == "RPI2_INSTALL"
-MDSETTARGETS+=         ${i}    ${SSHRAMDISK}   -
-MDSET_SUFFIXES.${i}=   img create-img
+MDSETTARGETS+=         ${i}    ${SSHRAMDISK}   netbsd-${i}
+MDSET_SUFFIXES.netbsd-${i}=    bin create-bin  img create-img
 .else
 MDSETTARGETS+=         ${i}    ${RAMDISK}      -
 .endif
@@ -23,6 +22,7 @@
 
 MDSET_RELEASEDIR=      installation/instkernel
 
+MDSET_SUFFIXES.-=      srec create-srec  bin create-bin
 create-srec=           ${OBJCOPY} -O srec ${.TARGET:R} ${.TARGET}
 create-bin=            ${OBJCOPY} -O binary ${.TARGET:R} ${.TARGET}
 create-img=    \
diff -r 4eda4b857d80 -r 53b84b6cc398 distrib/utils/embedded/conf/rpi_inst.conf
--- a/distrib/utils/embedded/conf/rpi_inst.conf Thu Dec 14 05:48:59 2017 +0000
+++ b/distrib/utils/embedded/conf/rpi_inst.conf Thu Dec 14 06:29:15 2017 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: rpi_inst.conf,v 1.10 2017/11/28 02:56:44 kre Exp $
+# $NetBSD: rpi_inst.conf,v 1.11 2017/12/14 06:29:15 skrll Exp $
 # Raspberry Pi customization script used by mkimage
 #
 
 board=rpi_inst
-kernel=$src/sys/arch/evbarm/compile/RPI/netbsd-RPI_INSTALL.bin
+kerneldir=${KERNOBJDIR}/RPI_INSTALL
+kernel=$kerneldir/netbsd-RPI_INSTALL.img
 
 . ${DIR}/conf/evbarm.conf
 
@@ -75,6 +76,7 @@
 
 firmwaredir=$src/external/broadcom/rpi-firmware/dist
 firmwarefiles="LICENCE.broadcom bootcode.bin fixup.dat fixup_cd.dat start.elf start_cd.elf"
+dtbs="$(${MAKE} -C ${kerneldir} -v DTB)"
 
 populate() {
        cat > ${mnt}/boot/cmdline.txt << EOF
@@ -110,6 +112,10 @@
                        echo " $f"
                        cp ${firmwaredir}/${f} . || exit 1
                done
+               for f in ${dtbs}; do
+                       echo " $f"
+                       cp ${kerneldir}/${f} . || exit 1
+               done
        ) || fail "Copy of firmware to ${mnt}/boot failed"
 
 }