[src/trunk]: src/sys/arch/evbarm/conf Reduce the number of build artifacts an...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/arch/evbarm/conf Reduce the number of build artifacts an...
From: jmcneill <jmcneill%NetBSD.org@localhost>
Date: Tue, 31 Jul 2018 21:42:45 +0000
details:   https://anonhg.NetBSD.org/src/rev/f0fbeb856dce
branches:  trunk
changeset: 358052:f0fbeb856dce
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat Dec 09 11:52:38 2017 +0000

description:
Reduce the number of build artifacts and use a compressed version of the
kernel for legacy U-Boot images (netbsd.ub).

diffstat:

 sys/arch/evbarm/conf/mk.exynos   |  12 ++++--------
 sys/arch/evbarm/conf/mk.sunxi    |  12 ++++--------
 sys/arch/evbarm/conf/mk.tegra    |  12 ++++--------
 sys/arch/evbarm/conf/mk.ti       |  12 ++++--------
 sys/arch/evbarm/conf/mk.vexpress |  12 ++++--------
 5 files changed, 20 insertions(+), 40 deletions(-)

diffs (167 lines):

diff -r f31677f341cd -r f0fbeb856dce sys/arch/evbarm/conf/mk.exynos
--- a/sys/arch/evbarm/conf/mk.exynos    Sat Dec 09 10:51:30 2017 +0000
+++ b/sys/arch/evbarm/conf/mk.exynos    Sat Dec 09 11:52:38 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: mk.exynos,v 1.2 2015/12/26 22:53:52 jmcneill Exp $
+#      $NetBSD: mk.exynos,v 1.3 2017/12/09 11:52:38 jmcneill Exp $
 
 .if !empty(MACHINE_ARCH:M*eb)
 EXTRA_LINKFLAGS+=      --be8
@@ -18,7 +18,6 @@
 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+=; \
@@ -26,13 +25,10 @@
        ${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 $@.gz.ub; \
-       ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.gz.ub; \
-       echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_NONE} $@.bin $@.ub; \
-       ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_NONE} $@.bin $@.ub; \
+       echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.ub; \
+       ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.ub; \
        echo
 
 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@}
diff -r f31677f341cd -r f0fbeb856dce sys/arch/evbarm/conf/mk.sunxi
--- a/sys/arch/evbarm/conf/mk.sunxi     Sat Dec 09 10:51:30 2017 +0000
+++ b/sys/arch/evbarm/conf/mk.sunxi     Sat Dec 09 11:52:38 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: mk.sunxi,v 1.3 2017/10/23 19:36:01 jakllsch Exp $
+#      $NetBSD: mk.sunxi,v 1.4 2017/12/09 11:52:38 jmcneill Exp $
 
 .if !empty(MACHINE_ARCH:M*eb)
 EXTRA_LINKFLAGS+=      --be8
@@ -14,20 +14,16 @@
 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 $@.gz.ub; \
-       ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.gz.ub
+       echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.ub; \
+       ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.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@}
diff -r f31677f341cd -r f0fbeb856dce sys/arch/evbarm/conf/mk.tegra
--- a/sys/arch/evbarm/conf/mk.tegra     Sat Dec 09 10:51:30 2017 +0000
+++ b/sys/arch/evbarm/conf/mk.tegra     Sat Dec 09 11:52:38 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: mk.tegra,v 1.6 2017/06/16 21:37:11 jmcneill Exp $
+#      $NetBSD: mk.tegra,v 1.7 2017/12/09 11:52:38 jmcneill Exp $
 CPPFLAGS+=             -mcpu=cortex-a15 -mfpu=neon
 
 .include "$S/arch/arm/nvidia/tegra_xusb-fw.mk"
@@ -13,20 +13,16 @@
 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 $@.gz.ub; \
-       ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.gz.ub
+       echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.ub; \
+       ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.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@}
diff -r f31677f341cd -r f0fbeb856dce sys/arch/evbarm/conf/mk.ti
--- a/sys/arch/evbarm/conf/mk.ti        Sat Dec 09 10:51:30 2017 +0000
+++ b/sys/arch/evbarm/conf/mk.ti        Sat Dec 09 11:52:38 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: mk.ti,v 1.1 2017/10/26 01:16:32 jakllsch Exp $
+#      $NetBSD: mk.ti,v 1.2 2017/12/09 11:52:38 jmcneill Exp $
 
 .if !empty(MACHINE_ARCH:M*eb)
 EXTRA_LINKFLAGS+=      --be8
@@ -17,20 +17,16 @@
 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 $@.gz.ub; \
-       ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.gz.ub
+       echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.ub; \
+       ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.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@}
diff -r f31677f341cd -r f0fbeb856dce sys/arch/evbarm/conf/mk.vexpress
--- a/sys/arch/evbarm/conf/mk.vexpress  Sat Dec 09 10:51:30 2017 +0000
+++ b/sys/arch/evbarm/conf/mk.vexpress  Sat Dec 09 11:52:38 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: mk.vexpress,v 1.4 2017/06/16 21:37:11 jmcneill Exp $
+#      $NetBSD: mk.vexpress,v 1.5 2017/12/09 11:52:38 jmcneill Exp $
 
 .if !empty(MACHINE_ARCH:M*eb)
 EXTRA_LINKFLAGS+=      --be8
@@ -15,7 +15,6 @@
 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+=; \
@@ -23,13 +22,10 @@
        ${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 $@.gz.ub; \
-       ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.gz.ub; \
-       echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_NONE} $@.bin $@.ub; \
-       ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_NONE} $@.bin $@.ub; \
+       echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.ub; \
+       ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.ub; \
        echo
 
 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@}
Prev by Date: [src/trunk]: src/sys/net style
Next by Date: [src/trunk]: src/bin/ps ps: Rename local routine name from uname to usrname
Previous by Thread: [src/trunk]: src/sys/net style
Next by Thread: [src/trunk]: src/bin/ps ps: Rename local routine name from uname to usrname
Indexes:
Home | Main Index | Thread Index | Old Index