[src/trunk]: src/sys/arch/evbarm/conf U-Boot fails to boot a compressed kerne...

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

details:   https://anonhg.NetBSD.org/src/rev/5a3b9cf086b6
branches:  trunk
changeset: 997583:5a3b9cf086b6
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Thu Mar 14 10:22:43 2019 +0000

description:
U-Boot fails to boot a compressed kernel_noload image, so stop emitting
them.

diffstat:

 sys/arch/evbarm/conf/mk.generic |  16 ++++------------
 1 files changed, 4 insertions(+), 12 deletions(-)

diffs (36 lines):

diff -r 3b0fe7230c31 -r 5a3b9cf086b6 sys/arch/evbarm/conf/mk.generic
--- a/sys/arch/evbarm/conf/mk.generic   Thu Mar 14 07:05:07 2019 +0000
+++ b/sys/arch/evbarm/conf/mk.generic   Thu Mar 14 10:22:43 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: mk.generic,v 1.5 2018/10/30 09:06:07 martin Exp $
+#      $NetBSD: mk.generic,v 1.6 2019/03/14 10:22:43 jmcneill Exp $
 
 .include "$S/arch/arm/nvidia/tegra_xusb-fw.mk"
 
@@ -11,23 +11,15 @@
 
 _OSRELEASE!=           ${HOST_SH} $S/conf/osrelease.sh
 
-MKUBOOTIMAGEARGS=      -A arm -T kernel_noload -O linux
+MKUBOOTIMAGEARGS=      -A arm -T kernel_noload -O linux -C none
 MKUBOOTIMAGEARGS+=     -e 0
 MKUBOOTIMAGEARGS+=     -n "NetBSD/${BOARDTYPE:U${MACHINE_ARCH}} ${_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 $@.gz.ub; \
-       ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.gz.ub
+       echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $@.bin $@.ub; \
+       ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $@.bin $@.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.}.gz.ub@}