[src/trunk]: src/sys/arch/evbarm/conf Don't replicate most of mk.marvell in m...

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

details:   https://anonhg.NetBSD.org/src/rev/4988bf419f3a
branches:  trunk
changeset: 327824:4988bf419f3a
user:      matt <matt%NetBSD.org@localhost>
date:      Tue Mar 18 06:23:45 2014 +0000

description:
Don't replicate most of mk.marvell in mk.armadaxp

diffstat:

 sys/arch/evbarm/conf/mk.armadaxp |  19 ++-----------------
 sys/arch/evbarm/conf/mk.marvell  |   6 +++---
 2 files changed, 5 insertions(+), 20 deletions(-)

diffs (46 lines):

diff -r 02a30f5ac308 -r 4988bf419f3a sys/arch/evbarm/conf/mk.armadaxp
--- a/sys/arch/evbarm/conf/mk.armadaxp  Tue Mar 18 06:17:55 2014 +0000
+++ b/sys/arch/evbarm/conf/mk.armadaxp  Tue Mar 18 06:23:45 2014 +0000
@@ -1,26 +1,11 @@
 #
-#      $NetBSD: mk.armadaxp,v 1.2 2013/05/29 23:50:35 rkujawa Exp $
+#      $NetBSD: mk.armadaxp,v 1.3 2014/03/18 06:23:45 matt Exp $
 #
 
 SYSTEM_FIRST_OBJ=      armadaxp_start.o
 SYSTEM_FIRST_SFILE=    ${THISARM}/armadaxp/armadaxp_start.S
 
-_OSRELEASE!=           ${HOST_SH} $S/conf/osrelease.sh
-
 KERNEL_BASE_PHYS=0x00200000
 KERNEL_BASE_VIRT=0xc0200000
 
-MKUBOOTIMAGEARGS=      -A arm -T kernel
-MKUBOOTIMAGEARGS+=     -a $(KERNEL_BASE_PHYS)
-MKUBOOTIMAGEARGS+=     -n "NetBSD/$(BOARDTYPE) ${_OSRELEASE}"
-MKUBOOTIMAGEARGS_NONE= ${MKUBOOTIMAGEARGS} -C none
-
-SYSTEM_LD_TAIL_EXTRA+=; \
-       echo ${OBJCOPY} -S -O binary $@ $@.bin; \
-       ${OBJCOPY} -S -O binary $@ $@.bin; \
-       echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $@.bin $@.ub; \
-       ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $@.bin $@.ub; \
-       echo
-
-EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin@}
-EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.ub@}
+.include "${THISARM}/conf/mk.marvell"
diff -r 02a30f5ac308 -r 4988bf419f3a sys/arch/evbarm/conf/mk.marvell
--- a/sys/arch/evbarm/conf/mk.marvell   Tue Mar 18 06:17:55 2014 +0000
+++ b/sys/arch/evbarm/conf/mk.marvell   Tue Mar 18 06:23:45 2014 +0000
@@ -1,7 +1,7 @@
-#      $NetBSD: mk.marvell,v 1.4 2012/08/10 02:46:51 matt Exp $
+#      $NetBSD: mk.marvell,v 1.5 2014/03/18 06:23:45 matt Exp $
 
-SYSTEM_FIRST_OBJ=      marvell_start.o
-SYSTEM_FIRST_SFILE=    ${THISARM}/marvell/marvell_start.S
+SYSTEM_FIRST_OBJ?=     marvell_start.o
+SYSTEM_FIRST_SFILE?=   ${THISARM}/marvell/marvell_start.S
 
 _OSRELEASE!=           ${HOST_SH} $S/conf/osrelease.sh