Thu Nov 30 19:55:47 2017 UTC ()
Remove legacy awin kernels from image


(jmcneill)
diff -r1.20 -r1.21 src/distrib/utils/embedded/conf/armv7.conf
cvs diff -r1.20 -r1.21 src/distrib/utils/embedded/conf/armv7.conf (expand / switch to unified diff)

--- src/distrib/utils/embedded/conf/armv7.conf 2017/11/28 02:56:44 1.20
+++ src/distrib/utils/embedded/conf/armv7.conf 2017/11/30 19:55:47 1.21
@@ -1,24 +1,23 @@ @@ -1,24 +1,23 @@
1# $NetBSD: armv7.conf,v 1.20 2017/11/28 02:56:44 kre Exp $ 1# $NetBSD: armv7.conf,v 1.21 2017/11/30 19:55:47 jmcneill Exp $
2# ARMv7 customization script used by mkimage 2# ARMv7 customization script used by mkimage
3# 3#
4board=armv7 4board=armv7
5console=fb 5console=fb
6resize=true 6resize=true
7 7
8. ${DIR}/conf/evbarm.conf 8. ${DIR}/conf/evbarm.conf
9 9
10kernels_beagle="BEAGLEBOARD BEAGLEBONE" 10kernels_beagle="BEAGLEBOARD BEAGLEBONE"
11kernels_awin="BPI CUBIEBOARD CUBIETRUCK" 
12kernels_rpi="RPI2" 11kernels_rpi="RPI2"
13kernels_amlogic="ODROID-C1" 12kernels_amlogic="ODROID-C1"
14kernels_tegra="TEGRA" 13kernels_tegra="TEGRA"
15kernels_sunxi="SUNXI" 14kernels_sunxi="SUNXI"
16 15
17make_label() { 16make_label() {
18 make_label_evbarm 17 make_label_evbarm
19} 18}
20 19
21make_fstab() { 20make_fstab() {
22 make_fstab_evbarm 21 make_fstab_evbarm
23} 22}
24 23
@@ -31,30 +30,26 @@ devpubd=YES @@ -31,30 +30,26 @@ devpubd=YES
31EOF 30EOF
32} 31}
33 32
34populate_common() { 33populate_common() {
35 # Install boot script 34 # Install boot script
36 cp ${DIR}/files/armv7_boot.cmd ${mnt}/boot/boot.cmd 35 cp ${DIR}/files/armv7_boot.cmd ${mnt}/boot/boot.cmd
37 "${MKUBOOTIMAGE}" -A arm -C none -O netbsd -T script -a 0 -n "NetBSD/armv7 boot" "${mnt}/boot/boot.cmd" "${mnt}/boot/boot.scr" 36 "${MKUBOOTIMAGE}" -A arm -C none -O netbsd -T script -a 0 -n "NetBSD/armv7 boot" "${mnt}/boot/boot.cmd" "${mnt}/boot/boot.scr"
38} 37}
39 38
40populate_beagle() { 39populate_beagle() {
41 : 40 :
42} 41}
43 42
44populate_awin() { 
45 : 
46} 
47 
48populate_rpi() { 43populate_rpi() {
49 firmwaredir="${src}/external/broadcom/rpi-firmware/dist" 44 firmwaredir="${src}/external/broadcom/rpi-firmware/dist"
50 firmwarefiles="LICENCE.broadcom bootcode.bin fixup.dat fixup_cd.dat start.elf start_cd.elf" 45 firmwarefiles="LICENCE.broadcom bootcode.bin fixup.dat fixup_cd.dat start.elf start_cd.elf"
51 46
52 # RPI2 kernel needs to be installed as kernel7.img 47 # RPI2 kernel needs to be installed as kernel7.img
53 if [ -f "${mnt}/boot/netbsd-RPI2.bin" ]; then 48 if [ -f "${mnt}/boot/netbsd-RPI2.bin" ]; then
54 echo "${bar} renaming netbsd-RPI2.bin to kernel7.img ${bar}" 49 echo "${bar} renaming netbsd-RPI2.bin to kernel7.img ${bar}"
55 mv "${mnt}/boot/netbsd-RPI2.bin" "${mnt}/boot/kernel7.img" 50 mv "${mnt}/boot/netbsd-RPI2.bin" "${mnt}/boot/kernel7.img"
56 51
57 cat > "${mnt}/boot/cmdline.txt" << EOF 52 cat > "${mnt}/boot/cmdline.txt" << EOF
58root=ld0a console=${console} 53root=ld0a console=${console}
59#fb=1280x1024 # to select a mode, otherwise try EDID 54#fb=1280x1024 # to select a mode, otherwise try EDID
60#fb=disable # to disable fb completely 55#fb=disable # to disable fb completely
@@ -109,27 +104,27 @@ EOF @@ -109,27 +104,27 @@ EOF
109 104
110populate_sunxi() { 105populate_sunxi() {
111 : 106 :
112} 107}
113 108
114populate_tegra() { 109populate_tegra() {
115 : 110 :
116} 111}
117 112
118populate() { 113populate() {
119 echo "${bar} looking for kernels in ${kernel} ${bar}" 114 echo "${bar} looking for kernels in ${kernel} ${bar}"
120 kernels="" 115 kernels=""
121 # .ub kernels 116 # .ub kernels
122 for k in $kernels_beagle $kernels_awin $kernels_sunxi $kernels_amlogic $kernels_tegra; do 117 for k in $kernels_beagle $kernels_sunxi $kernels_amlogic $kernels_tegra; do
123 f="${kernel}/netbsd-${k}.ub.gz" 118 f="${kernel}/netbsd-${k}.ub.gz"
124 test -f "${f}" && kernels="${kernels} ${f}" 119 test -f "${f}" && kernels="${kernels} ${f}"
125 done 120 done
126 # .bin kernels 121 # .bin kernels
127 for k in $kernels_rpi; do 122 for k in $kernels_rpi; do
128 f="${kernel}/netbsd-${k}.bin.gz" 123 f="${kernel}/netbsd-${k}.bin.gz"
129 test -f "${f}" && kernels="${kernels} ${f}" 124 test -f "${f}" && kernels="${kernels} ${f}"
130 done 125 done
131 # .dtb files 126 # .dtb files
132 for k in $kernels_sunxi $kernels_tegra; do 127 for k in $kernels_sunxi $kernels_tegra; do
133 test -d "${KERNOBJDIR}/${k}" && \ 128 test -d "${KERNOBJDIR}/${k}" && \
134 dtbs="$(${MAKE} -C ${KERNOBJDIR}/${k} -v DTB)" || \ 129 dtbs="$(${MAKE} -C ${KERNOBJDIR}/${k} -v DTB)" || \
135 dtbs= 130 dtbs=
@@ -146,22 +141,21 @@ populate() { @@ -146,22 +141,21 @@ populate() {
146 case "${k}" in 141 case "${k}" in
147 *.gz) 142 *.gz)
148 ${GZIP_CMD} -dc "${k}" > "${mnt}/boot/${tgt}" 143 ${GZIP_CMD} -dc "${k}" > "${mnt}/boot/${tgt}"
149 ;; 144 ;;
150 *) 145 *)
151 cp "${k}" "${mnt}/boot/${tgt}" 146 cp "${k}" "${mnt}/boot/${tgt}"
152 ;; 147 ;;
153 esac || 148 esac ||
154 fail "Copy of ${k} to ${mnt}/boot/${tgt} failed" 149 fail "Copy of ${k} to ${mnt}/boot/${tgt} failed"
155 done 150 done
156 151
157 # board specific configuration 152 # board specific configuration
158 populate_beagle 153 populate_beagle
159 populate_awin 
160 populate_rpi 154 populate_rpi
161 populate_amlogic 155 populate_amlogic
162 populate_tegra 156 populate_tegra
163 populate_sunxi 157 populate_sunxi
164 158
165 # common configuration 159 # common configuration
166 populate_common 160 populate_common
167} 161}