Module Name: src
Committed By: matt
Date: Fri Jun 28 05:59:38 UTC 2013
Modified Files:
src/sys/arch/evbarm/conf: Makefile.evbarm.inc
Log Message:
Add RAMDISKNAME to allow a config to override the default name (ramdisk).
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 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.23 src/sys/arch/evbarm/conf/Makefile.evbarm.inc:1.24
--- src/sys/arch/evbarm/conf/Makefile.evbarm.inc:1.23 Tue Mar 19 22:16:54 2013
+++ src/sys/arch/evbarm/conf/Makefile.evbarm.inc Fri Jun 28 05:59:38 2013
@@ -1,24 +1,17 @@
-# $NetBSD: Makefile.evbarm.inc,v 1.23 2013/03/19 22:16:54 garbled Exp $
+# $NetBSD: Makefile.evbarm.inc,v 1.24 2013/06/28 05:59:38 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:MRPI_INSTALL} != ""
-RAMDISKDIR!= cd ${NETBSDSRCDIR}/distrib/${THISARM:T}/instkernel/sshramdisk && ${PRINTOBJDIR}
+RAMDISKNAME?= ramdisk
+.if ${KERNEL_BUILD:T:M*INSTALL} != ""
+RAMDISKDIR!= cd ${NETBSDSRCDIR}/distrib/${THISARM:T}/instkernel/${RAMDISKNAME} && ${PRINTOBJDIR}
-.if exists(${RAMDISKDIR}/sshramdisk.fs)
+.if exists(${RAMDISKDIR}/${RAMDISKNAME}.fs)
SYSTEM_LD_TAIL_EXTRA+=; \
- echo ${TOOL_MDSETIMAGE} -s $@ ${RAMDISKDIR}/sshramdisk.fs; \
- ${TOOL_MDSETIMAGE} -s $@ ${RAMDISKDIR}/sshramdisk.fs
-.endif
-.elif ${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
+ echo ${TOOL_MDSETIMAGE} -s $@ ${RAMDISKDIR}/${RAMDISKNAME}.fs; \
+ ${TOOL_MDSETIMAGE} -s $@ ${RAMDISKDIR}/${RAMDISKNAME}.fs
.endif
.endif
