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

[Jared D. McNeill]

Module Name:    src
Committed By:   jmcneill
Date:           Wed Dec 13 13:52:13 UTC 2017

Modified Files:
        src/sys/arch/evbarm/conf: mk.exynos mk.sunxi mk.ti mk.vexpress

Log Message:
Revert compressed uimg change, it is causing problems with overlapping
$kernel_addr_r vs. kernel load address.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/mk.exynos
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/mk.sunxi
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/mk.ti
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/mk.vexpress

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.exynos
diff -u src/sys/arch/evbarm/conf/mk.exynos:1.3 src/sys/arch/evbarm/conf/mk.exynos:1.4
--- src/sys/arch/evbarm/conf/mk.exynos:1.3	Sat Dec  9 11:52:38 2017
+++ src/sys/arch/evbarm/conf/mk.exynos	Wed Dec 13 13:52:13 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: mk.exynos,v 1.3 2017/12/09 11:52:38 jmcneill Exp $
+#	$NetBSD: mk.exynos,v 1.4 2017/12/13 13:52:13 jmcneill Exp $
 
 .if !empty(MACHINE_ARCH:M*eb)
 EXTRA_LINKFLAGS+=	--be8
@@ -18,6 +18,7 @@ KERNEL_BASE_VIRT?=$(LOADADDRESS)
 MKUBOOTIMAGEARGS=	-A arm -T kernel -O linux
 MKUBOOTIMAGEARGS+=	-a $(KERNEL_BASE_PHYS) -e $(KERNEL_BASE_PHYS)
 MKUBOOTIMAGEARGS+=	-n "NetBSD/$(BOARDTYPE) ${_OSRELEASE}"
+MKUBOOTIMAGEARGS_NONE=	${MKUBOOTIMAGEARGS} -C none
 MKUBOOTIMAGEARGS_GZ=	${MKUBOOTIMAGEARGS} -C gz
 
 SYSTEM_LD_TAIL_EXTRA+=; \
@@ -25,10 +26,13 @@ SYSTEM_LD_TAIL_EXTRA+=; \
 	${OBJCOPY} -S -O binary $@ $@.bin; \
 	echo ${TOOL_GZIP} -9c $@.bin > $@.bin.gz; \
 	${TOOL_GZIP} -9c $@.bin > $@.bin.gz; \
-	echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.ub; \
-	${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.ub; \
+	echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.gz.ub; \
+	${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.gz.ub; \
+	echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_NONE} $@.bin $@.ub; \
+	${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_NONE} $@.bin $@.ub; \
 	echo
 
 EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin@}
-EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin.gz@}
 EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.ub@}
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin.gz@}
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.gz.ub@}

Index: src/sys/arch/evbarm/conf/mk.sunxi
diff -u src/sys/arch/evbarm/conf/mk.sunxi:1.4 src/sys/arch/evbarm/conf/mk.sunxi:1.5
--- src/sys/arch/evbarm/conf/mk.sunxi:1.4	Sat Dec  9 11:52:38 2017
+++ src/sys/arch/evbarm/conf/mk.sunxi	Wed Dec 13 13:52:13 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: mk.sunxi,v 1.4 2017/12/09 11:52:38 jmcneill Exp $
+#	$NetBSD: mk.sunxi,v 1.5 2017/12/13 13:52:13 jmcneill Exp $
 
 .if !empty(MACHINE_ARCH:M*eb)
 EXTRA_LINKFLAGS+=	--be8
@@ -14,16 +14,20 @@ _OSRELEASE!=		${HOST_SH} $S/conf/osrelea
 MKUBOOTIMAGEARGS=	-A arm -T kernel -O linux
 MKUBOOTIMAGEARGS+=	-a $(KERNEL_BASE_PHYS) -e $(KERNEL_BASE_PHYS)
 MKUBOOTIMAGEARGS+=	-n "NetBSD/$(BOARDTYPE) ${_OSRELEASE}"
+MKUBOOTIMAGEARGS_NONE=	${MKUBOOTIMAGEARGS} -C none
 MKUBOOTIMAGEARGS_GZ=	${MKUBOOTIMAGEARGS} -C gz
 
 SYSTEM_LD_TAIL_EXTRA+=; \
 	echo ${OBJCOPY} -S -O binary $@ $@.bin; \
 	${OBJCOPY} -S -O binary $@ $@.bin; \
+	echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_NONE} $@.bin $@.ub; \
+	${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_NONE} $@.bin $@.ub; \
 	echo ${TOOL_GZIP} -c $@.bin > $@.bin.gz; \
 	${TOOL_GZIP} -c $@.bin > $@.bin.gz; \
