Module Name: src
Committed By: jmcneill
Date: Thu Mar 14 10:22:43 UTC 2019
Modified Files:
src/sys/arch/evbarm/conf: mk.generic
Log Message:
U-Boot fails to boot a compressed kernel_noload image, so stop emitting
them.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/mk.generic
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.generic
diff -u src/sys/arch/evbarm/conf/mk.generic:1.5 src/sys/arch/evbarm/conf/mk.generic:1.6
--- src/sys/arch/evbarm/conf/mk.generic:1.5 Tue Oct 30 09:06:07 2018
+++ src/sys/arch/evbarm/conf/mk.generic Thu Mar 14 10:22:43 2019
@@ -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 @@ SYSTEM_FIRST_SFILE= ${ARM}/arm/armv6_sta
_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@}
