[src/trunk]: src/sys/arch/evbarm/conf Revert previous; L4T's T124 U-Boot does...

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

details:   https://anonhg.NetBSD.org/src/rev/5d968c68085b
branches:  trunk
changeset: 358100:5d968c68085b
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Mon Dec 11 11:32:45 2017 +0000

description:
Revert previous; L4T's T124 U-Boot does not boot large compressed images.

diffstat:

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

diffs (33 lines):

diff -r 2ef1f75d9931 -r 5d968c68085b sys/arch/evbarm/conf/mk.tegra
--- a/sys/arch/evbarm/conf/mk.tegra     Mon Dec 11 08:40:45 2017 +0000
+++ b/sys/arch/evbarm/conf/mk.tegra     Mon Dec 11 11:32:45 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: mk.tegra,v 1.7 2017/12/09 11:52:38 jmcneill Exp $
+#      $NetBSD: mk.tegra,v 1.8 2017/12/11 11:32:45 jmcneill Exp $
 CPPFLAGS+=             -mcpu=cortex-a15 -mfpu=neon
 
 .include "$S/arch/arm/nvidia/tegra_xusb-fw.mk"
@@ -13,16 +13,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@}