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 (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,179 +1,183 @@ @@ -1,179 +1,183 @@
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
15.if !empty(MACHINE_ARCH:M*eb) 15.if !empty(MACHINE_ARCH:M*eb)
16IMAGEENDIAN= be 16IMAGEENDIAN= be
17# big endian boards 17# big endian boards
18KERNEL_SETS.armv4+= IXM1200 18KERNEL_SETS.armv4+= IXM1200
19 19
20EVBARM_BOARDS.xscale+= ADI_BRH 20EVBARM_BOARDS.xscale+= ADI_BRH
21KERNEL_SETS.xscale+= NSLU2 21KERNEL_SETS.xscale+= NSLU2
22 22
23EVBARM_BOARDS.armv6+= RPI 23EVBARM_BOARDS.armv6+= RPI
24EVBARM_BOARDS.armv6hf+= RPI 24EVBARM_BOARDS.armv6hf+= RPI
25KERNEL_SETS.armv6+= RPI2 25KERNEL_SETS.armv6+= RPI2
26KERNEL_SETS.armv6hf+= RPI2 26KERNEL_SETS.armv6hf+= RPI2
27 27
28KERNEL_SETS.armv7+= GENERIC 28KERNEL_SETS.armv7+= GENERIC
29KERNEL_SETS.armv7hf+= GENERIC 29KERNEL_SETS.armv7hf+= GENERIC
30KERNEL_SETS.arm64+= GENERIC64 30KERNEL_SETS.arm64+= GENERIC64
31.else 31.else
32IMAGEENDIAN= le 32IMAGEENDIAN= le
33# little endian boards 33# little endian boards
34#EVBARM_BOARDS.armv4+= ARMADILLO210 34#EVBARM_BOARDS.armv4+= ARMADILLO210
35#EVBARM_BOARDS.armv4+= ARMADILLO9 35#EVBARM_BOARDS.armv4+= ARMADILLO9
36EVBARM_BOARDS.armv4+= GEMINI 36EVBARM_BOARDS.armv4+= GEMINI
37EVBARM_BOARDS.armv4+= INTEGRATOR 37EVBARM_BOARDS.armv4+= INTEGRATOR
38EVBARM_BOARDS.armv4+= INTEGRATOR_CP 38EVBARM_BOARDS.armv4+= INTEGRATOR_CP
39KERNEL_SETS.armv4+= IXM1200 39KERNEL_SETS.armv4+= IXM1200
40#EVBARM_BOARDS.armv4+= MINI2440 40#EVBARM_BOARDS.armv4+= MINI2440
41#EVBARM_BOARDS.armv4+= MPCSA_GENERIC 41#EVBARM_BOARDS.armv4+= MPCSA_GENERIC
42#EVBARM_BOARDS.armv4+= NAPPI 42#EVBARM_BOARDS.armv4+= NAPPI
43EVBARM_BOARDS.armv4+= SMDK2410 43EVBARM_BOARDS.armv4+= SMDK2410
44EVBARM_BOARDS.armv4+= SMDK2800 44EVBARM_BOARDS.armv4+= SMDK2800
45EVBARM_BOARDS.armv4+= TS7200 45EVBARM_BOARDS.armv4+= TS7200
46 46
47EVBARM_BOARDS.xscale+= ADI_BRH 47EVBARM_BOARDS.xscale+= ADI_BRH
48EVBARM_BOARDS.xscale+= CP3100 48EVBARM_BOARDS.xscale+= CP3100
49EVBARM_BOARDS.xscale+= GUMSTIX 49EVBARM_BOARDS.xscale+= GUMSTIX
50KERNEL_SETS.xscale+= HDL_G 50KERNEL_SETS.xscale+= HDL_G
51EVBARM_BOARDS.xscale+= IQ80310 51EVBARM_BOARDS.xscale+= IQ80310
52EVBARM_BOARDS.xscale+= IQ80321 52EVBARM_BOARDS.xscale+= IQ80321
53#EVBARM_BOARDS.xscale+= LUBBOCK 53#EVBARM_BOARDS.xscale+= LUBBOCK
54EVBARM_BOARDS.xscale+= TEAMASA_NPWR 54EVBARM_BOARDS.xscale+= TEAMASA_NPWR
55EVBARM_BOARDS.xscale+= TWINTAIL 55EVBARM_BOARDS.xscale+= TWINTAIL
56#EVBARM_BOARDS.xscale+= VIPER 56#EVBARM_BOARDS.xscale+= VIPER
57#EVBARM_BOARDS.xscale+= ZAO425 57#EVBARM_BOARDS.xscale+= ZAO425
58 58
59#EVBARM_BOARDS.armv5t+= DNS323 59#EVBARM_BOARDS.armv5t+= DNS323
60#EVBARM_BOARDS.armv5t+= HPT5325 60#EVBARM_BOARDS.armv5t+= HPT5325
61#EVBARM_BOARDS.armv5t+= IMX23_OLINUXINO 61#EVBARM_BOARDS.armv5t+= IMX23_OLINUXINO
62EVBARM_BOARDS.armv5t+= KUROBOX_PRO 62EVBARM_BOARDS.armv5t+= KUROBOX_PRO
63#EVBARM_BOARDS.armv5t+= MARVELL_NAS 63#EVBARM_BOARDS.armv5t+= MARVELL_NAS
64#EVBARM_BOARDS.armv5t+= MMNET_GENERIC 64#EVBARM_BOARDS.armv5t+= MMNET_GENERIC
65EVBARM_BOARDS.armv5t+= MV2120 65EVBARM_BOARDS.armv5t+= MV2120
66#EVBARM_BOARDS.armv5t+= OPENBLOCKS_A6 66#EVBARM_BOARDS.armv5t+= OPENBLOCKS_A6
67EVBARM_BOARDS.armv5t+= OPENRD 67EVBARM_BOARDS.armv5t+= OPENRD
68#EVBARM_BOARDS.armv5t+= OSK5912 68#EVBARM_BOARDS.armv5t+= OSK5912
69EVBARM_BOARDS.armv5t+= SHEEVAPLUG 69EVBARM_BOARDS.armv5t+= SHEEVAPLUG
70 70
71#EVBARM_BOARDS.armv6+= IMX31LITE 71#EVBARM_BOARDS.armv6+= IMX31LITE
72#EVBARM_BOARDS.armv6hf+= IMX31LITE 72#EVBARM_BOARDS.armv6hf+= IMX31LITE
73EVBARM_BOARDS.armv6+= RPI 73EVBARM_BOARDS.armv6+= RPI
74EVBARM_BOARDS.armv6hf+= RPI 74EVBARM_BOARDS.armv6hf+= RPI
75KERNEL_SETS.armv6+= RPI2 75KERNEL_SETS.armv6+= RPI2
76KERNEL_SETS.armv6hf+= RPI2 76KERNEL_SETS.armv6hf+= RPI2
77EVBARM_BOARDS.armv6+= TISDP2420 77EVBARM_BOARDS.armv6+= TISDP2420
78EVBARM_BOARDS.armv6hf+= TISDP2420 78EVBARM_BOARDS.armv6hf+= TISDP2420
79#EVBARM_BOARDS.armv6+= TISDP2430 79#EVBARM_BOARDS.armv6+= TISDP2430
80 80
81KERNEL_SETS.armv7+= GENERIC 81KERNEL_SETS.armv7+= GENERIC
82KERNEL_SETS.armv7hf+= GENERIC 82KERNEL_SETS.armv7hf+= GENERIC
83KERNEL_SETS.arm64+= GENERIC64 83KERNEL_SETS.arm64+= GENERIC64
84.endif 84.endif
85 85
86IMAGE.rel= ${RELEASEDIR}/${RELEASEMACHINEDIR} 86IMAGE.rel= ${RELEASEDIR}/${RELEASEMACHINEDIR}
87IMAGE.dir= ${IMAGE.rel}/binary/gzimg 87IMAGE.dir= ${IMAGE.rel}/binary/gzimg
88IMAGE.kern= ${IMAGE.rel}/binary/kernel 88IMAGE.kern= ${IMAGE.rel}/binary/kernel
89IMAGE.instk= ${IMAGE.rel}/installation/instkernel 89IMAGE.instk= ${IMAGE.rel}/installation/instkernel
90 90
91__mkimage: .USE 91__mkimage: .USE
92 TOOL_MAKE=${MAKE} \ 92 TOOL_MAKE=${MAKE} \
93 TOOL_MAKEFS=${TOOL_MAKEFS} \ 93 TOOL_MAKEFS=${TOOL_MAKEFS} \
94 TOOL_DISKLABEL=${TOOL_DISKLABEL} \ 94 TOOL_DISKLABEL=${TOOL_DISKLABEL} \
95 TOOL_FDISK=${TOOL_FDISK} \ 95 TOOL_FDISK=${TOOL_FDISK} \
96 TOOL_GPT=${TOOL_GPT} \ 96 TOOL_GPT=${TOOL_GPT} \
97 TOOL_GZIP=${TOOL_GZIP} \ 97 TOOL_GZIP=${TOOL_GZIP} \
98 TOOL_MKNOD=${TOOL_MKNOD} \ 98 TOOL_MKNOD=${TOOL_MKNOD} \
99 TOOL_PAX=${TOOL_PAX} \ 99 TOOL_PAX=${TOOL_PAX} \
100 TOOL_MKUBOOTIMAGE=${TOOL_MKUBOOTIMAGE} \ 100 TOOL_MKUBOOTIMAGE=${TOOL_MKUBOOTIMAGE} \
101 TOOL_MTREE=${TOOL_MTREE} \ 101 TOOL_MTREE=${TOOL_MTREE} \
102 HOST_SH=${HOST_SH} \ 102 HOST_SH=${HOST_SH} \
103 KERNOBJDIR=${KERNOBJDIR} \ 103 KERNOBJDIR=${KERNOBJDIR} \
104 MACHINE=${MACHINE} \ 104 MACHINE=${MACHINE} \
105 MKDTB=${MKDTB} \ 105 MKDTB=${MKDTB} \
106 ${HOST_SH} ${MKIMAGE} -x -h ${.TARGET:S/smp_//} -D ${DESTDIR} \ 106 ${HOST_SH} ${MKIMAGE} -x -h ${.TARGET:S/smp_//} -D ${DESTDIR} \
107 -S ${NETBSDSRCDIR} -B ${IMAGEENDIAN} ${MKI_OPTS.${.TARGET}} \ 107 -S ${NETBSDSRCDIR} -B ${IMAGEENDIAN} ${MKI_OPTS.${.TARGET}} \
108 ${IMAGE.dir}/${.TARGET:S/smp_//}.img.gz 108 ${IMAGE.dir}/${.TARGET:S/smp_//}.img.gz
109 109
110ARCHES.earmv4= armv4 110ARCHES.earmv4= armv4
111ARCHES.earmv4eb= armv4 111ARCHES.earmv4eb= armv4
112ARCHES.earmv5= xscale armv5t 112ARCHES.earmv5= xscale armv5t
113ARCHES.earmv5eb= xscale armv5t 113ARCHES.earmv5eb= xscale armv5t
114ARCHES.earmv6= armv6 114ARCHES.earmv6= armv6
115ARCHES.earmv6hf= armv6hf 115ARCHES.earmv6hf= armv6hf
116ARCHES.earmv6eb= armv6 116ARCHES.earmv6eb= armv6
117ARCHES.earmv6hfeb= armv6hf 117ARCHES.earmv6hfeb= armv6hf
118ARCHES.earmv7= armv7 118ARCHES.earmv7= armv7
119ARCHES.earmv7hf= armv7hf 119ARCHES.earmv7hf= armv7hf
120ARCHES.earmv7eb= armv7 120ARCHES.earmv7eb= armv7
121ARCHES.earmv7hfeb= armv7hf 121ARCHES.earmv7hfeb= armv7hf
122ARCHES.aarch64= arm64 122ARCHES.aarch64= arm64
123ARCHES.aarch64eb= arm64 123ARCHES.aarch64eb= arm64
124.for arch in ${ARCHES.${MACHINE_ARCH}} 124.for arch in ${ARCHES.${MACHINE_ARCH}}
125.for board in ${EVBARM_BOARDS.${arch}} 125.for board in ${EVBARM_BOARDS.${arch}}
126KERNEL_SETS+= ${board} 126KERNEL_SETS+= ${board}
127BUILD_KERNELS+= ${board}_INSTALL 127BUILD_KERNELS+= ${board}_INSTALL
128.endfor 128.endfor
129KERNEL_SETS+= ${KERNEL_SETS.${arch}} 129KERNEL_SETS+= ${KERNEL_SETS.${arch}}
130.endfor 130.endfor
131 131
132.if !empty(MACHINE_ARCH:Maarch64*) 132.if !empty(MACHINE_ARCH:Maarch64*)
133smp_efibootaa64: 133smp_efibootaa64:
134 cd ${KERNSRCDIR}/stand/efiboot/bootaa64 && ${MAKE} release 134 cd ${KERNSRCDIR}/stand/efiboot/bootaa64 && ${MAKE} release
135SNAP_MD_POST_DEPS+= smp_efibootaa64 135SNAP_MD_POST_DEPS+= smp_efibootaa64
136INSTALLATION_DIRS+= installation/misc 136INSTALLATION_DIRS+= installation/misc
137.endif 137.endif
138 138
139.if !empty(MACHINE_ARCH:Mearmv7hf) 139.if !empty(MACHINE_ARCH:Mearmv7hf)
140smp_efibootarm: 140smp_efibootarm:
141 cd ${KERNSRCDIR}/stand/efiboot/bootarm && ${MAKE} release 141 cd ${KERNSRCDIR}/stand/efiboot/bootarm && ${MAKE} release
142SNAP_MD_POST_DEPS+= smp_efibootarm 142SNAP_MD_POST_DEPS+= smp_efibootarm
143INSTALLATION_DIRS+= installation/misc 143INSTALLATION_DIRS+= installation/misc
144.endif 144.endif
145 145
146.if !empty(MACHINE_ARCH:M*armv7*) && empty(ALL_KERNELS) 146.if !empty(MACHINE_ARCH:M*armv7*) && empty(ALL_KERNELS)
147smp_armv7: __mkimage 147smp_armv7: __mkimage
148MKI_OPTS.smp_armv7= -K ${IMAGE.kern} 148MKI_OPTS.smp_armv7= -K ${IMAGE.kern}
149SNAP_MD_POST_DEPS+= smp_armv7 149SNAP_MD_POST_DEPS+= smp_armv7
150.endif 150.endif
151 151
152.if !empty(MACHINE_ARCH:Maarch64*) && empty(ALL_KERNELS) 152.if !empty(MACHINE_ARCH:Maarch64*) && empty(ALL_KERNELS)
153smp_arm64: __mkimage 153smp_arm64: __mkimage
154MKI_OPTS.smp_arm64= -K ${IMAGE.kern} 154MKI_OPTS.smp_arm64= -K ${IMAGE.kern}
155SNAP_MD_POST_DEPS+= smp_arm64 155SNAP_MD_POST_DEPS+= smp_arm64
156smp_arm64mbr: __mkimage 156smp_arm64mbr: __mkimage
157MKI_OPTS.smp_arm64mbr= -K ${IMAGE.kern} 157MKI_OPTS.smp_arm64mbr= -K ${IMAGE.kern}
158SNAP_MD_POST_DEPS+= smp_arm64mbr 158SNAP_MD_POST_DEPS+= smp_arm64mbr
159.endif 159.endif
160 160
161.if !empty(KERNEL_SETS:MRPI) 161.if !empty(KERNEL_SETS:MRPI)
162smp_rpi: __mkimage 162smp_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