Module Name:    src
Committed By:   uebayasi
Date:           Sat Oct 30 03:46:03 UTC 2010

Modified Files:
        src/sys/arch/evbppc/conf: Makefile.ev64260.inc Makefile.explora.inc
            Makefile.obs405.inc Makefile.walnut.inc

Log Message:
Handle kernel file names other than "netbsd".


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbppc/conf/Makefile.ev64260.inc \
    src/sys/arch/evbppc/conf/Makefile.explora.inc \
    src/sys/arch/evbppc/conf/Makefile.walnut.inc
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbppc/conf/Makefile.obs405.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/evbppc/conf/Makefile.ev64260.inc
diff -u src/sys/arch/evbppc/conf/Makefile.ev64260.inc:1.4 src/sys/arch/evbppc/conf/Makefile.ev64260.inc:1.5
--- src/sys/arch/evbppc/conf/Makefile.ev64260.inc:1.4	Thu Nov 24 12:54:29 2005
+++ src/sys/arch/evbppc/conf/Makefile.ev64260.inc	Sat Oct 30 03:46:03 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.ev64260.inc,v 1.4 2005/11/24 12:54:29 dbj Exp $
+#	$NetBSD: Makefile.ev64260.inc,v 1.5 2010/10/30 03:46:03 uebayasi Exp $
 
 MKIMG?=	${HOST_SH} ${THISPPC}/compile/walnut-mkimg.sh
 
@@ -8,6 +8,6 @@
 SYSTEM_FIRST_SFILE=	${THISPPC}/${BOARDTYPE}/${BOARDTYPE}_locore.S
 
 SYSTEM_LD_TAIL_EXTRA+=; \
-	echo ${MKIMG} netbsd netbsd.img ; \
+	echo ${MKIMG} $@ [email protected] ; \
 	OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; export OBJDUMP OBJCOPY; \
 		${MKIMG} $@ [email protected]
Index: src/sys/arch/evbppc/conf/Makefile.explora.inc
diff -u src/sys/arch/evbppc/conf/Makefile.explora.inc:1.4 src/sys/arch/evbppc/conf/Makefile.explora.inc:1.5
--- src/sys/arch/evbppc/conf/Makefile.explora.inc:1.4	Thu Nov 24 12:54:29 2005
+++ src/sys/arch/evbppc/conf/Makefile.explora.inc	Sat Oct 30 03:46:03 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.explora.inc,v 1.4 2005/11/24 12:54:29 dbj Exp $
+#	$NetBSD: Makefile.explora.inc,v 1.5 2010/10/30 03:46:03 uebayasi Exp $
 
 CFLAGS+=-mcpu=403
 AFLAGS+=-mcpu=403
@@ -7,5 +7,5 @@
 SYSTEM_FIRST_SFILE=	${THISPPC}/explora/explora_start.S
 
 SYSTEM_LD_TAIL_EXTRA+=; \
-	echo ${OBJCOPY} --adjust-vma 0x81000000 netbsd netbsd.img ; \
-	${OBJCOPY} --adjust-vma 0x81000000 netbsd netbsd.img
+	echo ${OBJCOPY} --adjust-vma 0x81000000 $@ [email protected] ; \
+	${OBJCOPY} --adjust-vma 0x81000000 $@ [email protected]
Index: src/sys/arch/evbppc/conf/Makefile.walnut.inc
diff -u src/sys/arch/evbppc/conf/Makefile.walnut.inc:1.4 src/sys/arch/evbppc/conf/Makefile.walnut.inc:1.5
--- src/sys/arch/evbppc/conf/Makefile.walnut.inc:1.4	Thu Nov 24 12:54:29 2005
+++ src/sys/arch/evbppc/conf/Makefile.walnut.inc	Sat Oct 30 03:46:03 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.walnut.inc,v 1.4 2005/11/24 12:54:29 dbj Exp $
+#	$NetBSD: Makefile.walnut.inc,v 1.5 2010/10/30 03:46:03 uebayasi Exp $
 
 MKIMG?=	${HOST_SH} ${THISPPC}/compile/walnut-mkimg.sh
 CFLAGS+=-mcpu=403
@@ -9,6 +9,6 @@
 SYSTEM_FIRST_SFILE=	${THISPPC}/walnut/walnut_start.S
 
 SYSTEM_LD_TAIL_EXTRA+=; \
-	echo ${MKIMG} netbsd netbsd.img ; \
+	echo ${MKIMG} $@ [email protected] ; \
 	OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; export OBJDUMP OBJCOPY; \
 		${MKIMG} $@ [email protected]

Index: src/sys/arch/evbppc/conf/Makefile.obs405.inc
diff -u src/sys/arch/evbppc/conf/Makefile.obs405.inc:1.5 src/sys/arch/evbppc/conf/Makefile.obs405.inc:1.6
--- src/sys/arch/evbppc/conf/Makefile.obs405.inc:1.5	Thu Mar 18 14:15:38 2010
+++ src/sys/arch/evbppc/conf/Makefile.obs405.inc	Sat Oct 30 03:46:03 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.obs405.inc,v 1.5 2010/03/18 14:15:38 kiyohara Exp $
+#	$NetBSD: Makefile.obs405.inc,v 1.6 2010/10/30 03:46:03 uebayasi Exp $
 
 CFLAGS+=-mcpu=405
 AFLAGS+=-mcpu=405
@@ -14,7 +14,7 @@
 SYSTEM_FIRST_SFILE=	${THISPPC}/obs405/obs200_locore.S
 
 SYSTEM_LD_TAIL_EXTRA+=; \
-	echo ${MKIMG} netbsd netbsd.img ; \
+	echo ${MKIMG} $@ [email protected] ; \
 	OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; export OBJDUMP OBJCOPY; \
 		${MKIMG} $@ [email protected]
 
@@ -29,7 +29,7 @@
 SYSTEM_FIRST_SFILE=	${POWERPC}/${PPCDIR}/openbios/locore.S
 
 SYSTEM_LD_TAIL_EXTRA+=; \
-	echo ${MKIMG} netbsd netbsd.img ; \
+	echo ${MKIMG} $@ [email protected] ; \
 	OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; export OBJDUMP OBJCOPY; \
 		${MKIMG} $@ [email protected]
 

Reply via email to