Module Name: src
Committed By: matt
Date: Sat Jun 25 02:26:53 UTC 2011
Modified Files:
src/sys/arch/evbppc/conf: Makefile.evbppc.inc
src/sys/arch/powerpc/conf: Makefile.powerpc
Log Message:
Move some stuff from evbppc's Makefile.inc to powerpc's.
This avoids redundant objcopy's
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbppc/conf/Makefile.evbppc.inc
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/powerpc/conf/Makefile.powerpc
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/evbppc/conf/Makefile.evbppc.inc
diff -u src/sys/arch/evbppc/conf/Makefile.evbppc.inc:1.7 src/sys/arch/evbppc/conf/Makefile.evbppc.inc:1.8
--- src/sys/arch/evbppc/conf/Makefile.evbppc.inc:1.7 Tue Jun 14 05:31:33 2011
+++ src/sys/arch/evbppc/conf/Makefile.evbppc.inc Sat Jun 25 02:26:53 2011
@@ -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"
Index: src/sys/arch/powerpc/conf/Makefile.powerpc
diff -u src/sys/arch/powerpc/conf/Makefile.powerpc:1.46 src/sys/arch/powerpc/conf/Makefile.powerpc:1.47
--- src/sys/arch/powerpc/conf/Makefile.powerpc:1.46 Sat Jun 18 21:17:29 2011
+++ src/sys/arch/powerpc/conf/Makefile.powerpc Sat Jun 25 02:26:53 2011
@@ -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_BINARY)
+.if defined(NEED_SREC) && ${NEED_SREC} != "no"
SYSTEM_LD_TAIL_EXTRA+=; \
- echo ${OBJCOPY} -O binary $@ $@.bin; \
- ${OBJCOPY} -O binary $@ $@.bin
+ echo ${OBJCOPY} -O srec $@ $@.srec; \
+ ${OBJCOPY} -O srec $@ $@.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
##
