Sat Jul 24 17:07:59 2021 UTC ()
aarch64: Restrict KERNEL_SUFFIXES to img only


(jmcneill)
diff -r1.123 -r1.124 src/etc/etc.evbarm/Makefile.inc
cvs diff -r1.123 -r1.124 src/etc/etc.evbarm/Makefile.inc (expand / switch to unified diff)

--- src/etc/etc.evbarm/Makefile.inc 2021/05/27 08:43:02 1.123
+++ src/etc/etc.evbarm/Makefile.inc 2021/07/24 17:07:59 1.124
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.inc,v 1.123 2021/05/27 08:43:02 rin Exp $ 1# $NetBSD: Makefile.inc,v 1.124 2021/07/24 17:07:59 jmcneill Exp $
2# 2#
3# etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets 3# etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets
4# 4#
5 5
6MKIMAGE= ${NETBSDSRCDIR}/distrib/utils/embedded/mkimage 6MKIMAGE= ${NETBSDSRCDIR}/distrib/utils/embedded/mkimage
7 7
8# If you change the list of distributed kernels, don't forget 8# If you change the list of distributed kernels, don't forget
9# to update the release documentation in distrib/notes/common/contents 9# to update the release documentation in distrib/notes/common/contents
10EVBARM_BOARDS= 10EVBARM_BOARDS=
11.for i in armv4 xscale armv5t armv6 armv7 arm64 11.for i in armv4 xscale armv5t armv6 armv7 arm64
12EVBARM_BOARDS.${i}= 12EVBARM_BOARDS.${i}=
13.endfor 13.endfor
14 14
@@ -163,17 +163,21 @@ smp_rpi: __mkimage @@ -163,17 +163,21 @@ smp_rpi: __mkimage
163.if empty(ALL_KERNELS) || !empty(ALL_KERNELS:MRPI) 163.if empty(ALL_KERNELS) || !empty(ALL_KERNELS:MRPI)
164MKI_OPTS.smp_rpi= -K ${IMAGE.kern}/netbsd-RPI.img.gz 164MKI_OPTS.smp_rpi= -K ${IMAGE.kern}/netbsd-RPI.img.gz
165SNAP_MD_POST_DEPS+= smp_rpi 165SNAP_MD_POST_DEPS+= smp_rpi
166.endif 166.endif
167smp_rpi_inst: ${IMAGE.instk}/netbsd-RPI_INSTALL.img.gz __mkimage 167smp_rpi_inst: ${IMAGE.instk}/netbsd-RPI_INSTALL.img.gz __mkimage
168.if empty(ALL_KERNELS) || !empty(ALL_KERNELS:MRPI_INSTALL) 168.if empty(ALL_KERNELS) || !empty(ALL_KERNELS:MRPI_INSTALL)
169MKI_OPTS.smp_rpi_inst= -b -K ${IMAGE.instk}/netbsd-RPI_INSTALL.img.gz 169MKI_OPTS.smp_rpi_inst= -b -K ${IMAGE.instk}/netbsd-RPI_INSTALL.img.gz
170SNAP_MD_POST_DEPS+= smp_rpi_inst 170SNAP_MD_POST_DEPS+= smp_rpi_inst
171.endif 171.endif
172.endif 172.endif
173 173
174snap_md_post: check_DESTDIR check_RELEASEDIR snap_post .WAIT ${SNAP_MD_POST_DEPS} 174snap_md_post: check_DESTDIR check_RELEASEDIR snap_post .WAIT ${SNAP_MD_POST_DEPS}
175 175
 176.if !empty(MACHINE_ARCH:Maarch64*)
 177KERNEL_SUFFIXES= img
 178.else
176KERNEL_SUFFIXES= bin img srec ub 179KERNEL_SUFFIXES= bin img srec ub
 180.endif
177 181
178INSTALLATION_DIRS+= binary/gzimg \ 182INSTALLATION_DIRS+= binary/gzimg \
179 installation/instkernel 183 installation/instkernel