Module Name: src
Committed By: skrll
Date: Thu Dec 14 06:29:15 UTC 2017
Modified Files:
src/distrib/evbarm/instkernel/instkernel: Makefile
src/distrib/utils/embedded/conf: rpi_inst.conf
Log Message:
Build fix (really this time) from Harold Gutch
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/distrib/evbarm/instkernel/instkernel/Makefile
cvs rdiff -u -r1.10 -r1.11 src/distrib/utils/embedded/conf/rpi_inst.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/evbarm/instkernel/instkernel/Makefile
diff -u src/distrib/evbarm/instkernel/instkernel/Makefile:1.29 src/distrib/evbarm/instkernel/instkernel/Makefile:1.30
--- src/distrib/evbarm/instkernel/instkernel/Makefile:1.29 Wed Dec 13 11:37:37 2017
+++ src/distrib/evbarm/instkernel/instkernel/Makefile Thu Dec 14 06:29:15 2017
@@ -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 @@ SSHRAMDISK= ${SSHRAMDISKDIR}/sshramdisk.
.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 @@ MDSETTARGETS+= ${i} ${RAMDISK} -
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= \
Index: src/distrib/utils/embedded/conf/rpi_inst.conf
diff -u src/distrib/utils/embedded/conf/rpi_inst.conf:1.10 src/distrib/utils/embedded/conf/rpi_inst.conf:1.11
--- src/distrib/utils/embedded/conf/rpi_inst.conf:1.10 Tue Nov 28 02:56:44 2017
+++ src/distrib/utils/embedded/conf/rpi_inst.conf Thu Dec 14 06:29:15 2017
@@ -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 @@ make_fstab() {
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 @@ EOF
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"
}
