Module Name: src
Committed By: christos
Date: Sun May 24 17:11:18 UTC 2015
Modified Files:
src/distrib/utils/embedded/conf: armv7.conf
Log Message:
double quote police
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/utils/embedded/conf/armv7.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/embedded/conf/armv7.conf
diff -u src/distrib/utils/embedded/conf/armv7.conf:1.3 src/distrib/utils/embedded/conf/armv7.conf:1.4
--- src/distrib/utils/embedded/conf/armv7.conf:1.3 Thu May 21 21:18:22 2015
+++ src/distrib/utils/embedded/conf/armv7.conf Sun May 24 13:11:18 2015
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.3 2015/05/22 01:18:22 jmcneill Exp $
+# $NetBSD: armv7.conf,v 1.4 2015/05/24 17:11:18 christos Exp $
# ARMv7 customization script used by mkimage
#
board=armv7
@@ -22,7 +22,7 @@ make_fstab() {
customize() {
customize_evbarm
- cat >> ${mnt}/etc/rc.conf << EOF
+ cat >> "${mnt}/etc/rc.conf" << EOF
mdnsd=YES
wscons=YES
devpubd=YES
@@ -36,20 +36,20 @@ populate_beagle() {
bbone_loadaddr=82000000
# Create a uEnv.txt to auto boot the correct kernel
- cat >> ${mnt}/boot/uEnv.txt << EOF
+ cat >> "${mnt}/boot/uEnv.txt" << EOF
loaduimage=if test \$board = am335x; then fatload mmc 0 ${bbone_loadaddr} ${bbone_kernelimg}; bootm ${bbone_loadaddr} root=ld0a; else fatload mmc 0 ${bboard_loadaddr} ${bboard_kernelimg}; bootm ${bboard_loadaddr} root=ld0a; fi
EOF
}
populate_awin() {
- cat >> ${mnt}/boot/uEnv.txt << EOF
+ cat >> "${mnt}/boot/uEnv.txt" << EOF
bootargs=root=ld0a console=${console}
uenvcmd=mmc dev 0; mmc rescan; if test \$fdtfile = sun7i-a20-cubieboard2.dtb; then setenv kernel netbsd-CUBIEBOARD2.ub; elif test \$fdtfile = sun7i-a20-cubietruck.dtb; then setenv kernel netbsd-CUBIETRUCK.ub; elif test \$fdtfile = sun6i-a31-hummingbird.dtb; then setenv kernel netbsd-HUMMINGBIRD_A31.ub; elif test \$fdtfile = sun7i-a20-bananapi.dtb; then setenv kernel netbsd-BPI.ub; fi; fatload mmc 0:1 82000000 ${kernel}; bootm 82000000
EOF
}
populate_rpi() {
- firmwaredir=${src}/external/broadcom/rpi-firmware/dist
+ firmwaredir="${src}/external/broadcom/rpi-firmware/dist"
firmwarefiles="LICENCE.broadcom bootcode.bin fixup.dat fixup_cd.dat start.elf start_cd.elf"
# RPI2 kernel needs to be installed as kernel7.img
@@ -57,17 +57,17 @@ populate_rpi() {
echo "${bar} renaming netbsd-RPI2.bin to kernel7.img ${bar}"
mv "${mnt}/boot/netbsd-RPI2.bin" "${mnt}/boot/kernel7.img"
- cat > ${mnt}/boot/cmdline.txt << EOF
+ cat > "${mnt}/boot/cmdline.txt" << EOF
root=ld0a console=${console}
#fb=1280x1024 # to select a mode, otherwise try EDID
#fb=disable # to disable fb completely
EOF
echo "${bar} installing firmware files ${bar}"
- (cd ${mnt}/boot &&
+ (cd "${mnt}/boot" &&
for f in ${firmwarefiles}; do
echo " $f"
- cp ${firmwaredir}/${f} .
+ cp "${firmwaredir}/${f}" .
done
)
@@ -78,7 +78,7 @@ populate_amlogic() {
odroidc1_kernelimg=netbsd-ODROID-C1.ub
# Create a boot.ini for Amlogic U-Boot
- cat >> ${mnt}/boot/boot.ini << EOF
+ cat >> "${mnt}/boot/boot.ini" << EOF
ODROIDC-UBOOT-CONFIG
setenv bootargs "root=ld0f awge0.mac-address=\${ethaddr} console=${console}"
@@ -91,12 +91,12 @@ populate_tegra() {
jetsontk1_kernelimg=netbsd-JETSONTK1.ub
# Create a boot.scr for Jetson TK1 U-Boot
- cat > ${mnt}/boot/boot-JETSONTK1.txt << EOF
+ cat > "${mnt}/boot/boot-JETSONTK1.txt" << EOF
setenv bootargs root=ld1a
fatload mmc 1:1 0x90000000 ${jetsontk1_kernelimg}
bootm 0x90000000
EOF
- ${MKUBOOTIMAGE} -A arm -C none -O netbsd -T script -a 0 -n "NetBSD/tegra boot" ${mnt}/boot/boot-JETSONTK1.txt ${mnt}/boot/boot-JETSONTK1.scr
+ "${MKUBOOTIMAGE}" -A arm -C none -O netbsd -T script -a 0 -n "NetBSD/tegra boot" "${mnt}/boot/boot-JETSONTK1.txt" "${mnt}/boot/boot-JETSONTK1.scr"
}
populate() {
