[src/trunk]: src/sys/arch/evbarm/conf Revert compressed uimg change, it is ca...

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

details:   https://anonhg.NetBSD.org/src/rev/cccf81851e6a
branches:  trunk
changeset: 358130:cccf81851e6a
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Wed Dec 13 13:52:13 2017 +0000

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

diffstat:

 sys/arch/evbarm/conf/mk.exynos   |  12 ++++++++----
 sys/arch/evbarm/conf/mk.sunxi    |  12 ++++++++----
 sys/arch/evbarm/conf/mk.ti       |  12 ++++++++----
 sys/arch/evbarm/conf/mk.vexpress |  12 ++++++++----
 4 files changed, 32 insertions(+), 16 deletions(-)

diffs (134 lines):

diff -r 3a90c248b52e -r cccf81851e6a sys/arch/evbarm/conf/mk.exynos
--- a/sys/arch/evbarm/conf/mk.exynos    Wed Dec 13 13:03:23 2017 +0000
+++ b/sys/arch/evbarm/conf/mk.exynos    Wed Dec 13 13:52:13 2017 +0000
@@ -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 @@
 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 @@
        ${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.}.ub@}
 EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin.gz@}
-EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.ub@}
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.gz.ub@}
diff -r 3a90c248b52e -r cccf81851e6a sys/arch/evbarm/conf/mk.sunxi
--- a/sys/arch/evbarm/conf/mk.sunxi     Wed Dec 13 13:03:23 2017 +0000
+++ b/sys/arch/evbarm/conf/mk.sunxi     Wed Dec 13 13:52:13 2017 +0000
@@ -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 @@
 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.}.ub@}
 EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin.gz@}
-EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.ub@}
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.gz.ub@}
diff -r 3a90c248b52e -r cccf81851e6a sys/arch/evbarm/conf/mk.ti
--- a/sys/arch/evbarm/conf/mk.ti        Wed Dec 13 13:03:23 2017 +0000
+++ b/sys/arch/evbarm/conf/mk.ti        Wed Dec 13 13:52:13 2017 +0000
@@ -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 @@
 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.}.ub@}
 EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin.gz@}
-EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.ub@}
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.gz.ub@}
diff -r 3a90c248b52e -r cccf81851e6a sys/arch/evbarm/conf/mk.vexpress
--- a/sys/arch/evbarm/conf/mk.vexpress  Wed Dec 13 13:03:23 2017 +0000
+++ b/sys/arch/evbarm/conf/mk.vexpress  Wed Dec 13 13:52:13 2017 +0000
@@ -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 @@
 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 @@
        ${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.}.ub@}
 EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin.gz@}
-EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.ub@}
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.gz.ub@}