-	echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.ub; \
-	${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.ub
+	echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.gz.ub; \
+	${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.gz.ub
 
 EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin@}
-EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin.gz@}
 EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.ub@}
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin.gz@}
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.gz.ub@}

Index: src/sys/arch/evbarm/conf/mk.ti
diff -u src/sys/arch/evbarm/conf/mk.ti:1.2 src/sys/arch/evbarm/conf/mk.ti:1.3
--- src/sys/arch/evbarm/conf/mk.ti:1.2	Sat Dec  9 11:52:38 2017
+++ src/sys/arch/evbarm/conf/mk.ti	Wed Dec 13 13:52:13 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: mk.ti,v 1.2 2017/12/09 11:52:38 jmcneill Exp $
+#	$NetBSD: mk.ti,v 1.3 2017/12/13 13:52:13 jmcneill Exp $
 
 .if !empty(MACHINE_ARCH:M*eb)
 EXTRA_LINKFLAGS+=	--be8
@@ -17,16 +17,20 @@ _OSRELEASE!=		${HOST_SH} $S/conf/osrelea
 MKUBOOTIMAGEARGS=	-A arm -T kernel -O linux
 MKUBOOTIMAGEARGS+=	-a $(KERNEL_BASE_PHYS) -e $(KERNEL_BASE_PHYS)
 MKUBOOTIMAGEARGS+=	-n "NetBSD/$(BOARDTYPE) ${_OSRELEASE}"
+MKUBOOTIMAGEARGS_NONE=	${MKUBOOTIMAGEARGS} -C none
 MKUBOOTIMAGEARGS_GZ=	${MKUBOOTIMAGEARGS} -C gz
 
 SYSTEM_LD_TAIL_EXTRA+=; \
 	echo ${OBJCOPY} -S -O binary $@ $@.bin; \
 	${OBJCOPY} -S -O binary $@ $@.bin; \
+	echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_NONE} $@.bin $@.ub; \
+	${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_NONE} $@.bin $@.ub; \
 	echo ${TOOL_GZIP} -c $@.bin > $@.bin.gz; \
 	${TOOL_GZIP} -c $@.bin > $@.bin.gz; \
-	echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.ub; \
-	${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.ub
+	echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.gz.ub; \
+	${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.gz.ub
 
 EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin@}
-EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin.gz@}
 EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.ub@}
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin.gz@}
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.gz.ub@}

Index: src/sys/arch/evbarm/conf/mk.vexpress
diff -u src/sys/arch/evbarm/conf/mk.vexpress:1.5 src/sys/arch/evbarm/conf/mk.vexpress:1.6
--- src/sys/arch/evbarm/conf/mk.vexpress:1.5	Sat Dec  9 11:52:38 2017
+++ src/sys/arch/evbarm/conf/mk.vexpress	Wed Dec 13 13:52:13 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: mk.vexpress,v 1.5 2017/12/09 11:52:38 jmcneill Exp $
+#	$NetBSD: mk.vexpress,v 1.6 2017/12/13 13:52:13 jmcneill Exp $
 
 .if !empty(MACHINE_ARCH:M*eb)
 EXTRA_LINKFLAGS+=	--be8
@@ -15,6 +15,7 @@ KERNEL_BASE_VIRT?=$(LOADADDRESS)
 MKUBOOTIMAGEARGS=	-A arm -T kernel -O linux
 MKUBOOTIMAGEARGS+=	-a $(KERNEL_BASE_PHYS) -e $(KERNEL_BASE_PHYS)
 MKUBOOTIMAGEARGS+=	-n "NetBSD/$(BOARDTYPE) ${_OSRELEASE}"
+MKUBOOTIMAGEARGS_NONE=	${MKUBOOTIMAGEARGS} -C none
 MKUBOOTIMAGEARGS_GZ=	${MKUBOOTIMAGEARGS} -C gz
 
 SYSTEM_LD_TAIL_EXTRA+=; \
@@ -22,10 +23,13 @@ SYSTEM_LD_TAIL_EXTRA+=; \
 	${OBJCOPY} -S -O binary $@ $@.bin; \
 	echo ${TOOL_GZIP} -9c $@.bin > $@.bin.gz; \
 	${TOOL_GZIP} -9c $@.bin > $@.bin.gz; \
-	echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.ub; \
-	${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.ub; \
+	echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.gz.ub; \
+	${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.gz.ub; \
+	echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_NONE} $@.bin $@.ub; \
+	${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_NONE} $@.bin $@.ub; \
 	echo
 
 EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin@}
-EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin.gz@}
 EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.ub@}
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin.gz@}
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.gz.ub@}