[src/trunk]: src/sys/arch Move some stuff from evbppc's Makefile.inc to power...

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

details:   https://anonhg.NetBSD.org/src/rev/84eee28a1a66
branches:  trunk
changeset: 766519:84eee28a1a66
user:      matt <matt%NetBSD.org@localhost>
date:      Sat Jun 25 02:26:53 2011 +0000

description:
Move some stuff from evbppc's Makefile.inc to powerpc's.
This avoids redundant objcopy's

diffstat:

 sys/arch/evbppc/conf/Makefile.evbppc.inc |  44 +-------------------------------
 sys/arch/powerpc/conf/Makefile.powerpc   |  43 ++++++++++++++++++++++++++-----
 2 files changed, 37 insertions(+), 50 deletions(-)

diffs (115 lines):

diff -r 6ccd169baffd -r 84eee28a1a66 sys/arch/evbppc/conf/Makefile.evbppc.inc
--- a/sys/arch/evbppc/conf/Makefile.evbppc.inc  Sat Jun 25 00:42:57 2011 +0000
+++ b/sys/arch/evbppc/conf/Makefile.evbppc.inc  Sat Jun 25 02:26:53 2011 +0000
@@ -1,49 +1,7 @@
-#      $NetBSD: Makefile.evbppc.inc,v 1.7 2011/06/14 05:31:33 matt Exp $
+#      $NetBSD: Makefile.evbppc.inc,v 1.8 2011/06/25 02:26:53 matt Exp $
 
 CPPFLAGS += -D__${BOARDTYPE}__
 
 RAMDISKDIR!=   cd ${NETBSDSRCDIR}/distrib/${THISPPC:T}/ramdisk && ${PRINTOBJDIR}
 
-.if defined(NEED_MDSETIMAGE) && $(NEED_MDSETIMAGE) != "no" \
-    && exists(${RAMDISKDIR}/ramdisk.fs)
-SYSTEM_LD_TAIL_EXTRA+=; \
-       echo ${TOOL_MDSETIMAGE} -s $@ ${RAMDISKDIR}/ramdisk.fs; \
-       ${TOOL_MDSETIMAGE} -s $@ ${RAMDISKDIR}/ramdisk.fs
-.endif
-
-.if defined(NEED_SREC) && ${NEED_SREC} != "no"
-SYSTEM_LD_TAIL_EXTRA+=; \
-       echo ${STRIP} -O srec -o $@.srec $@; \
-       ${STRIP} -O srec -o $@.srec $@
-EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.srec@}
-.endif
-
-.if defined(NEED_BINARY) && ${NEED_BINARY} != "no"
-SYSTEM_LD_TAIL_EXTRA+=; \
-       echo ${OBJCOPY} -S -O binary $@ $@.bin; \
-       ${OBJCOPY} -S -O binary $@ $@.bin
-
-EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin@}
-
-.if defined(NEED_UBOOTIMAGE) && ${NEED_UBOOTIMAGE} != "no"
-_OSRELEASE!=           ${HOST_SH} $S/conf/osrelease.sh
-MKUBOOTIMAGEARGS=       -A powerpc -T kernel -C gz
-MKUBOOTIMAGEARGS+=      -a ${TEXTADDR:C/....$/0000/} -e $(TEXTADDR)
-MKUBOOTIMAGEARGS+=      -n "NetBSD/$(MACHINE) ${_OSRELEASE} ($(KERNEL_BUILD:T))"
-
-.if defined(USE_PIGZGZIP) && ${USE_PIGZGZIP} != "no"
-TOOL_GZIP?=            ${TOOL_PIGZ}
-.endif
-TOOL_GZIP?=            gzip
-SYSTEM_LD_TAIL_EXTRA+=; \
-       echo ${TOOL_GZIP} -9cn $@.bin '>' $@.bin.gz; \
-       ${TOOL_GZIP} -9cn $@.bin > $@.bin.gz; \
-       echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $@.bin.gz $@.ub; \
-       ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $@.bin.gz $@.ub
-
-EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin.gz@}
-EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.ub@}
-.endif
-.endif
-
 .-include "${THISPPC}/conf/Makefile.${BOARDTYPE}.inc"
diff -r 6ccd169baffd -r 84eee28a1a66 sys/arch/powerpc/conf/Makefile.powerpc
--- a/sys/arch/powerpc/conf/Makefile.powerpc    Sat Jun 25 00:42:57 2011 +0000
+++ b/sys/arch/powerpc/conf/Makefile.powerpc    Sat Jun 25 02:26:53 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.powerpc,v 1.46 2011/06/18 21:17:29 matt Exp $
+#      $NetBSD: Makefile.powerpc,v 1.47 2011/06/25 02:26:53 matt Exp $
 #
 # Makefile for NetBSD
 #
@@ -80,16 +80,45 @@
 
 ENTRYPOINT=    __start
 
-.if defined(NEED_SREC)
+.if defined(NEED_MDSETIMAGE) && $(NEED_MDSETIMAGE) != "no" \
+    && defined(RAMDISKDIR) && exists(${RAMDISKDIR}/ramdisk.fs)
 SYSTEM_LD_TAIL_EXTRA+=; \
-               echo ${OBJCOPY} -O srec $@ $@.srec; \
-               ${OBJCOPY} -O srec $@ $@.srec
+       echo ${TOOL_MDSETIMAGE} -s $@ ${RAMDISKDIR}/ramdisk.fs; \
+       ${TOOL_MDSETIMAGE} -s $@ ${RAMDISKDIR}/ramdisk.fs
+.endif
+
+.if defined(NEED_SREC) && ${NEED_SREC} != "no"
+SYSTEM_LD_TAIL_EXTRA+=; \
+       echo ${OBJCOPY} -O srec $@ $@.srec; \
+       ${OBJCOPY} -O srec $@ $@.srec
 .endif
 
-.if defined(NEED_BINARY)
+.if defined(NEED_BINARY) && ${NEED_BINARY} != "no"
 SYSTEM_LD_TAIL_EXTRA+=; \
-               echo ${OBJCOPY} -O binary $@ $@.bin; \
-               ${OBJCOPY} -O binary $@ $@.bin
+       echo ${OBJCOPY} -S -O binary $@ $@.bin; \
+       ${OBJCOPY} -S -O binary $@ $@.bin
+
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin@}
+
+.if defined(NEED_UBOOTIMAGE) && ${NEED_UBOOTIMAGE} != "no"
+_OSRELEASE!=           ${HOST_SH} $S/conf/osrelease.sh
+MKUBOOTIMAGEARGS=       -A powerpc -T kernel -C gz
+MKUBOOTIMAGEARGS+=      -a ${TEXTADDR:C/....$/0000/} -e $(TEXTADDR)
+MKUBOOTIMAGEARGS+=      -n "NetBSD/$(MACHINE) ${_OSRELEASE} ($(KERNEL_BUILD:T))"
+
+.if defined(USE_PIGZGZIP) && ${USE_PIGZGZIP} != "no"
+TOOL_GZIP?=            ${TOOL_PIGZ}
+.endif
+TOOL_GZIP?=            gzip
+SYSTEM_LD_TAIL_EXTRA+=; \
+       echo ${TOOL_GZIP} -9cn $@.bin '>' $@.bin.gz; \
+       ${TOOL_GZIP} -9cn $@.bin > $@.bin.gz; \
+       echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $@.bin.gz $@.ub; \
+       ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $@.bin.gz $@.ub
+
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin.gz@}
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.ub@}
+.endif
 .endif
 
 ##