Module Name: src
Committed By: matt
Date: Tue Mar 18 06:23:45 UTC 2014
Modified Files:
src/sys/arch/evbarm/conf: mk.armadaxp mk.marvell
Log Message:
Don't replicate most of mk.marvell in mk.armadaxp
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/mk.armadaxp
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/mk.marvell
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/evbarm/conf/mk.armadaxp
diff -u src/sys/arch/evbarm/conf/mk.armadaxp:1.2 src/sys/arch/evbarm/conf/mk.armadaxp:1.3
--- src/sys/arch/evbarm/conf/mk.armadaxp:1.2 Wed May 29 23:50:35 2013
+++ src/sys/arch/evbarm/conf/mk.armadaxp Tue Mar 18 06:23:45 2014
@@ -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"
Index: src/sys/arch/evbarm/conf/mk.marvell
diff -u src/sys/arch/evbarm/conf/mk.marvell:1.4 src/sys/arch/evbarm/conf/mk.marvell:1.5
--- src/sys/arch/evbarm/conf/mk.marvell:1.4 Fri Aug 10 02:46:51 2012
+++ src/sys/arch/evbarm/conf/mk.marvell Tue Mar 18 06:23:45 2014
@@ -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
