[src/trunk]: src/sys/arch/evbarm/conf Add RAMDISKNAME to allow a config to ov...

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

details:   https://anonhg.NetBSD.org/src/rev/f50f68c9d4e0
branches:  trunk
changeset: 787675:f50f68c9d4e0
user:      matt <matt%NetBSD.org@localhost>
date:      Fri Jun 28 05:59:38 2013 +0000

description:
Add RAMDISKNAME to allow a config to override the default name (ramdisk).

diffstat:

 sys/arch/evbarm/conf/Makefile.evbarm.inc |  21 +++++++--------------
 1 files changed, 7 insertions(+), 14 deletions(-)

diffs (35 lines):

diff -r bd1e20a2d7e4 -r f50f68c9d4e0 sys/arch/evbarm/conf/Makefile.evbarm.inc
--- a/sys/arch/evbarm/conf/Makefile.evbarm.inc  Fri Jun 28 05:58:57 2013 +0000
+++ b/sys/arch/evbarm/conf/Makefile.evbarm.inc  Fri Jun 28 05:59:38 2013 +0000
@@ -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