Module Name: src
Committed By: msaitoh
Date: Fri Apr 11 08:31:56 UTC 2014
Modified Files:
src/distrib/evbppc/md-kernel [netbsd-6]: Makefile
src/sys/arch/evbppc/compile [netbsd-6]: walnut-mkimg.sh
src/sys/arch/evbppc/conf [netbsd-6]: Makefile.ev64260.inc
Makefile.obs405.inc Makefile.walnut.inc
Log Message:
Pull up following revision(s) (requested by joerg in ticket #1035):
distrib/evbppc/md-kernel/Makefile 1.4
sys/arch/evbppc/compile/walnut-mkimg.sh 1.5
sys/arch/evbppc/conf/Makefile.ev64260.inc 1.6-1.7
sys/arch/evbppc/conf/Makefile.obs405.inc 1.10-1.11
sys/arch/evbppc/conf/Makefile.walnut.inc 1.7-1.8
Use TOOL_* for cross compiling. Fixes buiild break on linux.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.46.1 src/distrib/evbppc/md-kernel/Makefile
cvs rdiff -u -r1.4 -r1.4.14.1 src/sys/arch/evbppc/compile/walnut-mkimg.sh
cvs rdiff -u -r1.5 -r1.5.14.1 src/sys/arch/evbppc/conf/Makefile.ev64260.inc
cvs rdiff -u -r1.6 -r1.6.14.1 src/sys/arch/evbppc/conf/Makefile.obs405.inc
cvs rdiff -u -r1.6 -r1.6.2.1 src/sys/arch/evbppc/conf/Makefile.walnut.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/evbppc/md-kernel/Makefile
diff -u src/distrib/evbppc/md-kernel/Makefile:1.3 src/distrib/evbppc/md-kernel/Makefile:1.3.46.1
--- src/distrib/evbppc/md-kernel/Makefile:1.3 Wed Aug 3 14:55:37 2005
+++ src/distrib/evbppc/md-kernel/Makefile Fri Apr 11 08:31:56 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/08/03 14:55:37 shige Exp $
+# $NetBSD: Makefile,v 1.3.46.1 2014/04/11 08:31:56 msaitoh Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -14,8 +14,8 @@ MDSET_RELEASEDIR= binary/kernel
MDSET_SUFFIXES.-= img create-img
create-img= \
- OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; export OBJDUMP OBJCOPY; \
- ${MKIMG} ${.TARGET:R} ${.TARGET}
+ OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${TOOL_STAT}; \
+ export OBJDUMP OBJCOPY STAT; ${MKIMG} ${.TARGET:R} ${.TARGET}
.include "${DISTRIBDIR}/common/Makefile.mdset"
Index: src/sys/arch/evbppc/compile/walnut-mkimg.sh
diff -u src/sys/arch/evbppc/compile/walnut-mkimg.sh:1.4 src/sys/arch/evbppc/compile/walnut-mkimg.sh:1.4.14.1
--- src/sys/arch/evbppc/compile/walnut-mkimg.sh:1.4 Sat Nov 6 16:23:35 2010
+++ src/sys/arch/evbppc/compile/walnut-mkimg.sh Fri Apr 11 08:31:56 2014
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: walnut-mkimg.sh,v 1.4 2010/11/06 16:23:35 uebayasi Exp $
+# $NetBSD: walnut-mkimg.sh,v 1.4.14.1 2014/04/11 08:31:56 msaitoh Exp $
# Convert an input to a TFTP image loadable by the IBM PowerPC OpenBIOS.
@@ -18,6 +18,7 @@ output=$1; shift
: ${OBJDUMP=objdump}
: ${OBJCOPY=objcopy}
+: ${STAT=stat}
file=$( file $input )
case $file in
@@ -36,7 +37,7 @@ case $file in
;;
esac
-size=`stat -f '%z' ${input}.bin.$$`
+size=$(${STAT} -f '%z' ${input}.bin.$$)
size=$(( ( $size + 511 ) / 512 ))
enc()
Index: src/sys/arch/evbppc/conf/Makefile.ev64260.inc
diff -u src/sys/arch/evbppc/conf/Makefile.ev64260.inc:1.5 src/sys/arch/evbppc/conf/Makefile.ev64260.inc:1.5.14.1
--- src/sys/arch/evbppc/conf/Makefile.ev64260.inc:1.5 Sat Oct 30 03:46:03 2010
+++ src/sys/arch/evbppc/conf/Makefile.ev64260.inc Fri Apr 11 08:31:56 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.ev64260.inc,v 1.5 2010/10/30 03:46:03 uebayasi Exp $
+# $NetBSD: Makefile.ev64260.inc,v 1.5.14.1 2014/04/11 08:31:56 msaitoh Exp $
MKIMG?= ${HOST_SH} ${THISPPC}/compile/walnut-mkimg.sh
@@ -9,5 +9,5 @@ SYSTEM_FIRST_SFILE= ${THISPPC}/${BOARDTY
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${MKIMG} $@ [email protected] ; \
- OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; export OBJDUMP OBJCOPY; \
- ${MKIMG} $@ [email protected]
+ OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${TOOL_STAT]; \
+ export OBJDUMP OBJCOPY STAT; ${MKIMG} $@ [email protected]
Index: src/sys/arch/evbppc/conf/Makefile.obs405.inc
diff -u src/sys/arch/evbppc/conf/Makefile.obs405.inc:1.6 src/sys/arch/evbppc/conf/Makefile.obs405.inc:1.6.14.1
--- src/sys/arch/evbppc/conf/Makefile.obs405.inc:1.6 Sat Oct 30 03:46:03 2010
+++ src/sys/arch/evbppc/conf/Makefile.obs405.inc Fri Apr 11 08:31:56 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.obs405.inc,v 1.6 2010/10/30 03:46:03 uebayasi Exp $
+# $NetBSD: Makefile.obs405.inc,v 1.6.14.1 2014/04/11 08:31:56 msaitoh Exp $
CFLAGS+=-mcpu=405
AFLAGS+=-mcpu=405
@@ -15,8 +15,8 @@ SYSTEM_FIRST_SFILE= ${THISPPC}/obs405/ob
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${MKIMG} $@ [email protected] ; \
- OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; export OBJDUMP OBJCOPY; \
- ${MKIMG} $@ [email protected]
+ OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${TOOL_STAT]; \
+ export OBJDUMP OBJCOPY STAT; ${MKIMG} $@ [email protected]
.elif ${PRDCTTYPE} == "obs266"
@@ -30,8 +30,8 @@ SYSTEM_FIRST_SFILE= ${POWERPC}/${PPCDIR}
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${MKIMG} $@ [email protected] ; \
- OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; export OBJDUMP OBJCOPY; \
- ${MKIMG} $@ [email protected]
+ OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${TOOL_STAT]; \
+ export OBJDUMP OBJCOPY STAT; ${MKIMG} $@ [email protected]
.elif ${PRDCTTYPE} == "obs600"
Index: src/sys/arch/evbppc/conf/Makefile.walnut.inc
diff -u src/sys/arch/evbppc/conf/Makefile.walnut.inc:1.6 src/sys/arch/evbppc/conf/Makefile.walnut.inc:1.6.2.1
--- src/sys/arch/evbppc/conf/Makefile.walnut.inc:1.6 Wed Feb 1 21:46:02 2012
+++ src/sys/arch/evbppc/conf/Makefile.walnut.inc Fri Apr 11 08:31:56 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.walnut.inc,v 1.6 2012/02/01 21:46:02 matt Exp $
+# $NetBSD: Makefile.walnut.inc,v 1.6.2.1 2014/04/11 08:31:56 msaitoh Exp $
MKIMG?= ${HOST_SH} ${THISPPC}/compile/walnut-mkimg.sh
CFLAGS+=-mcpu=403
@@ -10,5 +10,5 @@ SYSTEM_FIRST_SFILE= ${THISPPC}/walnut/wa
SYSTEM_LD_TAIL_EXTRA_EXTRA+=; \
echo ${MKIMG} $@ [email protected] ; \
- OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; export OBJDUMP OBJCOPY; \
- ${MKIMG} $@ [email protected]
+ OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${TOOL_STAT]; \
+ export OBJDUMP OBJCOPY STAT; ${MKIMG} $@ [email protected]
