CVS commit: src/sys/arch/evbarm/conf

[Jared D. McNeill]

Module Name:    src
Committed By:   jmcneill
Date:           Wed Dec  4 11:25:04 UTC 2019

Modified Files:
        src/sys/arch/evbarm/conf: mk.generic64

Log Message:
Update arm64 image header in place


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/mk.generic64

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.generic64
diff -u src/sys/arch/evbarm/conf/mk.generic64:1.3 src/sys/arch/evbarm/conf/mk.generic64:1.4
--- src/sys/arch/evbarm/conf/mk.generic64:1.3	Sat Sep 29 17:05:55 2018
+++ src/sys/arch/evbarm/conf/mk.generic64	Wed Dec  4 11:25:04 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: mk.generic64,v 1.3 2018/09/29 17:05:55 jmcneill Exp $
+#	$NetBSD: mk.generic64,v 1.4 2019/12/04 11:25:04 jmcneill Exp $
 
 SYSTEM_FIRST_OBJ=	start.o
 SYSTEM_FIRST_SFILE=	${ARM}/aarch64/start.S
@@ -7,15 +7,15 @@ _OSRELEASE!=		${HOST_SH} $S/conf/osrelea
 
 BOARDTYPE=		evbarm64
 
-MKUBOOTIMAGEARGS=	-f arm64 -a 0x200000
+MKUBOOTIMAGEARGS=	-f arm64 -u -a 0x200000
 MKKNLIMG=		${THISARM}/compile/rpi-mkknlimg.sh
 
-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 ${MKKNLIMG} $@.ub $@.img; \
-	${HOST_SH} ${MKKNLIMG} $@.ub $@.img;
+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 ${MKKNLIMG} $@.ub $@.img && \
+	${HOST_SH} ${MKKNLIMG} $@.ub $@.img
 
 EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.img@}