Module Name: src
Committed By: matt
Date: Thu Feb 16 08:08:25 UTC 2012
Modified Files:
src/sys/arch/evbarm/conf: Makefile.evbarm.inc
Log Message:
If we are building an INSTALL kernel and the ramdisk.fs exists in the object
tree, insert it into the kernel. This needs to be done before the board
frag so it written into the kernel before the uboot images are created.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbarm/conf/Makefile.evbarm.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/conf/Makefile.evbarm.inc
diff -u src/sys/arch/evbarm/conf/Makefile.evbarm.inc:1.21 src/sys/arch/evbarm/conf/Makefile.evbarm.inc:1.22
--- src/sys/arch/evbarm/conf/Makefile.evbarm.inc:1.21 Sun Mar 6 02:22:27 2011
+++ src/sys/arch/evbarm/conf/Makefile.evbarm.inc Thu Feb 16 08:08:25 2012
@@ -1,4 +1,18 @@
-# $NetBSD: Makefile.evbarm.inc,v 1.21 2011/03/06 02:22:27 jakllsch Exp $
+# $NetBSD: Makefile.evbarm.inc,v 1.22 2012/02/16 08:08:25 matt Exp $
+
+#
+# If this is a install kernel and the ramdisk image exists in the object
+# tree, insert it into the kernel *before* we make the u-boot images.
+#
+.if ${KERNEL_BUILD:T:M*INSTALL} != ""
+RAMDISKDIR!= cd ${NETBSDSRCDIR}/distrib/${THISARM:T}/instkernel/ramdisk && ${PRINTOBJDIR}
+
+.if exists(${RAMDISKDIR}/ramdisk.fs)
+SYSTEM_LD_TAIL_EXTRA+=; \
+ echo ${TOOL_MDSETIMAGE} -s $@ ${RAMDISKDIR}/ramdisk.fs; \
+ ${TOOL_MDSETIMAGE} -s $@ ${RAMDISKDIR}/ramdisk.fs
+.endif
+.endif
.if defined(BOARDMKFRAG) # Must be a full pathname.
.include "${BOARDMKFRAG}"
