Module Name: src
Committed By: jmcneill
Date: Mon Dec 11 11:32:45 UTC 2017
Modified Files:
src/sys/arch/evbarm/conf: mk.tegra
Log Message:
Revert previous; L4T's T124 U-Boot does not boot large compressed images.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/conf/mk.tegra
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.tegra
diff -u src/sys/arch/evbarm/conf/mk.tegra:1.7 src/sys/arch/evbarm/conf/mk.tegra:1.8
--- src/sys/arch/evbarm/conf/mk.tegra:1.7 Sat Dec 9 11:52:38 2017
+++ src/sys/arch/evbarm/conf/mk.tegra Mon Dec 11 11:32:45 2017
@@ -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 @@ _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@}
