CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Tue Jul 6 11:49:36 UTC 2021
Modified Files:
src/distrib/utils/embedded/conf: evbarm.conf evbmips.conf rpi_inst.conf
usermode.conf x86.conf
Log Message:
Disable kernfs on live images -- it is not required.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/distrib/utils/embedded/conf/evbarm.conf
cvs rdiff -u -r1.2 -r1.3 src/distrib/utils/embedded/conf/evbmips.conf
cvs rdiff -u -r1.17 -r1.18 src/distrib/utils/embedded/conf/rpi_inst.conf
cvs rdiff -u -r1.5 -r1.6 src/distrib/utils/embedded/conf/usermode.conf
cvs rdiff -u -r1.9 -r1.10 src/distrib/utils/embedded/conf/x86.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/evbarm.conf
diff -u src/distrib/utils/embedded/conf/evbarm.conf:1.38 src/distrib/utils/embedded/conf/evbarm.conf:1.39
--- src/distrib/utils/embedded/conf/evbarm.conf:1.38 Wed Dec 23 10:35:18 2020
+++ src/distrib/utils/embedded/conf/evbarm.conf Tue Jul 6 11:49:36 2021
@@ -1,4 +1,4 @@
-# $NetBSD: evbarm.conf,v 1.38 2020/12/23 10:35:18 rin Exp $
+# $NetBSD: evbarm.conf,v 1.39 2021/07/06 11:49:36 jmcneill Exp $
# evbarm shared config
#
image=$HOME/${board}.img
@@ -71,7 +71,6 @@ make_fstab_evbarm_gpt() {
# See /usr/share/examples/fstab/ for more examples.
NAME=${gpt_label_ffs:-netbsd-root} / ffs rw,noatime 1 1
NAME=${gpt_label_boot:-EFI} /boot msdos rw 1 1
-kernfs /kern kernfs rw
ptyfs /dev/pts ptyfs rw
procfs /proc procfs rw
tmpfs /var/shm tmpfs rw,-m1777,-sram%25
@@ -84,7 +83,6 @@ make_fstab_evbarm_normal() {
# See /usr/share/examples/fstab/ for more examples.
ROOT.a / ffs rw,noatime 1 1
ROOT.e /boot msdos rw 1 1
-kernfs /kern kernfs rw
ptyfs /dev/pts ptyfs rw
procfs /proc procfs rw
tmpfs /var/shm tmpfs rw,-m1777,-sram%25
@@ -100,7 +98,6 @@ make_fstab_evbarm_minwrites() {
# See /usr/share/examples/fstab/ for more examples.
ROOT.a / ffs rw,log,noatime,nodevmtime 1 1
ROOT.e /boot msdos rw 1 1
-kernfs /kern kernfs rw
ptyfs /dev/pts ptyfs rw
procfs /proc procfs rw
tmpfs /tmp tmpfs rw,-s32M
@@ -128,8 +125,6 @@ make_fstab_evbarm() {
# Missing mount points from fstab
echo "./proc type=dir uname=root gname=wheel mode=0755" \
>> "$tmp/selected_sets"
- echo "./kern type=dir uname=root gname=wheel mode=0755" \
- >> "$tmp/selected_sets"
}
customize_evbarm() {
Index: src/distrib/utils/embedded/conf/evbmips.conf
diff -u src/distrib/utils/embedded/conf/evbmips.conf:1.2 src/distrib/utils/embedded/conf/evbmips.conf:1.3
--- src/distrib/utils/embedded/conf/evbmips.conf:1.2 Wed Dec 23 10:35:18 2020
+++ src/distrib/utils/embedded/conf/evbmips.conf Tue Jul 6 11:49:36 2021
@@ -1,4 +1,4 @@
-# $NetBSD: evbmips.conf,v 1.2 2020/12/23 10:35:18 rin Exp $
+# $NetBSD: evbmips.conf,v 1.3 2021/07/06 11:49:36 jmcneill Exp $
# evbmips shared config
#
image=$HOME/${board}.img
@@ -71,7 +71,6 @@ make_fstab_evbmips_gpt() {
# See /usr/share/examples/fstab/ for more examples.
NAME=${gpt_label_ffs:-netbsd-root} / ffs rw,noatime 1 1
NAME=${gpt_label_boot:-boot} /boot msdos rw 1 1
-kernfs /kern kernfs rw
ptyfs /dev/pts ptyfs rw
procfs /proc procfs rw
tmpfs /var/shm tmpfs rw,-m1777,-sram%25
@@ -84,7 +83,6 @@ make_fstab_evbmips_normal() {
# See /usr/share/examples/fstab/ for more examples.
ROOT.a / ffs rw,noatime 1 1
ROOT.e /boot msdos rw 1 1
-kernfs /kern kernfs rw
ptyfs /dev/pts ptyfs rw
procfs /proc procfs rw
tmpfs /var/shm tmpfs rw,-m1777,-sram%25
@@ -100,7 +98,6 @@ make_fstab_evbmips_minwrites() {
# See /usr/share/examples/fstab/ for more examples.
ROOT.a / ffs rw,log,noatime,nodevmtime 1 1
ROOT.e /boot msdos rw 1 1
-kernfs /kern kernfs rw
ptyfs /dev/pts ptyfs rw
procfs /proc procfs rw
tmpfs /tmp tmpfs rw,-s32M
@@ -128,8 +125,6 @@ make_fstab_evbmips() {
# Missing mount points from fstab
echo "./proc type=dir uname=root gname=wheel mode=0755" \
>> "$tmp/selected_sets"
- echo "./kern type=dir uname=root gname=wheel mode=0755" \
- >> "$tmp/selected_sets"
}
customize_evbmips() {
Index: src/distrib/utils/embedded/conf/rpi_inst.conf
diff -u src/distrib/utils/embedded/conf/rpi_inst.conf:1.17 src/distrib/utils/embedded/conf/rpi_inst.conf:1.18
--- src/distrib/utils/embedded/conf/rpi_inst.conf:1.17 Tue Dec 1 04:21:10 2020
+++ src/distrib/utils/embedded/conf/rpi_inst.conf Tue Jul 6 11:49:36 2021
@@ -1,4 +1,4 @@
-# $NetBSD: rpi_inst.conf,v 1.17 2020/12/01 04:21:10 rin Exp $
+# $NetBSD: rpi_inst.conf,v 1.18 2021/07/06 11:49:36 jmcneill Exp $
# Raspberry Pi customization script used by mkimage
#
@@ -24,7 +24,7 @@ make_label() {
customize() {
echo "${bar} creating directories ${bar}"
- mkdir ${mnt}/proc ${mnt}/kern
+ mkdir ${mnt}/proc
}
make_fstab() {
Index: src/distrib/utils/embedded/conf/usermode.conf
diff -u
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Thu Jul 1 17:31:21 UTC 2021
Modified Files:
src/distrib/utils/embedded/conf: arm64mbr.conf
Log Message:
No need for ec2_init on arm64mbr
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/utils/embedded/conf/arm64mbr.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/arm64mbr.conf
diff -u src/distrib/utils/embedded/conf/arm64mbr.conf:1.1 src/distrib/utils/embedded/conf/arm64mbr.conf:1.2
--- src/distrib/utils/embedded/conf/arm64mbr.conf:1.1 Thu May 28 10:22:49 2020
+++ src/distrib/utils/embedded/conf/arm64mbr.conf Thu Jul 1 17:31:21 2021
@@ -1,4 +1,4 @@
-# $NetBSD: arm64mbr.conf,v 1.1 2020/05/28 10:22:49 jmcneill Exp $
+# $NetBSD: arm64mbr.conf,v 1.2 2021/07/01 17:31:21 jmcneill Exp $
# ARM64 (MBR partitioning) customization script used by mkimage
#
board=arm64mbr
@@ -24,16 +24,10 @@ customize() {
mdnsd=YES
devpubd=YES
wscons=\$(dev_exists wsdisplay0)
-ec2_init=\$(dev_exists ena0)
EOF
}
populate_common() {
- # Add EC2 init script
- cp ${DIR}/files/ec2_init ${mnt}/etc/rc.d/ec2_init
- echo "./etc/rc.d/ec2_init type=file uname=root gname=wheel mode=0555" \
- >> "$tmp/selected_sets"
-
# Rename kernel to netbsd.img
mv "${mnt}/boot/netbsd-${kernel_GENERIC64}.img" "${mnt}/boot/netbsd.img"
CVS commit: src/distrib/utils/embedded/conf
Module Name:src Committed By: jmcneill Date: Thu Jul 1 17:32:07 UTC 2021 Modified Files: src/distrib/utils/embedded/conf: arm64.conf Log Message: port-evbarm/56274: no network on ec2 arm64 9.99.85 Add -w to dhcpcd_flags when running on EC2, since we need to wait for the network to come up before contacting the metadata service. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/distrib/utils/embedded/conf/arm64.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/arm64.conf diff -u src/distrib/utils/embedded/conf/arm64.conf:1.12 src/distrib/utils/embedded/conf/arm64.conf:1.13 --- src/distrib/utils/embedded/conf/arm64.conf:1.12 Fri Jul 17 15:16:34 2020 +++ src/distrib/utils/embedded/conf/arm64.conf Thu Jul 1 17:32:07 2021 @@ -1,4 +1,4 @@ -# $NetBSD: arm64.conf,v 1.12 2020/07/17 15:16:34 jmcneill Exp $ +# $NetBSD: arm64.conf,v 1.13 2021/07/01 17:32:07 jmcneill Exp $ # ARM64 customization script used by mkimage # board=arm64 @@ -29,6 +29,9 @@ mdnsd=YES devpubd=YES wscons=\$(dev_exists wsdisplay0) ec2_init=\$(dev_exists ena0) +if checkyesno ec2_init ; then + dhcpcd_flags="\$dhcpcd_flags -w" +fi EOF }
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: rin
Date: Tue Dec 1 04:21:26 UTC 2020
Modified Files:
src/distrib/utils/embedded/conf: rpi.conf
Log Message:
G/C unused.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/distrib/utils/embedded/conf/rpi.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/rpi.conf
diff -u src/distrib/utils/embedded/conf/rpi.conf:1.38 src/distrib/utils/embedded/conf/rpi.conf:1.39
--- src/distrib/utils/embedded/conf/rpi.conf:1.38 Wed May 27 11:02:52 2020
+++ src/distrib/utils/embedded/conf/rpi.conf Tue Dec 1 04:21:26 2020
@@ -1,11 +1,10 @@
-# $NetBSD: rpi.conf,v 1.38 2020/05/27 11:02:52 jmcneill Exp $
+# $NetBSD: rpi.conf,v 1.39 2020/12/01 04:21:26 rin Exp $
# Raspberry Pi customization script used by mkimage
#
board=rpi
kerneldir=$src/sys/arch/evbarm/compile/RPI/
kernel=$kerneldir/netbsd-RPI.bin
-kernels_rpi="RPI RPI2"
resize=true
. ${DIR}/conf/evbarm.conf
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: rin
Date: Tue Dec 1 04:21:10 UTC 2020
Modified Files:
src/distrib/utils/embedded/conf: rpi_inst.conf
Log Message:
rpi.img: Bump boot partition in a similar manner to other images.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/distrib/utils/embedded/conf/rpi_inst.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/rpi_inst.conf
diff -u src/distrib/utils/embedded/conf/rpi_inst.conf:1.16 src/distrib/utils/embedded/conf/rpi_inst.conf:1.17
--- src/distrib/utils/embedded/conf/rpi_inst.conf:1.16 Mon May 18 21:19:34 2020
+++ src/distrib/utils/embedded/conf/rpi_inst.conf Tue Dec 1 04:21:10 2020
@@ -1,4 +1,4 @@
-# $NetBSD: rpi_inst.conf,v 1.16 2020/05/18 21:19:34 jmcneill Exp $
+# $NetBSD: rpi_inst.conf,v 1.17 2020/12/01 04:21:10 rin Exp $
# Raspberry Pi customization script used by mkimage
#
@@ -12,8 +12,8 @@ image=$HOME/${board}.img
swap=8
extra=8 # spare space
-boot=112
init=8
+boot=$(( 192 - ${init} ))
size=$(( 10485760 + ${swap} * 1024 * 512 + ${boot} * 1024 * 512 + ${init} * 1024 * 512 ))
msdosid=14
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Thu May 28 10:19:02 UTC 2020
Modified Files:
src/distrib/utils/embedded/conf: evbarm.conf
Log Message:
Allow config file to override hostname
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/distrib/utils/embedded/conf/evbarm.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/evbarm.conf
diff -u src/distrib/utils/embedded/conf/evbarm.conf:1.35 src/distrib/utils/embedded/conf/evbarm.conf:1.36
--- src/distrib/utils/embedded/conf/evbarm.conf:1.35 Sun May 24 14:45:49 2020
+++ src/distrib/utils/embedded/conf/evbarm.conf Thu May 28 10:19:02 2020
@@ -1,4 +1,4 @@
-# $NetBSD: evbarm.conf,v 1.35 2020/05/24 14:45:49 jmcneill Exp $
+# $NetBSD: evbarm.conf,v 1.36 2020/05/28 10:19:02 jmcneill Exp $
# evbarm shared config
#
image=$HOME/${board}.img
@@ -151,7 +151,7 @@ dev_exists() {
}
rc_configured=YES
-hostname=${board}
+hostname=${hostname:-${board}}
no_swap=YES
savecore=NO
sshd=YES
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Wed May 27 21:53:04 UTC 2020
Modified Files:
src/distrib/utils/embedded/conf: armv7.conf
Log Message:
Move back to MBR based images for armv7 because Amlogic's bootloader (for
Amlogic S805 based boards) needs to be installed to sector 1, which
conflicts with the GPT header.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 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.43 src/distrib/utils/embedded/conf/armv7.conf:1.44
--- src/distrib/utils/embedded/conf/armv7.conf:1.43 Mon May 25 11:11:52 2020
+++ src/distrib/utils/embedded/conf/armv7.conf Wed May 27 21:53:04 2020
@@ -1,14 +1,9 @@
-# $NetBSD: armv7.conf,v 1.43 2020/05/25 11:11:52 jmcneill Exp $
+# $NetBSD: armv7.conf,v 1.44 2020/05/27 21:53:04 jmcneill Exp $
# ARMv7 customization script used by mkimage
#
board=armv7
console=fb
resize=true
-gpt=true
-gpt_hybrid=true
-gpt_create_flags="-p 16"
-gpt_label_efi="EFI"
-gpt_label_ffs="netbsd-root"
. ${DIR}/conf/evbarm.conf
@@ -59,7 +54,7 @@ populate_rpi() {
# The GENERIC .img kernel img is used for RPI2
if [ -f "${mnt}/boot/netbsd-GENERIC.img" ]; then
cat > "${mnt}/boot/cmdline.txt" << EOF
-root=NAME=${gpt_label_ffs} console=${console}
+root=ld0a console=${console}
#fb=1280x1024 # to select a mode, otherwise try EDID
#fb=disable # to disable fb completely
EOF
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Wed May 27 11:02:52 UTC 2020
Modified Files:
src/distrib/utils/embedded/conf: rpi.conf
Log Message:
Fix kernel= order, add pi0w conditional and comments
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/distrib/utils/embedded/conf/rpi.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/rpi.conf
diff -u src/distrib/utils/embedded/conf/rpi.conf:1.37 src/distrib/utils/embedded/conf/rpi.conf:1.38
--- src/distrib/utils/embedded/conf/rpi.conf:1.37 Wed May 27 10:56:59 2020
+++ src/distrib/utils/embedded/conf/rpi.conf Wed May 27 11:02:52 2020
@@ -1,4 +1,4 @@
-# $NetBSD: rpi.conf,v 1.37 2020/05/27 10:56:59 jmcneill Exp $
+# $NetBSD: rpi.conf,v 1.38 2020/05/27 11:02:52 jmcneill Exp $
# Raspberry Pi customization script used by mkimage
#
@@ -63,12 +63,17 @@ cmdline=../cmdline.txt
# UART settings, see https://www.raspberrypi.org/documentation/configuration/uart.md
enable_uart=1
force_turbo=0
+# Default kernel for BCM2836 and later
+kernel=/kernel7.img
+# Override kernel for BCM2835 based boards
[pi0]
kernel=/kernel.img
+[pi0w]
+kernel=/kernel.img
[pi1]
kernel=/kernel.img
[all]
-kernel=/kernel7.img
+#
EOF
echo "${bar} kernel ${kernel} ${bar}"
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Wed May 27 10:56:59 UTC 2020
Modified Files:
src/distrib/utils/embedded/conf: rpi.conf
Log Message:
Conditionally boot kernel.img or kernel7.img depending on board
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/distrib/utils/embedded/conf/rpi.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/rpi.conf
diff -u src/distrib/utils/embedded/conf/rpi.conf:1.36 src/distrib/utils/embedded/conf/rpi.conf:1.37
--- src/distrib/utils/embedded/conf/rpi.conf:1.36 Mon May 18 21:19:34 2020
+++ src/distrib/utils/embedded/conf/rpi.conf Wed May 27 10:56:59 2020
@@ -1,4 +1,4 @@
-# $NetBSD: rpi.conf,v 1.36 2020/05/18 21:19:34 jmcneill Exp $
+# $NetBSD: rpi.conf,v 1.37 2020/05/27 10:56:59 jmcneill Exp $
# Raspberry Pi customization script used by mkimage
#
@@ -60,10 +60,15 @@ EOF
upstream_kernel=1
os_prefix=dtb/
cmdline=../cmdline.txt
-kernel=/kernel.img
# UART settings, see https://www.raspberrypi.org/documentation/configuration/uart.md
enable_uart=1
force_turbo=0
+[pi0]
+kernel=/kernel.img
+[pi1]
+kernel=/kernel.img
+[all]
+kernel=/kernel7.img
EOF
echo "${bar} kernel ${kernel} ${bar}"
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Mon May 25 11:11:52 UTC 2020
Modified Files:
src/distrib/utils/embedded/conf: armv7.conf
Log Message:
No need to rename netbsd-GENERIC.img to kernel7.img
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 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.42 src/distrib/utils/embedded/conf/armv7.conf:1.43
--- src/distrib/utils/embedded/conf/armv7.conf:1.42 Mon May 25 11:06:49 2020
+++ src/distrib/utils/embedded/conf/armv7.conf Mon May 25 11:11:52 2020
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.42 2020/05/25 11:06:49 jmcneill Exp $
+# $NetBSD: armv7.conf,v 1.43 2020/05/25 11:11:52 jmcneill Exp $
# ARMv7 customization script used by mkimage
#
board=armv7
@@ -56,11 +56,8 @@ populate_rpi() {
firmwaredir="${src}/external/broadcom/rpi-firmware/dist"
firmwarefiles="LICENCE.broadcom bootcode.bin fixup.dat fixup_cd.dat start.elf start_cd.elf"
- # The GENERIC .img kernel needs to be installed as kernel7.img for RPI2
+ # The GENERIC .img kernel img is used for RPI2
if [ -f "${mnt}/boot/netbsd-GENERIC.img" ]; then
- echo "${bar} renaming netbsd-GENERIC.img to kernel7.img ${bar}"
- mv "${mnt}/boot/netbsd-GENERIC.img" "${mnt}/boot/kernel7.img"
-
cat > "${mnt}/boot/cmdline.txt" << EOF
root=NAME=${gpt_label_ffs} console=${console}
#fb=1280x1024 # to select a mode, otherwise try EDID
@@ -72,7 +69,7 @@ EOF
upstream_kernel=1
os_prefix=dtb/
cmdline=../cmdline.txt
-kernel=/kernel7.img
+kernel=/netbsd-GENERIC.img
# Boot options, see https://www.raspberrypi.org/documentation/configuration/config-txt/boot.md
kernel_address=0x0140
# UART settings, see https://www.raspberrypi.org/documentation/configuration/uart.md
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Mon May 25 11:06:49 UTC 2020
Modified Files:
src/distrib/utils/embedded/conf: armv7.conf
Log Message:
Switch to GPT w/ hybrid MBR for armv7 images
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 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.41 src/distrib/utils/embedded/conf/armv7.conf:1.42
--- src/distrib/utils/embedded/conf/armv7.conf:1.41 Mon May 18 21:19:34 2020
+++ src/distrib/utils/embedded/conf/armv7.conf Mon May 25 11:06:49 2020
@@ -1,9 +1,14 @@
-# $NetBSD: armv7.conf,v 1.41 2020/05/18 21:19:34 jmcneill Exp $
+# $NetBSD: armv7.conf,v 1.42 2020/05/25 11:06:49 jmcneill Exp $
# ARMv7 customization script used by mkimage
#
board=armv7
console=fb
resize=true
+gpt=true
+gpt_hybrid=true
+gpt_create_flags="-p 16"
+gpt_label_efi="EFI"
+gpt_label_ffs="netbsd-root"
. ${DIR}/conf/evbarm.conf
@@ -57,7 +62,7 @@ populate_rpi() {
mv "${mnt}/boot/netbsd-GENERIC.img" "${mnt}/boot/kernel7.img"
cat > "${mnt}/boot/cmdline.txt" << EOF
-root=ld0a console=${console}
+root=NAME=${gpt_label_ffs} console=${console}
#fb=1280x1024 # to select a mode, otherwise try EDID
#fb=disable # to disable fb completely
EOF
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Sun May 24 18:44:47 UTC 2020
Modified Files:
src/distrib/utils/embedded/conf: arm64.conf
Log Message:
Enable GPT support w/ hybrid MBR for Raspberry Pi compatibility.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/distrib/utils/embedded/conf/arm64.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/arm64.conf
diff -u src/distrib/utils/embedded/conf/arm64.conf:1.10 src/distrib/utils/embedded/conf/arm64.conf:1.11
--- src/distrib/utils/embedded/conf/arm64.conf:1.10 Mon May 18 21:19:34 2020
+++ src/distrib/utils/embedded/conf/arm64.conf Sun May 24 18:44:46 2020
@@ -1,9 +1,14 @@
-# $NetBSD: arm64.conf,v 1.10 2020/05/18 21:19:34 jmcneill Exp $
+# $NetBSD: arm64.conf,v 1.11 2020/05/24 18:44:46 jmcneill Exp $
# ARM64 customization script used by mkimage
#
board=arm64
console=fb
resize=true
+gpt=true
+gpt_hybrid=true
+gpt_create_flags="-p 16"
+gpt_label_efi="EFI"
+gpt_label_ffs="netbsd-root"
. ${DIR}/conf/evbarm.conf
@@ -52,11 +57,7 @@ populate_rpi() {
firmwarefiles="LICENCE.broadcom bootcode.bin fixup4cd.dat fixup4.dat fixup_cd.dat fixup.dat start4cd.elf start4.elf start_cd.elf start.elf"
cat > "${mnt}/boot/cmdline.txt" << EOF
-root=ld0a console=${console}
-EOF
-
- cat > "${mnt}/boot/cmdline-pi4.txt" << EOF
-root=ld1a console=${console}
+root=NAME=${gpt_label_ffs} console=${console}
EOF
cat > "${mnt}/boot/config.txt" << EOF
@@ -70,11 +71,6 @@ kernel=/netbsd.img
kernel_address=0x20
enable_uart=1
force_turbo=0
-#
-[pi4]
-cmdline=../../cmdline-pi4.txt
-#
-[all]
EOF
echo "${bar} installing firmware files ${bar}"
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Sun Feb 23 10:56:03 UTC 2020
Modified Files:
src/distrib/utils/embedded/conf: arm64.conf
Log Message:
RPi4 has a different root device, so use config.txt conditionals to load
an alternate cmdline txt file (cmdline-pi4.txt) on these boards.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/distrib/utils/embedded/conf/arm64.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/arm64.conf
diff -u src/distrib/utils/embedded/conf/arm64.conf:1.8 src/distrib/utils/embedded/conf/arm64.conf:1.9
--- src/distrib/utils/embedded/conf/arm64.conf:1.8 Mon Dec 16 11:00:30 2019
+++ src/distrib/utils/embedded/conf/arm64.conf Sun Feb 23 10:56:03 2020
@@ -1,4 +1,4 @@
-# $NetBSD: arm64.conf,v 1.8 2019/12/16 11:00:30 skrll Exp $
+# $NetBSD: arm64.conf,v 1.9 2020/02/23 10:56:03 jmcneill Exp $
# ARM64 customization script used by mkimage
#
board=arm64
@@ -73,6 +73,10 @@ populate_rpi() {
root=ld0a console=${console}
EOF
+ cat > "${mnt}/boot/cmdline-pi4.txt" << EOF
+root=ld1a console=${console}
+EOF
+
cat > "${mnt}/boot/config.txt" << EOF
#
upstream_kernel=1
@@ -82,6 +86,11 @@ kernel=netbsd.img
kernel_address=0x20
enable_uart=1
force_turbo=0
+#
+[pi4]
+cmdline=cmdline-pi4.txt
+#
+[all]
EOF
echo "${bar} installing firmware files ${bar}"
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: skrll
Date: Wed Jan 8 20:49:22 UTC 2020
Modified Files:
src/distrib/utils/embedded/conf: rpi_inst.conf
Log Message:
Use fat16 as the partition is too small for fat32. from Harold Gutch
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/distrib/utils/embedded/conf/rpi_inst.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/rpi_inst.conf
diff -u src/distrib/utils/embedded/conf/rpi_inst.conf:1.14 src/distrib/utils/embedded/conf/rpi_inst.conf:1.15
--- src/distrib/utils/embedded/conf/rpi_inst.conf:1.14 Sun Jan 5 16:41:07 2020
+++ src/distrib/utils/embedded/conf/rpi_inst.conf Wed Jan 8 20:49:22 2020
@@ -1,4 +1,4 @@
-# $NetBSD: rpi_inst.conf,v 1.14 2020/01/05 16:41:07 skrll Exp $
+# $NetBSD: rpi_inst.conf,v 1.15 2020/01/08 20:49:22 skrll Exp $
# Raspberry Pi customization script used by mkimage
#
@@ -16,7 +16,7 @@ boot=112
init=8
size=$(( 10485760 + ${swap} * 1024 * 512 + ${boot} * 1024 * 512 + ${init} * 1024 * 512 ))
-msdosid=12
+msdosid=14
make_label() {
make_label_evbarm
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: skrll
Date: Sun Jan 5 16:41:08 UTC 2020
Modified Files:
src/distrib/utils/embedded/conf: rpi_inst.conf
Log Message:
Use make_label_evbarm instead of home grown
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/distrib/utils/embedded/conf/rpi_inst.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/rpi_inst.conf
diff -u src/distrib/utils/embedded/conf/rpi_inst.conf:1.13 src/distrib/utils/embedded/conf/rpi_inst.conf:1.14
--- src/distrib/utils/embedded/conf/rpi_inst.conf:1.13 Wed Jan 1 14:16:51 2020
+++ src/distrib/utils/embedded/conf/rpi_inst.conf Sun Jan 5 16:41:07 2020
@@ -1,4 +1,4 @@
-# $NetBSD: rpi_inst.conf,v 1.13 2020/01/01 14:16:51 skrll Exp $
+# $NetBSD: rpi_inst.conf,v 1.14 2020/01/05 16:41:07 skrll Exp $
# Raspberry Pi customization script used by mkimage
#
@@ -19,50 +19,7 @@ size=$(( 10485760 + ${swap} * 1024 * 512
msdosid=12
make_label() {
- # compute all sizes in terms of sectors
- local totalsize=$(( ${newsize} * 1024 * 2 / 512 ))
-
- local swapsize=$(( ${swap} * 1024 ))
- local bootsize=$(( ${boot} * 1024 ))
-
- local bootoffset=$(( ${init} * 1024 ))
- local swapoffset=$(( ${bootoffset} + ${bootsize} ))
-
- local asize=$(( ${totalsize} - ${swapsize} - ${bootsize} - ${bootoffset} ))
- local aoffset=$(( ${swapoffset} + ${swapsize} ))
-
- local bps=512
- local spt=32
- local tpc=64
- local spc=2048
- local cylinders=$(( ${totalsize} / ${spc} ))
-
- cat << EOF
-type: SCSI
-disk: STORAGE DEVICE
-label: fictitious
-flags: removable
-bytes/sector: ${bps}
-sectors/track: ${spt}
-tracks/cylinder: ${tpc}
-sectors/cylinder: ${spc}
-cylinders: ${cylinders}
-total sectors: ${totalsize}
-rpm: 3600
-interleave: 1
-trackskew: 0
-cylinderskew: 0
-headswitch: 0 # microseconds
-track-to-track seek: 0 # microseconds
-drivedata: 0
-
-8 partitions:
-# size offsetfstype [fsize bsize cpg/sgs]
- a: ${asize} ${aoffset}4.2BSD ${fsize} ${bsize} 0 #
- b: ${swapsize} ${swapoffset} swap #
- d: ${totalsize} 0 unused 0 0 #
- e: ${bootsize} ${bootoffset} MSDOS#
-EOF
+ make_label_evbarm
}
customize() {
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: skrll
Date: Wed Jan 1 14:16:51 UTC 2020
Modified Files:
src/distrib/utils/embedded/conf: rpi_inst.conf
Log Message:
upstream_kernel=1 is required with new firmware/kernel.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/distrib/utils/embedded/conf/rpi_inst.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/rpi_inst.conf
diff -u src/distrib/utils/embedded/conf/rpi_inst.conf:1.12 src/distrib/utils/embedded/conf/rpi_inst.conf:1.13
--- src/distrib/utils/embedded/conf/rpi_inst.conf:1.12 Mon Dec 16 11:00:30 2019
+++ src/distrib/utils/embedded/conf/rpi_inst.conf Wed Jan 1 14:16:51 2020
@@ -1,4 +1,4 @@
-# $NetBSD: rpi_inst.conf,v 1.12 2019/12/16 11:00:30 skrll Exp $
+# $NetBSD: rpi_inst.conf,v 1.13 2020/01/01 14:16:51 skrll Exp $
# Raspberry Pi customization script used by mkimage
#
@@ -86,6 +86,8 @@ root=ld0a console=fb
EOF
cat > ${mnt}/boot/config.txt << EOF
+#
+upstream_kernel=1
# UART settings, see https://www.raspberrypi.org/documentation/configuration/uart.md
enable_uart=1
force_turbo=0
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: skrll
Date: Mon Dec 16 08:01:20 UTC 2019
Modified Files:
src/distrib/utils/embedded/conf: arm64.conf
Log Message:
Fix whitespace in a comment
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/distrib/utils/embedded/conf/arm64.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/arm64.conf
diff -u src/distrib/utils/embedded/conf/arm64.conf:1.6 src/distrib/utils/embedded/conf/arm64.conf:1.7
--- src/distrib/utils/embedded/conf/arm64.conf:1.6 Sun Mar 3 11:44:18 2019
+++ src/distrib/utils/embedded/conf/arm64.conf Mon Dec 16 08:01:20 2019
@@ -1,4 +1,4 @@
-# $NetBSD: arm64.conf,v 1.6 2019/03/03 11:44:18 jmcneill Exp $
+# $NetBSD: arm64.conf,v 1.7 2019/12/16 08:01:20 skrll Exp $
# ARM64 customization script used by mkimage
#
board=arm64
@@ -101,7 +101,7 @@ populate() {
kernels=""
k="$kernel_GENERIC64"
- # .imgkernel
+ # .img kernel
f="${kernel}/netbsd-${k}.img.gz"
test -f "${f}" && kernels="${kernels} ${f}"
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Sun Dec 1 15:07:04 UTC 2019
Modified Files:
src/distrib/utils/embedded/conf: evbarm.conf
Log Message:
Remove the pretty much useless 128MB swap partition from the arm images.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/distrib/utils/embedded/conf/evbarm.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/evbarm.conf
diff -u src/distrib/utils/embedded/conf/evbarm.conf:1.33 src/distrib/utils/embedded/conf/evbarm.conf:1.34
--- src/distrib/utils/embedded/conf/evbarm.conf:1.33 Tue Jun 11 10:50:57 2019
+++ src/distrib/utils/embedded/conf/evbarm.conf Sun Dec 1 15:07:04 2019
@@ -1,15 +1,14 @@
-# $NetBSD: evbarm.conf,v 1.33 2019/06/11 10:50:57 mrg Exp $
+# $NetBSD: evbarm.conf,v 1.34 2019/12/01 15:07:04 jmcneill Exp $
# evbarm shared config
#
image=$HOME/${board}.img
MACHINE=evbarm
-swap=256
extra=48 # spare space
init=32
boot=$((192 - ${init}))
-ffsoffset=$(( (${init} + ${boot} + ${swap}) / 2 ))m
+ffsoffset=$(( (${init} + ${boot}) / 2 ))m
size=0 # autocompute
msdosid=12
@@ -20,14 +19,12 @@ make_label_evbarm() {
# compute all sizes in terms of sectors
local totalsize=$(( ${newsize} * 1024 * 2 / 512 ))
- local swapsize=$(( ${swap} * 1024 ))
local bootsize=$(( ${boot} * 1024 ))
local bootoffset=$(( ${init} * 1024 ))
- local swapoffset=$(( ${bootoffset} + ${bootsize} ))
- local asize=$(( ${totalsize} - ${swapsize} - ${bootsize} - ${bootoffset} ))
- local aoffset=$(( ${swapoffset} + ${swapsize} ))
+ local asize=$(( ${totalsize} - ${bootsize} - ${bootoffset} ))
+ local aoffset=$(( ${bootoffset} + ${bootsize} ))
local bps=512
local spt=32
@@ -57,7 +54,6 @@ drivedata: 0
8 partitions:
# size offsetfstype [fsize bsize cpg/sgs]
a: ${asize} ${aoffset}4.2BSD ${fsize} ${bsize} 0 #
- b: ${swapsize} ${swapoffset} swap #
c: ${totalsize} 0 unused 0 0 #
e: ${bootsize} ${bootoffset} MSDOS#
EOF
@@ -68,7 +64,6 @@ make_fstab_evbarm_normal() {
# NetBSD /etc/fstab
# See /usr/share/examples/fstab/ for more examples.
ROOT.a / ffs rw,noatime 1 1
-ROOT.b none swap sw 0 0
ROOT.e /boot msdos rw 1 1
kernfs /kern kernfs rw
ptyfs /dev/pts ptyfs rw
@@ -85,7 +80,6 @@ make_fstab_evbarm_minwrites() {
# NetBSD /etc/fstab
# See /usr/share/examples/fstab/ for more examples.
ROOT.a / ffs rw,log,noatime,nodevmtime 1 1
-ROOT.b none swap sw 0 0
ROOT.e /boot msdos rw 1 1
kernfs /kern kernfs rw
ptyfs /dev/pts ptyfs rw
@@ -137,6 +131,8 @@ dev_exists() {
rc_configured=YES
hostname=${board}
+no_swap=YES
+savecore=NO
sshd=YES
dhcpcd=YES
ntpd=YES
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Sat Mar 30 13:43:53 UTC 2019
Modified Files:
src/distrib/utils/embedded/conf: armv7.conf
Log Message:
Install GENERIC ELF kernel as /netbsd for EFI booting
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 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.31 src/distrib/utils/embedded/conf/armv7.conf:1.32
--- src/distrib/utils/embedded/conf/armv7.conf:1.31 Sat Mar 30 13:07:57 2019
+++ src/distrib/utils/embedded/conf/armv7.conf Sat Mar 30 13:43:52 2019
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.31 2019/03/30 13:07:57 jmcneill Exp $
+# $NetBSD: armv7.conf,v 1.32 2019/03/30 13:43:52 jmcneill Exp $
# ARMv7 customization script used by mkimage
#
board=armv7
@@ -35,6 +35,11 @@ populate_common() {
if [ -f "${release}/usr/mdec/bootarm.efi" ]; then
mkdir -p "${mnt}/boot/EFI/BOOT"
cp "${release}/usr/mdec/bootarm.efi" "${mnt}/boot/EFI/BOOT/bootarm.efi"
+
+ # Install GENERIC kernel to root of the FFS partition
+ ${GZIP_CMD} -dc ${kernel}/netbsd-${kernels_generic}.gz > "${mnt}/netbsd"
+ echo "./netbsd type=file uname=root gname=wheel mode=0755" \
+ >> "$tmp/selected_sets"
fi
# Install boot script
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Sat Mar 30 13:07:57 UTC 2019
Modified Files:
src/distrib/utils/embedded/conf: armv7.conf
Log Message:
Install bootarm.efi to boot partition
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 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.30 src/distrib/utils/embedded/conf/armv7.conf:1.31
--- src/distrib/utils/embedded/conf/armv7.conf:1.30 Mon Jan 21 16:28:39 2019
+++ src/distrib/utils/embedded/conf/armv7.conf Sat Mar 30 13:07:57 2019
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.30 2019/01/21 16:28:39 jmcneill Exp $
+# $NetBSD: armv7.conf,v 1.31 2019/03/30 13:07:57 jmcneill Exp $
# ARMv7 customization script used by mkimage
#
board=armv7
@@ -31,6 +31,12 @@ EOF
}
populate_common() {
+ # Install EFI bootloader
+ if [ -f "${release}/usr/mdec/bootarm.efi" ]; then
+ mkdir -p "${mnt}/boot/EFI/BOOT"
+ cp "${release}/usr/mdec/bootarm.efi" "${mnt}/boot/EFI/BOOT/bootarm.efi"
+ fi
+
# Install boot script
cp ${DIR}/files/armv7_boot.cmd ${mnt}/boot/boot.cmd
"${MKUBOOTIMAGE}" -A arm -C none -O netbsd -T script -a 0 -n "NetBSD/armv7 boot" "${mnt}/boot/boot.cmd" "${mnt}/boot/boot.scr"
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Sun Mar 3 11:44:18 UTC 2019
Modified Files:
src/distrib/utils/embedded/conf: arm64.conf
Log Message:
Add Amlogic dtb files to arm64.img
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/distrib/utils/embedded/conf/arm64.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/arm64.conf
diff -u src/distrib/utils/embedded/conf/arm64.conf:1.5 src/distrib/utils/embedded/conf/arm64.conf:1.6
--- src/distrib/utils/embedded/conf/arm64.conf:1.5 Fri Nov 30 20:53:02 2018
+++ src/distrib/utils/embedded/conf/arm64.conf Sun Mar 3 11:44:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: arm64.conf,v 1.5 2018/11/30 20:53:02 jmcneill Exp $
+# $NetBSD: arm64.conf,v 1.6 2019/03/03 11:44:18 jmcneill Exp $
# ARM64 customization script used by mkimage
#
board=arm64
@@ -52,6 +52,12 @@ populate_allwinner() {
mv "${mnt}"/boot/sun50i-*.dtb "${mnt}/boot/dtb/allwinner/"
}
+populate_amlogic() {
+ # U-Boot expects 64-bit DTB files to live in an amlogic/ subdirectory
+ mkdir -p "${mnt}/boot/dtb/amlogic"
+ mv "${mnt}"/boot/meson-*.dtb "${mnt}/boot/dtb/amlogic/"
+}
+
populate_rockchip() {
# U-Boot expects 64-bit DTB files to live in a rockchip/ subdirectory
mkdir -p "${mnt}/boot/dtb/rockchip"
@@ -125,6 +131,7 @@ populate() {
# SoC specific configuration
populate_allwinner
+ populate_amlogic
populate_nvidia
populate_rockchip
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Mon Jan 21 16:28:39 UTC 2019
Modified Files:
src/distrib/utils/embedded/conf: armv7.conf
Log Message:
No need to specify root and console bootargs on amlogic
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 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.29 src/distrib/utils/embedded/conf/armv7.conf:1.30
--- src/distrib/utils/embedded/conf/armv7.conf:1.29 Sun Jan 20 10:18:03 2019
+++ src/distrib/utils/embedded/conf/armv7.conf Mon Jan 21 16:28:39 2019
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.29 2019/01/20 10:18:03 skrll Exp $
+# $NetBSD: armv7.conf,v 1.30 2019/01/21 16:28:39 jmcneill Exp $
# ARMv7 customization script used by mkimage
#
board=armv7
@@ -100,7 +100,7 @@ populate_amlogic() {
cat >> "${mnt}/boot/boot.ini" << EOF
ODROIDC-UBOOT-CONFIG
-setenv bootargs "root=ld0a awge0.mac-address=\${ethaddr} console=${console}"
+setenv bootargs "awge0.mac-address=\${ethaddr}"
setenv bootcmd "fatload mmc 0:1 0x2100 ${odroidc1_kernelimg}; fatload mmc 0:1 0x2000 meson8b-odroidc1.dtb; bootm 0x2100 - 0x2000"
run bootcmd
EOF
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Sun Dec 2 15:43:05 UTC 2018
Modified Files:
src/distrib/utils/embedded/conf: evbarm.conf
Log Message:
Fix variable escaping in dev_exists()
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/distrib/utils/embedded/conf/evbarm.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/evbarm.conf
diff -u src/distrib/utils/embedded/conf/evbarm.conf:1.31 src/distrib/utils/embedded/conf/evbarm.conf:1.32
--- src/distrib/utils/embedded/conf/evbarm.conf:1.31 Fri Nov 30 20:53:02 2018
+++ src/distrib/utils/embedded/conf/evbarm.conf Sun Dec 2 15:43:04 2018
@@ -1,4 +1,4 @@
-# $NetBSD: evbarm.conf,v 1.31 2018/11/30 20:53:02 jmcneill Exp $
+# $NetBSD: evbarm.conf,v 1.32 2018/12/02 15:43:04 jmcneill Exp $
# evbarm shared config
#
image=$HOME/${board}.img
@@ -128,7 +128,7 @@ customize_evbarm() {
cp ${release}/etc/rc.conf ${mnt}/etc/rc.conf
cat >> ${mnt}/etc/rc.conf << EOF
dev_exists() {
- if /sbin/drvctl -l $1 >/dev/null 2>&1 ; then
+ if /sbin/drvctl -l \$1 >/dev/null 2>&1 ; then
printf YES
else
printf NO
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: skrll
Date: Sat Oct 20 08:26:10 UTC 2018
Modified Files:
src/distrib/utils/embedded/conf: armv7.conf
Log Message:
Whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 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.24 src/distrib/utils/embedded/conf/armv7.conf:1.25
--- src/distrib/utils/embedded/conf/armv7.conf:1.24 Sat Oct 20 08:24:11 2018
+++ src/distrib/utils/embedded/conf/armv7.conf Sat Oct 20 08:26:10 2018
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.24 2018/10/20 08:24:11 skrll Exp $
+# $NetBSD: armv7.conf,v 1.25 2018/10/20 08:26:10 skrll Exp $
# ARMv7 customization script used by mkimage
#
board=armv7
@@ -67,7 +67,7 @@ EOF
echo " $f"
cp "${firmwaredir}/${f}" .
done
- )
+ )
fi
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: skrll
Date: Sat Oct 20 08:24:11 UTC 2018
Modified Files:
src/distrib/utils/embedded/conf: armv7.conf
Log Message:
a bit of sorting
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 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.23 src/distrib/utils/embedded/conf/armv7.conf:1.24
--- src/distrib/utils/embedded/conf/armv7.conf:1.23 Mon Dec 11 11:38:14 2017
+++ src/distrib/utils/embedded/conf/armv7.conf Sat Oct 20 08:24:11 2018
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.23 2017/12/11 11:38:14 jmcneill Exp $
+# $NetBSD: armv7.conf,v 1.24 2018/10/20 08:24:11 skrll Exp $
# ARMv7 customization script used by mkimage
#
board=armv7
@@ -7,11 +7,11 @@ resize=true
. ${DIR}/conf/evbarm.conf
+kernels_amlogic="ODROID-C1"
kernels_beagle="BEAGLEBOARD BEAGLEBONE"
kernels_rpi="RPI2"
-kernels_amlogic="ODROID-C1"
-kernels_tegra="TEGRA"
kernels_sunxi="SUNXI"
+kernels_tegra="TEGRA"
make_label() {
make_label_evbarm
@@ -152,11 +152,11 @@ populate() {
done
# board specific configuration
+ populate_amlogic
populate_beagle
populate_rpi
- populate_amlogic
- populate_tegra
populate_sunxi
+ populate_tegra
# common configuration
populate_common
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Sat Oct 6 13:11:22 UTC 2018
Modified Files:
src/distrib/utils/embedded/conf: evbarm.conf
Log Message:
Use special ROOT. prefix in fstab entries instead of assuming ld0
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/distrib/utils/embedded/conf/evbarm.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/evbarm.conf
diff -u src/distrib/utils/embedded/conf/evbarm.conf:1.29 src/distrib/utils/embedded/conf/evbarm.conf:1.30
--- src/distrib/utils/embedded/conf/evbarm.conf:1.29 Sat Oct 6 09:58:55 2018
+++ src/distrib/utils/embedded/conf/evbarm.conf Sat Oct 6 13:11:22 2018
@@ -1,4 +1,4 @@
-# $NetBSD: evbarm.conf,v 1.29 2018/10/06 09:58:55 jmcneill Exp $
+# $NetBSD: evbarm.conf,v 1.30 2018/10/06 13:11:22 jmcneill Exp $
# evbarm shared config
#
image=$HOME/${board}.img
@@ -67,9 +67,9 @@ make_fstab_evbarm_normal() {
cat > ${mnt}/etc/fstab << EOF
# NetBSD /etc/fstab
# See /usr/share/examples/fstab/ for more examples.
-/dev/ld0a / ffs rw,noatime 1 1
-/dev/ld0b none swap sw 0 0
-/dev/ld0e /boot msdos rw 1 1
+ROOT.a / ffs rw,noatime 1 1
+ROOT.b none swap sw 0 0
+ROOT.e /boot msdos rw 1 1
kernfs /kern kernfs rw
ptyfs /dev/pts ptyfs rw
procfs /proc procfs rw
@@ -84,9 +84,9 @@ make_fstab_evbarm_minwrites() {
cat > ${mnt}/etc/fstab << EOF
# NetBSD /etc/fstab
# See /usr/share/examples/fstab/ for more examples.
-/dev/ld0a / ffs rw,log,noatime,nodevmtime 1 1
-/dev/ld0b none swap sw 0 0
-/dev/ld0e /boot msdos rw 1 1
+ROOT.a / ffs rw,log,noatime,nodevmtime 1 1
+ROOT.b none swap sw 0 0
+ROOT.e /boot msdos rw 1 1
kernfs /kern kernfs rw
ptyfs /dev/pts ptyfs rw
procfs /proc procfs rw
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Sun Aug 12 17:15:56 UTC 2018
Modified Files:
src/distrib/utils/embedded/conf: arm64.conf
Log Message:
Move rk3399 dtb files to the correct location
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/utils/embedded/conf/arm64.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/arm64.conf
diff -u src/distrib/utils/embedded/conf/arm64.conf:1.2 src/distrib/utils/embedded/conf/arm64.conf:1.3
--- src/distrib/utils/embedded/conf/arm64.conf:1.2 Tue Jun 19 15:13:51 2018
+++ src/distrib/utils/embedded/conf/arm64.conf Sun Aug 12 17:15:56 2018
@@ -1,4 +1,4 @@
-# $NetBSD: arm64.conf,v 1.2 2018/06/19 15:13:51 jmcneill Exp $
+# $NetBSD: arm64.conf,v 1.3 2018/08/12 17:15:56 jmcneill Exp $
# ARM64 customization script used by mkimage
#
board=arm64
@@ -44,6 +44,7 @@ populate_rockchip() {
# U-Boot expects 64-bit DTB files to live in a rockchip/ subdirectory
mkdir -p "${mnt}/boot/dtb/rockchip"
mv "${mnt}"/boot/rk3328-*.dtb "${mnt}/boot/dtb/rockchip/"
+ mv "${mnt}"/boot/rk3399-*.dtb "${mnt}/boot/dtb/rockchip/"
}
populate_rpi() {
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Tue Jun 19 15:13:51 UTC 2018
Modified Files:
src/distrib/utils/embedded/conf: arm64.conf
Log Message:
Install RK3328 .dtb files to the correct location
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/utils/embedded/conf/arm64.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/arm64.conf
diff -u src/distrib/utils/embedded/conf/arm64.conf:1.1 src/distrib/utils/embedded/conf/arm64.conf:1.2
--- src/distrib/utils/embedded/conf/arm64.conf:1.1 Sun Apr 1 04:35:02 2018
+++ src/distrib/utils/embedded/conf/arm64.conf Tue Jun 19 15:13:51 2018
@@ -1,4 +1,4 @@
-# $NetBSD: arm64.conf,v 1.1 2018/04/01 04:35:02 ryo Exp $
+# $NetBSD: arm64.conf,v 1.2 2018/06/19 15:13:51 jmcneill Exp $
# ARM64 customization script used by mkimage
#
board=arm64
@@ -40,6 +40,12 @@ populate_allwinner() {
mv "${mnt}"/boot/sun50i-*.dtb "${mnt}/boot/dtb/allwinner/"
}
+populate_rockchip() {
+ # U-Boot expects 64-bit DTB files to live in a rockchip/ subdirectory
+ mkdir -p "${mnt}/boot/dtb/rockchip"
+ mv "${mnt}"/boot/rk3328-*.dtb "${mnt}/boot/dtb/rockchip/"
+}
+
populate_rpi() {
firmwaredir="${src}/external/broadcom/rpi-firmware/dist"
firmwarefiles="LICENCE.broadcom bootcode.bin fixup.dat fixup_cd.dat start.elf start_cd.elf"
@@ -107,6 +113,7 @@ populate() {
# SoC specific configuration
populate_allwinner
populate_nvidia
+ populate_rockchip
# Board specific configuration
populate_rpi
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Tue Jun 19 15:12:05 UTC 2018
Modified Files:
src/distrib/utils/embedded/conf: evbarm.conf
Log Message:
Increase reserved space at start of image from 4MB to 16MB to make room
for Rockchip bootloaders.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/distrib/utils/embedded/conf/evbarm.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/evbarm.conf
diff -u src/distrib/utils/embedded/conf/evbarm.conf:1.27 src/distrib/utils/embedded/conf/evbarm.conf:1.28
--- src/distrib/utils/embedded/conf/evbarm.conf:1.27 Sat May 13 10:44:58 2017
+++ src/distrib/utils/embedded/conf/evbarm.conf Tue Jun 19 15:12:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: evbarm.conf,v 1.27 2017/05/13 10:44:58 hubertf Exp $
+# $NetBSD: evbarm.conf,v 1.28 2018/06/19 15:12:05 jmcneill Exp $
# evbarm shared config
#
image=$HOME/${board}.img
@@ -7,7 +7,7 @@ MACHINE=evbarm
swap=256
extra=48 # spare space
-init=8
+init=32
boot=$((192 - ${init}))
ffsoffset=$(( (${init} + ${boot} + ${swap}) / 2 ))m
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Tue Dec 12 21:00:28 UTC 2017
Modified Files:
src/distrib/utils/embedded/conf: rpi.conf
Log Message:
Fix spelling in error message
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/distrib/utils/embedded/conf/rpi.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/rpi.conf
diff -u src/distrib/utils/embedded/conf/rpi.conf:1.33 src/distrib/utils/embedded/conf/rpi.conf:1.34
--- src/distrib/utils/embedded/conf/rpi.conf:1.33 Mon Dec 11 11:38:14 2017
+++ src/distrib/utils/embedded/conf/rpi.conf Tue Dec 12 21:00:28 2017
@@ -1,4 +1,4 @@
-# $NetBSD: rpi.conf,v 1.33 2017/12/11 11:38:14 jmcneill Exp $
+# $NetBSD: rpi.conf,v 1.34 2017/12/12 21:00:28 jmcneill Exp $
# Raspberry Pi customization script used by mkimage
#
@@ -121,6 +121,6 @@ EOF
echo " $f"
cp ${firmwaredir}/${f} . || exit 1
done
- ) || fail "Copy of firmeware into ${mnt}/boot failed"
+ ) || fail "Copy of firmware into ${mnt}/boot failed"
}
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Sun Dec 3 13:31:45 UTC 2017
Modified Files:
src/distrib/utils/embedded/conf: armv7.conf
Log Message:
On 64-bit boards, U-Boot expects to find .dtb files in an allwinner/
subdirectory
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 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.21 src/distrib/utils/embedded/conf/armv7.conf:1.22
--- src/distrib/utils/embedded/conf/armv7.conf:1.21 Thu Nov 30 19:55:47 2017
+++ src/distrib/utils/embedded/conf/armv7.conf Sun Dec 3 13:31:45 2017
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.21 2017/11/30 19:55:47 jmcneill Exp $
+# $NetBSD: armv7.conf,v 1.22 2017/12/03 13:31:45 jmcneill Exp $
# ARMv7 customization script used by mkimage
#
board=armv7
@@ -103,7 +103,9 @@ EOF
}
populate_sunxi() {
- :
+ # U-Boot expects 64-bit DTB files to live in an allwinner/ subdirectory
+ mkdir -p "${mnt}/boot/allwinner"
+ mv "${mnt}"/boot/sun50i-* "${mnt}/boot/allwinner/"
}
populate_tegra() {
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Thu Nov 30 19:55:47 UTC 2017
Modified Files:
src/distrib/utils/embedded/conf: armv7.conf
Log Message:
Remove legacy awin kernels from image
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 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.20 src/distrib/utils/embedded/conf/armv7.conf:1.21
--- src/distrib/utils/embedded/conf/armv7.conf:1.20 Tue Nov 28 02:56:44 2017
+++ src/distrib/utils/embedded/conf/armv7.conf Thu Nov 30 19:55:47 2017
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.20 2017/11/28 02:56:44 kre Exp $
+# $NetBSD: armv7.conf,v 1.21 2017/11/30 19:55:47 jmcneill Exp $
# ARMv7 customization script used by mkimage
#
board=armv7
@@ -8,7 +8,6 @@ resize=true
. ${DIR}/conf/evbarm.conf
kernels_beagle="BEAGLEBOARD BEAGLEBONE"
-kernels_awin="BPI CUBIEBOARD CUBIETRUCK"
kernels_rpi="RPI2"
kernels_amlogic="ODROID-C1"
kernels_tegra="TEGRA"
@@ -41,10 +40,6 @@ populate_beagle() {
:
}
-populate_awin() {
- :
-}
-
populate_rpi() {
firmwaredir="${src}/external/broadcom/rpi-firmware/dist"
firmwarefiles="LICENCE.broadcom bootcode.bin fixup.dat fixup_cd.dat start.elf start_cd.elf"
@@ -119,7 +114,7 @@ populate() {
echo "${bar} looking for kernels in ${kernel} ${bar}"
kernels=""
# .ub kernels
- for k in $kernels_beagle $kernels_awin $kernels_sunxi $kernels_amlogic $kernels_tegra; do
+ for k in $kernels_beagle $kernels_sunxi $kernels_amlogic $kernels_tegra; do
f="${kernel}/netbsd-${k}.ub.gz"
test -f "${f}" && kernels="${kernels} ${f}"
done
@@ -156,7 +151,6 @@ populate() {
# board specific configuration
populate_beagle
- populate_awin
populate_rpi
populate_amlogic
populate_tegra
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: skrll
Date: Thu Nov 9 21:36:46 UTC 2017
Modified Files:
src/distrib/utils/embedded/conf: armv7.conf rpi.conf
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/distrib/utils/embedded/conf/armv7.conf
cvs rdiff -u -r1.30 -r1.31 src/distrib/utils/embedded/conf/rpi.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.18 src/distrib/utils/embedded/conf/armv7.conf:1.19
--- src/distrib/utils/embedded/conf/armv7.conf:1.18 Sun Oct 8 00:15:13 2017
+++ src/distrib/utils/embedded/conf/armv7.conf Thu Nov 9 21:36:46 2017
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.18 2017/10/08 00:15:13 jmcneill Exp $
+# $NetBSD: armv7.conf,v 1.19 2017/11/09 21:36:46 skrll Exp $
# ARMv7 customization script used by mkimage
#
board=armv7
@@ -62,7 +62,7 @@ EOF
cat > ${mnt}/boot/config.txt << EOF
# UART settings, see https://www.raspberrypi.org/documentation/configuration/uart.md
-enable_uart=1
+enable_uart=1
force_turbo=0
EOF
Index: src/distrib/utils/embedded/conf/rpi.conf
diff -u src/distrib/utils/embedded/conf/rpi.conf:1.30 src/distrib/utils/embedded/conf/rpi.conf:1.31
--- src/distrib/utils/embedded/conf/rpi.conf:1.30 Mon Jul 31 16:34:22 2017
+++ src/distrib/utils/embedded/conf/rpi.conf Thu Nov 9 21:36:46 2017
@@ -1,4 +1,4 @@
-# $NetBSD: rpi.conf,v 1.30 2017/07/31 16:34:22 jmcneill Exp $
+# $NetBSD: rpi.conf,v 1.31 2017/11/09 21:36:46 skrll Exp $
# Raspberry Pi customization script used by mkimage
#
@@ -49,7 +49,7 @@ populate() {
cat > ${mnt}/boot/cmdline.txt << EOF
root=ld0a console=fb
-#fb=1280x1024 # to select a mode, otherwise try EDID
+#fb=1280x1024 # to select a mode, otherwise try EDID
#fb=disable # to disable fb completely
EOF
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Sun Oct 8 00:15:13 UTC 2017
Modified Files:
src/distrib/utils/embedded/conf: armv7.conf
Log Message:
Don't install uEnv.txt for beagle; boot.scr handles this now.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 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.17 src/distrib/utils/embedded/conf/armv7.conf:1.18
--- src/distrib/utils/embedded/conf/armv7.conf:1.17 Sat Oct 7 23:40:00 2017
+++ src/distrib/utils/embedded/conf/armv7.conf Sun Oct 8 00:15:13 2017
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.17 2017/10/07 23:40:00 jmcneill Exp $
+# $NetBSD: armv7.conf,v 1.18 2017/10/08 00:15:13 jmcneill Exp $
# ARMv7 customization script used by mkimage
#
board=armv7
@@ -38,15 +38,7 @@ populate_common() {
}
populate_beagle() {
- bboard_kernelimg=netbsd-BEAGLEBOARD.ub
- bboard_loadaddr=8100
- bbone_kernelimg=netbsd-BEAGLEBONE.ub
- bbone_loadaddr=8200
-
- # Create a uEnv.txt to auto boot the correct kernel
- 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() {
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Mon Jul 31 16:34:23 UTC 2017
Modified Files:
src/distrib/utils/embedded/conf: armv7.conf rpi.conf rpi_inst.conf
Log Message:
Create a config.txt for RPI and set 'enable_uart=1' and 'force_turbo=0'.
This config gives us a stable core_freq clock that is used to drive the
SD HOST and AUX UART devices.
More information on config.txt settings for the UART can be found here:
https://www.raspberrypi.org/documentation/configuration/uart.md
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/distrib/utils/embedded/conf/armv7.conf
cvs rdiff -u -r1.29 -r1.30 src/distrib/utils/embedded/conf/rpi.conf
cvs rdiff -u -r1.8 -r1.9 src/distrib/utils/embedded/conf/rpi_inst.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.15 src/distrib/utils/embedded/conf/armv7.conf:1.16
--- src/distrib/utils/embedded/conf/armv7.conf:1.15 Sun Jul 9 10:41:40 2017
+++ src/distrib/utils/embedded/conf/armv7.conf Mon Jul 31 16:34:22 2017
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.15 2017/07/09 10:41:40 jmcneill Exp $
+# $NetBSD: armv7.conf,v 1.16 2017/07/31 16:34:22 jmcneill Exp $
# ARMv7 customization script used by mkimage
#
board=armv7
@@ -65,6 +65,12 @@ root=ld0a console=${console}
#fb=disable # to disable fb completely
EOF
+ cat > ${mnt}/boot/config.txt << EOF
+# UART settings, see https://www.raspberrypi.org/documentation/configuration/uart.md
+enable_uart=1
+force_turbo=0
+EOF
+
echo "${bar} installing firmware files ${bar}"
(cd "${mnt}/boot" &&
for f in ${firmwarefiles}; do
Index: src/distrib/utils/embedded/conf/rpi.conf
diff -u src/distrib/utils/embedded/conf/rpi.conf:1.29 src/distrib/utils/embedded/conf/rpi.conf:1.30
--- src/distrib/utils/embedded/conf/rpi.conf:1.29 Sun Apr 19 18:28:31 2015
+++ src/distrib/utils/embedded/conf/rpi.conf Mon Jul 31 16:34:22 2017
@@ -1,4 +1,4 @@
-# $NetBSD: rpi.conf,v 1.29 2015/04/19 18:28:31 hubertf Exp $
+# $NetBSD: rpi.conf,v 1.30 2017/07/31 16:34:22 jmcneill Exp $
# Raspberry Pi customization script used by mkimage
#
@@ -52,6 +52,13 @@ root=ld0a console=fb
#fb=1280x1024 # to select a mode, otherwise try EDID
#fb=disable # to disable fb completely
EOF
+
+ cat > ${mnt}/boot/config.txt << EOF
+# UART settings, see https://www.raspberrypi.org/documentation/configuration/uart.md
+enable_uart=1
+force_turbo=0
+EOF
+
if [ ! -f ${kernel} ]; then
echo ${PROG}: Missing ${kernel} 1>&2
exit 1
Index: src/distrib/utils/embedded/conf/rpi_inst.conf
diff -u src/distrib/utils/embedded/conf/rpi_inst.conf:1.8 src/distrib/utils/embedded/conf/rpi_inst.conf:1.9
--- src/distrib/utils/embedded/conf/rpi_inst.conf:1.8 Sun Apr 19 18:53:33 2015
+++ src/distrib/utils/embedded/conf/rpi_inst.conf Mon Jul 31 16:34:22 2017
@@ -1,4 +1,4 @@
-# $NetBSD: rpi_inst.conf,v 1.8 2015/04/19 18:53:33 hubertf Exp $
+# $NetBSD: rpi_inst.conf,v 1.9 2017/07/31 16:34:22 jmcneill Exp $
# Raspberry Pi customization script used by mkimage
#
@@ -82,6 +82,13 @@ root=ld0a console=fb
#fb=1280x1024 # to select a mode, otherwise try EDID
#fb=disable # to disable fb completely
EOF
+
+ cat > ${mnt}/boot/config.txt << EOF
+# UART settings, see https://www.raspberrypi.org/documentation/configuration/uart.md
+enable_uart=1
+force_turbo=0
+EOF
+
if [ ! -f ${kernel} ]; then
echo ${PROG}: Missing ${kernel} 1>&2
exit 1
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Sun Jul 9 10:41:40 UTC 2017
Modified Files:
src/distrib/utils/embedded/conf: armv7.conf
Log Message:
Add : to body of populate_sunxi to appease bash.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 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.14 src/distrib/utils/embedded/conf/armv7.conf:1.15
--- src/distrib/utils/embedded/conf/armv7.conf:1.14 Thu Jul 6 21:07:09 2017
+++ src/distrib/utils/embedded/conf/armv7.conf Sun Jul 9 10:41:40 2017
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.14 2017/07/06 21:07:09 jmcneill Exp $
+# $NetBSD: armv7.conf,v 1.15 2017/07/09 10:41:40 jmcneill Exp $
# ARMv7 customization script used by mkimage
#
board=armv7
@@ -107,6 +107,7 @@ EOF
}
populate_sunxi() {
+ :
}
populate_tegra() {
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Thu Jul 6 21:07:09 UTC 2017
Modified Files:
src/distrib/utils/embedded/conf: armv7.conf
Log Message:
Test for kernel build directory before reading DTB list
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 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.13 src/distrib/utils/embedded/conf/armv7.conf:1.14
--- src/distrib/utils/embedded/conf/armv7.conf:1.13 Thu Jul 6 00:17:04 2017
+++ src/distrib/utils/embedded/conf/armv7.conf Thu Jul 6 21:07:09 2017
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.13 2017/07/06 00:17:04 jmcneill Exp $
+# $NetBSD: armv7.conf,v 1.14 2017/07/06 21:07:09 jmcneill Exp $
# ARMv7 customization script used by mkimage
#
board=armv7
@@ -139,7 +139,9 @@ populate() {
done
# .dtb files
for k in $kernels_sunxi $kernels_tegra; do
- dtbs="$(${MAKE} -C ${KERNOBJDIR}/${k} -v DTB)"
+ test -d "${KERNOBJDIR}/${k}" && \
+ dtbs="$(${MAKE} -C ${KERNOBJDIR}/${k} -v DTB)" || \
+ dtbs=
for dtb in $dtbs; do
f="${kernel}/${dtb}.gz"
test -f "${f}" && kernels="${kernels} ${f}"
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: hubertf
Date: Sat May 13 10:44:58 UTC 2017
Modified Files:
src/distrib/utils/embedded/conf: evbarm.conf
Log Message:
minor cleanup in customize_evbarm():
keep handling of /etc/rc.conf in one place
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/distrib/utils/embedded/conf/evbarm.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/evbarm.conf
diff -u src/distrib/utils/embedded/conf/evbarm.conf:1.26 src/distrib/utils/embedded/conf/evbarm.conf:1.27
--- src/distrib/utils/embedded/conf/evbarm.conf:1.26 Wed Apr 12 23:32:11 2017
+++ src/distrib/utils/embedded/conf/evbarm.conf Sat May 13 10:44:58 2017
@@ -1,4 +1,4 @@
-# $NetBSD: evbarm.conf,v 1.26 2017/04/12 23:32:11 jmcneill Exp $
+# $NetBSD: evbarm.conf,v 1.27 2017/05/13 10:44:58 hubertf Exp $
# evbarm shared config
#
image=$HOME/${board}.img
@@ -118,13 +118,14 @@ make_fstab_evbarm() {
}
customize_evbarm() {
- cp ${release}/etc/rc.conf ${mnt}/etc/rc.conf
if $minwrites; then
mkdir ${mnt}/etc/postfix
(umask 022
sed -e 's/fifo/unix/' < ${release}/etc/postfix/master.cf > \
${mnt}/etc/postfix/master.cf)
fi
+
+ cp ${release}/etc/rc.conf ${mnt}/etc/rc.conf
cat >> ${mnt}/etc/rc.conf << EOF
rc_configured=YES
hostname=${board}
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Wed Apr 12 23:35:29 UTC 2017
Modified Files:
src/distrib/utils/embedded/conf: armv7.conf
Log Message:
ODROID-C1: Now that the MBR partition table contains an entry for the BSD
partition, the disklabel no longer conflicts with the ODROID-C1 bootloader.
Root partition changes from ld0e to ld0a.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 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.11 src/distrib/utils/embedded/conf/armv7.conf:1.12
--- src/distrib/utils/embedded/conf/armv7.conf:1.11 Mon Apr 10 22:25:36 2017
+++ src/distrib/utils/embedded/conf/armv7.conf Wed Apr 12 23:35:29 2017
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.11 2017/04/10 22:25:36 jmcneill Exp $
+# $NetBSD: armv7.conf,v 1.12 2017/04/12 23:35:29 jmcneill Exp $
# ARMv7 customization script used by mkimage
#
board=armv7
@@ -99,7 +99,7 @@ populate_amlogic() {
cat >> "${mnt}/boot/boot.ini" << EOF
ODROIDC-UBOOT-CONFIG
-setenv bootargs "root=ld0f awge0.mac-address=\${ethaddr} console=${console}"
+setenv bootargs "root=ld0a awge0.mac-address=\${ethaddr} console=${console}"
setenv bootcmd "fatload mmc 0:1 0x2100 ${odroidc1_kernelimg}; bootm 0x2100"
run bootcmd
EOF
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Wed Apr 12 23:32:11 UTC 2017
Modified Files:
src/distrib/utils/embedded/conf: evbarm.conf
Log Message:
Slightly reduce the size of the MSDOS partition from 124M to 92M. With
the larger size, installing the ODROID-C1 bootloader causes the fs to
become unreadable. Not sure why..
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/distrib/utils/embedded/conf/evbarm.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/evbarm.conf
diff -u src/distrib/utils/embedded/conf/evbarm.conf:1.25 src/distrib/utils/embedded/conf/evbarm.conf:1.26
--- src/distrib/utils/embedded/conf/evbarm.conf:1.25 Tue Apr 11 17:30:17 2017
+++ src/distrib/utils/embedded/conf/evbarm.conf Wed Apr 12 23:32:11 2017
@@ -1,4 +1,4 @@
-# $NetBSD: evbarm.conf,v 1.25 2017/04/11 17:30:17 jmcneill Exp $
+# $NetBSD: evbarm.conf,v 1.26 2017/04/12 23:32:11 jmcneill Exp $
# evbarm shared config
#
image=$HOME/${board}.img
@@ -8,7 +8,7 @@ MACHINE=evbarm
swap=256
extra=48 # spare space
init=8
-boot=$((256 - ${init}))
+boot=$((192 - ${init}))
ffsoffset=$(( (${init} + ${boot} + ${swap}) / 2 ))m
size=0 # autocompute
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Tue Apr 11 17:30:17 UTC 2017
Modified Files:
src/distrib/utils/embedded/conf: evbarm.conf
Log Message:
Increase the size of the boot partition and remove the 'd' part from the
disklabel.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/distrib/utils/embedded/conf/evbarm.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/evbarm.conf
diff -u src/distrib/utils/embedded/conf/evbarm.conf:1.24 src/distrib/utils/embedded/conf/evbarm.conf:1.25
--- src/distrib/utils/embedded/conf/evbarm.conf:1.24 Sat Aug 1 10:04:50 2015
+++ src/distrib/utils/embedded/conf/evbarm.conf Tue Apr 11 17:30:17 2017
@@ -1,4 +1,4 @@
-# $NetBSD: evbarm.conf,v 1.24 2015/08/01 10:04:50 jmcneill Exp $
+# $NetBSD: evbarm.conf,v 1.25 2017/04/11 17:30:17 jmcneill Exp $
# evbarm shared config
#
image=$HOME/${board}.img
@@ -7,8 +7,8 @@ MACHINE=evbarm
swap=256
extra=48 # spare space
-boot=120
init=8
+boot=$((256 - ${init}))
ffsoffset=$(( (${init} + ${boot} + ${swap}) / 2 ))m
size=0 # autocompute
@@ -59,7 +59,6 @@ drivedata: 0
a: ${asize} ${aoffset}4.2BSD ${fsize} ${bsize} 0 #
b: ${swapsize} ${swapoffset} swap #
c: ${totalsize} 0 unused 0 0 #
- d: ${totalsize} 0 unused 0 0 #
e: ${bootsize} ${bootoffset} MSDOS#
EOF
}
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Mon Apr 10 22:25:36 UTC 2017
Modified Files:
src/distrib/utils/embedded/conf: armv7.conf
Log Message:
tegra: set loadaddr to 0x9000 (the default kernel_addr_r overlaps
fdt_addr_r on TK1 + L4T 21.x), and set default root device to ld0a to
match new device probe order.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 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.10 src/distrib/utils/embedded/conf/armv7.conf:1.11
--- src/distrib/utils/embedded/conf/armv7.conf:1.10 Sat Dec 19 14:57:49 2015
+++ src/distrib/utils/embedded/conf/armv7.conf Mon Apr 10 22:25:36 2017
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.10 2015/12/19 14:57:49 skrll Exp $
+# $NetBSD: armv7.conf,v 1.11 2017/04/10 22:25:36 jmcneill Exp $
# ARMv7 customization script used by mkimage
#
board=armv7
@@ -107,14 +107,15 @@ EOF
populate_tegra() {
tegra_kernelimg=netbsd-TEGRA.ub
+ tegra_loadaddr=0x9000
# Create a boot.scr for Tegra U-Boot
cat > "${mnt}/boot/boot-TEGRA.txt" << EOF
-setenv bootargs root=ld1a
-fatload mmc 1:1 \${kernel_addr_r} ${tegra_kernelimg}
+setenv bootargs root=ld0a
+fatload mmc 1:1 ${tegra_loadaddr} ${tegra_kernelimg}
fatload mmc 1:1 \${fdt_addr_r} tegra124-\${board}.dtb
fdt addr \${fdt_addr_r}
-bootm \${kernel_addr_r} - \${fdt_addr_r}
+bootm ${tegra_loadaddr} - \${fdt_addr_r}
EOF
"${MKUBOOTIMAGE}" -A arm -C none -O netbsd -T script -a 0 -n "NetBSD/tegra boot" "${mnt}/boot/boot-TEGRA.txt" "${mnt}/boot/boot.scr"
}
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: skrll
Date: Sat Dec 19 14:57:49 UTC 2015
Modified Files:
src/distrib/utils/embedded/conf: armv7.conf
Log Message:
C of change in rpi.conf (maybe factor out)
By default, RPI firmware sets the max CPU frequency to 600MHz. This can be
overridden by setting arm_freq in config.txt, but the default freq at boot
is still 600MHz.
Add logic to rc.local to compare the current vs. max CPU frequency; if they
differ, set the target frequency to the maximum.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 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.9 src/distrib/utils/embedded/conf/armv7.conf:1.10
--- src/distrib/utils/embedded/conf/armv7.conf:1.9 Sun Dec 13 23:02:56 2015
+++ src/distrib/utils/embedded/conf/armv7.conf Sat Dec 19 14:57:49 2015
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.9 2015/12/13 23:02:56 jmcneill Exp $
+# $NetBSD: armv7.conf,v 1.10 2015/12/19 14:57:49 skrll Exp $
# ARMv7 customization script used by mkimage
#
board=armv7
@@ -73,6 +73,23 @@ EOF
)
fi
+
+ #
+ # If arm_freq is specified in config.txt, set CPU frequency
+ # to match at boot time.
+ #
+ cp ${release}/etc/rc.local ${mnt}/etc/rc.local
+ cat >> ${mnt}/etc/rc.local << EOF
+if /sbin/sysctl -q machdep.cpu.frequency.max; then
+ cpufreq_max=\$(/sbin/sysctl -n machdep.cpu.frequency.max)
+ cpufreq_cur=\$(/sbin/sysctl -n machdep.cpu.frequency.current)
+ if [ ! "\$cpufreq_max" = "\$cpufreq_cur" ]; then
+ /sbin/sysctl -w machdep.cpu.frequency.target=\$cpufreq_max
+ fi
+fi
+EOF
+ echo "./etc/rc.local type=file uname=root gname=wheel mode=0644" \
+ >> "$tmp/selected_sets"
}
populate_amlogic() {
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Fri Aug 21 17:08:11 UTC 2015
Modified Files:
src/distrib/utils/embedded/conf: armv7.conf
Log Message:
Cubieboard2 kernel is named netbsd-CUBIEBOARD.ub not netbsd-CUBIEBOARD2.ub
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 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.7 src/distrib/utils/embedded/conf/armv7.conf:1.8
--- src/distrib/utils/embedded/conf/armv7.conf:1.7 Sun Aug 2 11:11:32 2015
+++ src/distrib/utils/embedded/conf/armv7.conf Fri Aug 21 17:08:11 2015
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.7 2015/08/02 11:11:32 jmcneill Exp $
+# $NetBSD: armv7.conf,v 1.8 2015/08/21 17:08:11 jmcneill Exp $
# ARMv7 customization script used by mkimage
#
board=armv7
@@ -45,7 +45,7 @@ EOF
populate_awin() {
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 8200 \$kernel; bootm 8200
+uenvcmd=mmc dev 0; mmc rescan; if test \$fdtfile = sun7i-a20-cubieboard2.dtb; then setenv kernel netbsd-CUBIEBOARD.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 8200 \$kernel; bootm 8200
EOF
}
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Sun Aug 2 11:11:32 UTC 2015
Modified Files:
src/distrib/utils/embedded/conf: armv7.conf
Log Message:
install jetsontk1 boot script as boot.scr
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 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.6 src/distrib/utils/embedded/conf/armv7.conf:1.7
--- src/distrib/utils/embedded/conf/armv7.conf:1.6 Wed Jul 15 11:29:16 2015
+++ src/distrib/utils/embedded/conf/armv7.conf Sun Aug 2 11:11:32 2015
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.6 2015/07/15 11:29:16 martin Exp $
+# $NetBSD: armv7.conf,v 1.7 2015/08/02 11:11:32 jmcneill Exp $
# ARMv7 customization script used by mkimage
#
board=armv7
@@ -97,7 +97,7 @@ setenv bootargs root=ld1a
fatload mmc 1:1 0x9000 ${jetsontk1_kernelimg}
bootm 0x9000
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.scr
}
populate() {
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Sat Aug 1 10:04:50 UTC 2015
Modified Files:
src/distrib/utils/embedded/conf: evbarm.conf
Log Message:
mount root partition with noatime
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/distrib/utils/embedded/conf/evbarm.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/evbarm.conf
diff -u src/distrib/utils/embedded/conf/evbarm.conf:1.23 src/distrib/utils/embedded/conf/evbarm.conf:1.24
--- src/distrib/utils/embedded/conf/evbarm.conf:1.23 Sat Aug 1 10:04:06 2015
+++ src/distrib/utils/embedded/conf/evbarm.conf Sat Aug 1 10:04:50 2015
@@ -1,4 +1,4 @@
-# $NetBSD: evbarm.conf,v 1.23 2015/08/01 10:04:06 jmcneill Exp $
+# $NetBSD: evbarm.conf,v 1.24 2015/08/01 10:04:50 jmcneill Exp $
# evbarm shared config
#
image=$HOME/${board}.img
@@ -68,7 +68,7 @@ make_fstab_evbarm_normal() {
cat ${mnt}/etc/fstab EOF
# NetBSD /etc/fstab
# See /usr/share/examples/fstab/ for more examples.
-/dev/ld0a / ffs rw 1 1
+/dev/ld0a / ffs rw,noatime 1 1
/dev/ld0b none swap sw 0 0
/dev/ld0e /boot msdos rw 1 1
kernfs /kern kernfs rw
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Sat Aug 1 10:04:06 UTC 2015
Modified Files:
src/distrib/utils/embedded/conf: evbarm.conf
Log Message:
Align partitions to 64MB for the benefit of SD cards 32GB
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/distrib/utils/embedded/conf/evbarm.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/evbarm.conf
diff -u src/distrib/utils/embedded/conf/evbarm.conf:1.22 src/distrib/utils/embedded/conf/evbarm.conf:1.23
--- src/distrib/utils/embedded/conf/evbarm.conf:1.22 Mon Apr 6 22:44:46 2015
+++ src/distrib/utils/embedded/conf/evbarm.conf Sat Aug 1 10:04:06 2015
@@ -1,4 +1,4 @@
-# $NetBSD: evbarm.conf,v 1.22 2015/04/06 22:44:46 jmcneill Exp $
+# $NetBSD: evbarm.conf,v 1.23 2015/08/01 10:04:06 jmcneill Exp $
# evbarm shared config
#
image=$HOME/${board}.img
@@ -7,7 +7,7 @@ MACHINE=evbarm
swap=256
extra=48 # spare space
-boot=112
+boot=120
init=8
ffsoffset=$(( (${init} + ${boot} + ${swap}) / 2 ))m
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: martin
Date: Wed Jul 15 11:29:16 UTC 2015
Modified Files:
src/distrib/utils/embedded/conf: armv7.conf
Log Message:
Properly escape the $ when trying to pass the u-boot env var $kernel.
From Rin Okuyama.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 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.5 src/distrib/utils/embedded/conf/armv7.conf:1.6
--- src/distrib/utils/embedded/conf/armv7.conf:1.5 Wed Jul 8 10:57:46 2015
+++ src/distrib/utils/embedded/conf/armv7.conf Wed Jul 15 11:29:16 2015
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.5 2015/07/08 10:57:46 skrll Exp $
+# $NetBSD: armv7.conf,v 1.6 2015/07/15 11:29:16 martin Exp $
# ARMv7 customization script used by mkimage
#
board=armv7
@@ -45,7 +45,7 @@ EOF
populate_awin() {
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 8200 ${kernel}; bootm 8200
+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 8200 \$kernel; bootm 8200
EOF
}
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: skrll
Date: Wed Jul 8 10:57:46 UTC 2015
Modified Files:
src/distrib/utils/embedded/conf: armv7.conf
Log Message:
Turn resize on
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 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.4 src/distrib/utils/embedded/conf/armv7.conf:1.5
--- src/distrib/utils/embedded/conf/armv7.conf:1.4 Sun May 24 17:11:18 2015
+++ src/distrib/utils/embedded/conf/armv7.conf Wed Jul 8 10:57:46 2015
@@ -1,8 +1,9 @@
-# $NetBSD: armv7.conf,v 1.4 2015/05/24 17:11:18 christos Exp $
+# $NetBSD: armv7.conf,v 1.5 2015/07/08 10:57:46 skrll Exp $
# ARMv7 customization script used by mkimage
#
board=armv7
console=fb
+resize=true
. ${DIR}/conf/evbarm.conf
CVS commit: src/distrib/utils/embedded/conf
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=8200
# 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 8200 ${kernel}; bootm 8200
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 0x9000 ${jetsontk1_kernelimg}
bootm 0x9000
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() {
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Fri May 22 01:18:22 UTC 2015
Modified Files:
src/distrib/utils/embedded/conf: armv7.conf
Log Message:
add JETSONTK1 to armv7.img
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 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.2 src/distrib/utils/embedded/conf/armv7.conf:1.3
--- src/distrib/utils/embedded/conf/armv7.conf:1.2 Sun Apr 19 18:28:31 2015
+++ src/distrib/utils/embedded/conf/armv7.conf Fri May 22 01:18:22 2015
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.2 2015/04/19 18:28:31 hubertf Exp $
+# $NetBSD: armv7.conf,v 1.3 2015/05/22 01:18:22 jmcneill Exp $
# ARMv7 customization script used by mkimage
#
board=armv7
@@ -10,6 +10,7 @@ kernels_beagle=BEAGLEBOARD BEAGLEBONE
kernels_awin=BPI CUBIEBOARD CUBIETRUCK HUMMINGBIRD_A31
kernels_rpi=RPI2
kernels_amlogic=ODROID-C1
+kernels_tegra=JETSONTK1
make_label() {
make_label_evbarm
@@ -86,11 +87,23 @@ run bootcmd
EOF
}
+populate_tegra() {
+ jetsontk1_kernelimg=netbsd-JETSONTK1.ub
+
+ # Create a boot.scr for Jetson TK1 U-Boot
+ cat ${mnt}/boot/boot-JETSONTK1.txt EOF
+setenv bootargs root=ld1a
+fatload mmc 1:1 0x9000 ${jetsontk1_kernelimg}
+bootm 0x9000
+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
+}
+
populate() {
echo ${bar} looking for kernels in ${kernel} ${bar}
kernels=
# .ub kernels
- for k in $kernels_beagle $kernels_awin $kernels_amlogic; do
+ for k in $kernels_beagle $kernels_awin $kernels_amlogic $kernels_tegra; do
f=${kernel}/netbsd-${k}.ub.gz
test -f ${f} kernels=${kernels} ${f}
done
@@ -119,4 +132,5 @@ populate() {
populate_awin
populate_rpi
populate_amlogic
+ populate_tegra
}
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: hubertf
Date: Sun Apr 19 18:28:31 UTC 2015
Modified Files:
src/distrib/utils/embedded/conf: armv7.conf rpi.conf rpi_inst.conf
usermode.conf
Log Message:
Cleanup: make_filesystems is not used any longer, purge remains
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/utils/embedded/conf/armv7.conf
cvs rdiff -u -r1.28 -r1.29 src/distrib/utils/embedded/conf/rpi.conf
cvs rdiff -u -r1.6 -r1.7 src/distrib/utils/embedded/conf/rpi_inst.conf
cvs rdiff -u -r1.4 -r1.5 src/distrib/utils/embedded/conf/usermode.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.1 src/distrib/utils/embedded/conf/armv7.conf:1.2
--- src/distrib/utils/embedded/conf/armv7.conf:1.1 Thu Apr 9 10:55:23 2015
+++ src/distrib/utils/embedded/conf/armv7.conf Sun Apr 19 18:28:31 2015
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.1 2015/04/09 10:55:23 jmcneill Exp $
+# $NetBSD: armv7.conf,v 1.2 2015/04/19 18:28:31 hubertf Exp $
# ARMv7 customization script used by mkimage
#
board=armv7
@@ -11,10 +11,6 @@ kernels_awin=BPI CUBIEBOARD CUBIETRUCK
kernels_rpi=RPI2
kernels_amlogic=ODROID-C1
-make_filesystems() {
- make_filesystems_evbarm
-}
-
make_label() {
make_label_evbarm
}
Index: src/distrib/utils/embedded/conf/rpi.conf
diff -u src/distrib/utils/embedded/conf/rpi.conf:1.28 src/distrib/utils/embedded/conf/rpi.conf:1.29
--- src/distrib/utils/embedded/conf/rpi.conf:1.28 Mon Apr 6 20:19:28 2015
+++ src/distrib/utils/embedded/conf/rpi.conf Sun Apr 19 18:28:31 2015
@@ -1,4 +1,4 @@
-# $NetBSD: rpi.conf,v 1.28 2015/04/06 20:19:28 jmcneill Exp $
+# $NetBSD: rpi.conf,v 1.29 2015/04/19 18:28:31 hubertf Exp $
# Raspberry Pi customization script used by mkimage
#
@@ -11,10 +11,6 @@ resize=true
firmwaredir=$src/external/broadcom/rpi-firmware/dist
firmwarefiles=LICENCE.broadcom bootcode.bin fixup.dat fixup_cd.dat start.elf start_cd.elf
-make_filesystems() {
- make_filesystems_evbarm
-}
-
make_fstab() {
make_fstab_evbarm
}
Index: src/distrib/utils/embedded/conf/rpi_inst.conf
diff -u src/distrib/utils/embedded/conf/rpi_inst.conf:1.6 src/distrib/utils/embedded/conf/rpi_inst.conf:1.7
--- src/distrib/utils/embedded/conf/rpi_inst.conf:1.6 Fri Jan 23 15:17:58 2015
+++ src/distrib/utils/embedded/conf/rpi_inst.conf Sun Apr 19 18:28:31 2015
@@ -1,4 +1,4 @@
-# $NetBSD: rpi_inst.conf,v 1.6 2015/01/23 15:17:58 skrll Exp $
+# $NetBSD: rpi_inst.conf,v 1.7 2015/04/19 18:28:31 hubertf Exp $
# Raspberry Pi customization script used by mkimage
#
@@ -75,10 +75,6 @@ customize_evbarm() {
firmwaredir=$src/external/broadcom/rpi-firmware/dist
firmwarefiles=LICENCE.broadcom bootcode.bin fixup.dat fixup_cd.dat start.elf start_cd.elf
-make_filesystems() {
- make_filesystems_evbarm
-}
-
make_fstab() {
make_fstab_evbarm
}
Index: src/distrib/utils/embedded/conf/usermode.conf
diff -u src/distrib/utils/embedded/conf/usermode.conf:1.4 src/distrib/utils/embedded/conf/usermode.conf:1.5
--- src/distrib/utils/embedded/conf/usermode.conf:1.4 Fri Jan 23 15:17:58 2015
+++ src/distrib/utils/embedded/conf/usermode.conf Sun Apr 19 18:28:31 2015
@@ -1,4 +1,4 @@
-# $NetBSD: usermode.conf,v 1.4 2015/01/23 15:17:58 skrll Exp $
+# $NetBSD: usermode.conf,v 1.5 2015/04/19 18:28:31 hubertf Exp $
# NetBSD/usermode customization script used by mkimage
# XXX: BROKEN, needs to be converted to makefs
@@ -10,11 +10,6 @@ setsdir=/usr/build/release/$(uname -m)/b
size=0 # in MB
usermodedirs=/var.cow /etc.cow /root.cow /pkgs
-make_filesystems() {
- newfs /dev/r${vnddev}a
- mount /dev/${vnddev}a ${mnt}
-}
-
make_fstab() {
cat ${mnt}/etc/fstab EOF
# NetBSD/usermode /etc/fstab
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: hubertf
Date: Sun Apr 19 18:53:33 UTC 2015
Modified Files:
src/distrib/utils/embedded/conf: rpi_inst.conf
Log Message:
More cleanup:
Instead of first overwriting the *_evbarm functions with own code,
and then calling them from the regular functions, directly put the
code into the regular functions.
No more functions from evbarm.conf are used now.
Some variables are still used!
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/distrib/utils/embedded/conf/rpi_inst.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/rpi_inst.conf
diff -u src/distrib/utils/embedded/conf/rpi_inst.conf:1.7 src/distrib/utils/embedded/conf/rpi_inst.conf:1.8
--- src/distrib/utils/embedded/conf/rpi_inst.conf:1.7 Sun Apr 19 18:28:31 2015
+++ src/distrib/utils/embedded/conf/rpi_inst.conf Sun Apr 19 18:53:33 2015
@@ -1,4 +1,4 @@
-# $NetBSD: rpi_inst.conf,v 1.7 2015/04/19 18:28:31 hubertf Exp $
+# $NetBSD: rpi_inst.conf,v 1.8 2015/04/19 18:53:33 hubertf Exp $
# Raspberry Pi customization script used by mkimage
#
@@ -17,7 +17,7 @@ init=8
size=$(( 10485760 + ${swap} * 1024 * 512 + ${boot} * 1024 * 512 + ${init} * 1024 * 512 ))
msdosid=12
-make_label_evbarm() {
+make_label() {
# compute all sizes in terms of sectors
local totalsize=$(( ${newsize} * 1024 * 2 / 512 ))
@@ -64,28 +64,17 @@ drivedata: 0
EOF
}
-make_fstab_evbarm() {
-:
-}
-
-customize_evbarm() {
+customize() {
echo ${bar} creating directories ${bar}
mkdir ${mnt}/proc ${mnt}/kern
}
-firmwaredir=$src/external/broadcom/rpi-firmware/dist
-firmwarefiles=LICENCE.broadcom bootcode.bin fixup.dat fixup_cd.dat start.elf start_cd.elf
make_fstab() {
- make_fstab_evbarm
+ :
}
-make_label() {
- make_label_evbarm
-}
-
-customize() {
- customize_evbarm
-}
+firmwaredir=$src/external/broadcom/rpi-firmware/dist
+firmwarefiles=LICENCE.broadcom bootcode.bin fixup.dat fixup_cd.dat start.elf start_cd.elf
populate() {
cat ${mnt}/boot/cmdline.txt EOF
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Mon Apr 6 22:44:46 UTC 2015
Modified Files:
src/distrib/utils/embedded/conf: evbarm.conf
Log Message:
show resize_ffs progress bar when resizing root partition
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/distrib/utils/embedded/conf/evbarm.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/evbarm.conf
diff -u src/distrib/utils/embedded/conf/evbarm.conf:1.21 src/distrib/utils/embedded/conf/evbarm.conf:1.22
--- src/distrib/utils/embedded/conf/evbarm.conf:1.21 Mon Apr 6 20:19:28 2015
+++ src/distrib/utils/embedded/conf/evbarm.conf Mon Apr 6 22:44:46 2015
@@ -1,4 +1,4 @@
-# $NetBSD: evbarm.conf,v 1.21 2015/04/06 20:19:28 jmcneill Exp $
+# $NetBSD: evbarm.conf,v 1.22 2015/04/06 22:44:46 jmcneill Exp $
# evbarm shared config
#
image=$HOME/${board}.img
@@ -141,6 +141,7 @@ resize_disklabel=YES
resize_disklabel_disk=ld0
resize_disklabel_part=a
resize_root=YES
+resize_root_flags=-p
resize_root_postcmd=/sbin/reboot -n
EOF
fi
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Thu Feb 12 10:59:44 UTC 2015
Modified Files:
src/distrib/utils/embedded/conf: rpi.conf
Log Message:
actually write cpufreq changes to ${mnt}/etc/rc.local instead of /tmp/a
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/distrib/utils/embedded/conf/rpi.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/rpi.conf
diff -u src/distrib/utils/embedded/conf/rpi.conf:1.25 src/distrib/utils/embedded/conf/rpi.conf:1.26
--- src/distrib/utils/embedded/conf/rpi.conf:1.25 Fri Feb 6 15:15:01 2015
+++ src/distrib/utils/embedded/conf/rpi.conf Thu Feb 12 10:59:44 2015
@@ -1,4 +1,4 @@
-# $NetBSD: rpi.conf,v 1.25 2015/02/06 15:15:01 jmcneill Exp $
+# $NetBSD: rpi.conf,v 1.26 2015/02/12 10:59:44 jmcneill Exp $
# Raspberry Pi customization script used by mkimage
#
@@ -34,7 +34,7 @@ EOF
# to match at boot time.
#
cp ${release}/etc/rc.local ${mnt}/etc/rc.local
- cat /tmp/a EOF
+ cat ${mnt}/etc/rc.local EOF
if /sbin/sysctl -q machdep.cpu.frequency.max; then
cpufreq_max=\$(/sbin/sysctl -n machdep.cpu.frequency.max)
cpufreq_cur=\$(/sbin/sysctl -n machdep.cpu.frequency.current)
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Fri Feb 6 15:15:02 UTC 2015
Modified Files:
src/distrib/utils/embedded/conf: rpi.conf
Log Message:
By default, RPI firmware sets the max CPU frequency to 600MHz. This can be
overridden by setting arm_freq in config.txt, but the default freq at boot
is still 600MHz.
Add logic to rc.local to compare the current vs. max CPU frequency; if they
differ, set the target frequency to the maximum.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/distrib/utils/embedded/conf/rpi.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/rpi.conf
diff -u src/distrib/utils/embedded/conf/rpi.conf:1.24 src/distrib/utils/embedded/conf/rpi.conf:1.25
--- src/distrib/utils/embedded/conf/rpi.conf:1.24 Thu Nov 28 13:39:18 2013
+++ src/distrib/utils/embedded/conf/rpi.conf Fri Feb 6 15:15:01 2015
@@ -1,4 +1,4 @@
-# $NetBSD: rpi.conf,v 1.24 2013/11/28 13:39:18 skrll Exp $
+# $NetBSD: rpi.conf,v 1.25 2015/02/06 15:15:01 jmcneill Exp $
# Raspberry Pi customization script used by mkimage
#
@@ -29,6 +29,22 @@ wscons=YES
devpubd=YES
EOF
+ #
+ # If arm_freq is specified in config.txt, set CPU frequency
+ # to match at boot time.
+ #
+ cp ${release}/etc/rc.local ${mnt}/etc/rc.local
+ cat /tmp/a EOF
+if /sbin/sysctl -q machdep.cpu.frequency.max; then
+ cpufreq_max=\$(/sbin/sysctl -n machdep.cpu.frequency.max)
+ cpufreq_cur=\$(/sbin/sysctl -n machdep.cpu.frequency.current)
+ if [ ! \$cpufreq_max = \$cpufreq_cur ]; then
+ /sbin/sysctl -w machdep.cpu.frequency.target=\$cpufreq_max
+ fi
+fi
+EOF
+ echo ./etc/rc.local type=file uname=root gname=wheel mode=0644 \
+ $tmp/selected_sets
}
populate() {
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Wed Jan 28 12:08:00 UTC 2015
Modified Files:
src/distrib/utils/embedded/conf: evbarm.conf
Log Message:
add /var/shm tmpfs to fstab
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/distrib/utils/embedded/conf/evbarm.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/evbarm.conf
diff -u src/distrib/utils/embedded/conf/evbarm.conf:1.18 src/distrib/utils/embedded/conf/evbarm.conf:1.19
--- src/distrib/utils/embedded/conf/evbarm.conf:1.18 Fri Jan 23 15:17:58 2015
+++ src/distrib/utils/embedded/conf/evbarm.conf Wed Jan 28 12:08:00 2015
@@ -1,4 +1,4 @@
-# $NetBSD: evbarm.conf,v 1.18 2015/01/23 15:17:58 skrll Exp $
+# $NetBSD: evbarm.conf,v 1.19 2015/01/28 12:08:00 jmcneill Exp $
# evbarm shared config
#
image=$HOME/${board}.img
@@ -74,6 +74,7 @@ make_fstab_evbarm_normal() {
kernfs /kern kernfs rw
ptyfs /dev/pts ptyfs rw
procfs /proc procfs rw
+tmpfs /var/shm tmpfs rw,-m1777,-sram%25
EOF
}
@@ -97,6 +98,7 @@ tmpfs /var/mail tmpfs rw,union,-s10M
tmpfs /var/spool/postfix tmpfs rw,union,-s20M
tmpfs /var/db/postfix tmpfs rw,union,-s1M
tmpfs /var/chroot tmpfs rw,union,-s10M
+tmpfs /var/shm tmpfs rw,-m1777,-sram%25
EOF
}
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Tue Nov 25 13:42:31 UTC 2014
Modified Files:
src/distrib/utils/embedded/conf: evbarm.conf
Log Message:
disable wapbl for evbarm images until stability issues are sorted out
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/distrib/utils/embedded/conf/evbarm.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/evbarm.conf
diff -u src/distrib/utils/embedded/conf/evbarm.conf:1.16 src/distrib/utils/embedded/conf/evbarm.conf:1.17
--- src/distrib/utils/embedded/conf/evbarm.conf:1.16 Tue Sep 9 13:02:25 2014
+++ src/distrib/utils/embedded/conf/evbarm.conf Tue Nov 25 13:42:31 2014
@@ -1,4 +1,4 @@
-# $NetBSD: evbarm.conf,v 1.16 2014/09/09 13:02:25 jmcneill Exp $
+# $NetBSD: evbarm.conf,v 1.17 2014/11/25 13:42:31 jmcneill Exp $
# evbarm shared config
#
image=$HOME/${board}.img
@@ -69,7 +69,7 @@ make_fstab_evbarm_normal() {
cat ${mnt}/etc/fstab EOF
# NetBSD /etc/fstab
# See /usr/share/examples/fstab/ for more examples.
-/dev/ld0a / ffs rw,log 1 1
+/dev/ld0a / ffs rw 1 1
/dev/ld0b none swap sw 0 0
/dev/ld0e /boot msdos rw 1 1
kernfs /kern kernfs rw
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Mon Sep 29 17:54:13 UTC 2014
Modified Files:
src/distrib/utils/embedded/conf: beagleboard.conf
Log Message:
escape $ in $board so this will boot on beaglebone too
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/distrib/utils/embedded/conf/beagleboard.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/beagleboard.conf
diff -u src/distrib/utils/embedded/conf/beagleboard.conf:1.17 src/distrib/utils/embedded/conf/beagleboard.conf:1.18
--- src/distrib/utils/embedded/conf/beagleboard.conf:1.17 Mon Sep 16 15:23:57 2013
+++ src/distrib/utils/embedded/conf/beagleboard.conf Mon Sep 29 17:54:13 2014
@@ -1,4 +1,4 @@
-# $NetBSD: beagleboard.conf,v 1.17 2013/09/16 15:23:57 ast Exp $
+# $NetBSD: beagleboard.conf,v 1.18 2014/09/29 17:54:13 jmcneill Exp $
# BeagleBoard customization script used by mkimage
#
board=beagleboard
@@ -34,7 +34,7 @@ populate() {
bbone_kernel=$(echo $bboard_kernel | sed 's/BEAGLEBOARD/BEAGLEBONE/g')
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
+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
if [ ! -f ${bboard_kernel} ]; then
echo ${PROG}: Missing ${bboard_kernel} 12
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Tue Sep 9 13:02:25 UTC 2014
Modified Files:
src/distrib/utils/embedded/conf: evbarm.conf
Log Message:
turn on ntpd
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/distrib/utils/embedded/conf/evbarm.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/evbarm.conf
diff -u src/distrib/utils/embedded/conf/evbarm.conf:1.15 src/distrib/utils/embedded/conf/evbarm.conf:1.16
--- src/distrib/utils/embedded/conf/evbarm.conf:1.15 Mon Mar 31 17:05:03 2014
+++ src/distrib/utils/embedded/conf/evbarm.conf Tue Sep 9 13:02:25 2014
@@ -1,4 +1,4 @@
-# $NetBSD: evbarm.conf,v 1.15 2014/03/31 17:05:03 christos Exp $
+# $NetBSD: evbarm.conf,v 1.16 2014/09/09 13:02:25 jmcneill Exp $
# evbarm shared config
#
image=$HOME/${board}.img
@@ -122,6 +122,8 @@ rc_configured=YES
hostname=${board}
sshd=YES
dhcpcd=YES
+ntpd=YES
+ntpd_flags=-g
EOF
if [ ! -f ${release}/dev/MAKEDEV ]; then
echo ${PROG}: Missing ${release}/dev/MAKEDEV 12
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: christos
Date: Fri Apr 4 16:45:51 UTC 2014
Modified Files:
src/distrib/utils/embedded/conf: amd64.conf x86.conf
Added Files:
src/distrib/utils/embedded/conf: i386.conf
Log Message:
merge more, and add an i386 image
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/utils/embedded/conf/amd64.conf
cvs rdiff -u -r0 -r1.1 src/distrib/utils/embedded/conf/i386.conf
cvs rdiff -u -r1.3 -r1.4 src/distrib/utils/embedded/conf/x86.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/amd64.conf
diff -u src/distrib/utils/embedded/conf/amd64.conf:1.1 src/distrib/utils/embedded/conf/amd64.conf:1.2
--- src/distrib/utils/embedded/conf/amd64.conf:1.1 Mon Mar 31 12:20:49 2014
+++ src/distrib/utils/embedded/conf/amd64.conf Fri Apr 4 12:45:51 2014
@@ -1,46 +1,6 @@
-# $NetBSD: amd64.conf,v 1.1 2014/03/31 16:20:49 christos Exp $
+# $NetBSD: amd64.conf,v 1.2 2014/04/04 16:45:51 christos Exp $
# Amd64 customization script used by mkimage
#
board=amd64
-MACHINE=amd64
-kernel=$src/sys/arch/amd64/compile/GENERIC/netbsd
-bootfile=$release/usr/mdec/boot
-
. ${DIR}/conf/x86.conf
-
-make_filesystems() {
- make_filesystems_x86
-}
-
-make_fstab() {
- make_fstab_x86
-}
-
-make_label() {
- make_label_x86
-}
-
-customize() {
- customize_x86
- cat ${mnt}/etc/rc.conf EOF
-wscons=YES
-devpubd=YES
-EOF
-
-}
-
-populate() {
- if [ ! -f ${kernel} ]; then
- echo ${PROG}: Missing ${kernel} 12
- exit 1
- fi
-
- echo ${bar} installing kernel ${bar}
- cp ${kernel} ${mnt}/netbsd
- if [ ! -f ${bootfile} ]; then
- echo ${PROG}: Missing ${bootfile} 12
- exit 1
- fi
- cp ${bootfile} ${mnt}/boot
-}
Index: src/distrib/utils/embedded/conf/x86.conf
diff -u src/distrib/utils/embedded/conf/x86.conf:1.3 src/distrib/utils/embedded/conf/x86.conf:1.4
--- src/distrib/utils/embedded/conf/x86.conf:1.3 Mon Mar 31 14:18:45 2014
+++ src/distrib/utils/embedded/conf/x86.conf Fri Apr 4 12:45:51 2014
@@ -1,18 +1,20 @@
-# $NetBSD: x86.conf,v 1.3 2014/03/31 18:18:45 christos Exp $
+# $NetBSD: x86.conf,v 1.4 2014/04/04 16:45:51 christos Exp $
# x86 shared config
#
+
image=$HOME/${board}.img
+MACHINE=${board}
+kernel=$src/sys/arch/${board}/compile/GENERIC/netbsd
+bootfile=$release/usr/mdec/boot
specialdirs=/kern /proc
extra=8 # spare space
-
size=0 # autocompute
netbsdid=169
-
ffsoffset=63b
-make_label_x86() {
+make_label() {
# compute all sizes in terms of sectors
local totalsize=$(( ${newsize} * 1024 * 2 / 512 ))
@@ -52,7 +54,7 @@ drivedata: 0
EOF
}
-make_fstab_x86_normal() {
+make_fstab_normal() {
cat ${mnt}/etc/fstab EOF
# NetBSD /etc/fstab
# See /usr/share/examples/fstab/ for more examples.
@@ -66,7 +68,7 @@ EOF
# From Richard Neswold's:
# http://rich-tbp.blogspot.com/2013/03/netbsd-on-rpi-minimizing-disk-writes.html
# Also for the postfix stuff below
-make_fstab_x86_minwrites() {
+make_fstab_minwrites() {
cat ${mnt}/etc/fstab EOF
# NetBSD /etc/fstab
# See /usr/share/examples/fstab/ for more examples.
@@ -84,15 +86,15 @@ tmpfs /var/chroot tmpfs rw,union,-s10M
EOF
}
-make_fstab_x86() {
+make_fstab() {
if $minwrites; then
- make_fstab_x86_minwrites
+ make_fstab_minwrites
else
- make_fstab_x86_normal
+ make_fstab_normal
fi
}
-customize_x86() {
+customize() {
cp ${release}/etc/rc.conf ${mnt}/etc/rc.conf
if $minwrites; then
mkdir ${mnt}/etc/postfix
@@ -105,6 +107,8 @@ rc_configured=YES
hostname=${board}
sshd=YES
dhcpcd=YES
+wscons=YES
+devpubd=YES
EOF
if [ ! -f ${release}/dev/MAKEDEV ]; then
echo ${PROG}: Missing ${release}/dev/MAKEDEV 12
@@ -117,3 +121,18 @@ EOF
echo ${bar} creating directories ${bar}
mkdir ${mnt}/proc ${mnt}/kern
}
+
+populate() {
+ if [ ! -f ${kernel} ]; then
+ echo ${PROG}: Missing ${kernel} 12
+ exit 1
+ fi
+
+ echo ${bar} installing kernel ${bar}
+ cp ${kernel} ${mnt}/netbsd
+ if [ ! -f ${bootfile} ]; then
+ echo ${PROG}: Missing ${bootfile} 12
+ exit 1
+ fi
+ cp ${bootfile} ${mnt}/boot
+}
Added files:
Index: src/distrib/utils/embedded/conf/i386.conf
diff -u /dev/null src/distrib/utils/embedded/conf/i386.conf:1.1
--- /dev/null Fri Apr 4 12:45:51 2014
+++ src/distrib/utils/embedded/conf/i386.conf Fri Apr 4 12:45:51 2014
@@ -0,0 +1,6 @@
+# $NetBSD: i386.conf,v 1.1 2014/04/04 16:45:51 christos Exp $
+# i386 customization script used by mkimage
+#
+
+board=i386
+. ${DIR}/conf/x86.conf
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: ozaki-r
Date: Thu Apr 3 01:36:20 UTC 2014
Modified Files:
src/distrib/utils/embedded/conf: rpi_inst.conf
Log Message:
Include evbarm.conf as same as other conf files
evbarm.conf ensures ${mnt}/boot exists so that it avoids the error:
/home/builds/ab/HEAD/src/distrib/utils/embedded/mkimage: cannot create \
/tmp/mkimage.2a/mnt/boot/cmdline.txt: directory nonexistent
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/distrib/utils/embedded/conf/rpi_inst.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/rpi_inst.conf
diff -u src/distrib/utils/embedded/conf/rpi_inst.conf:1.4 src/distrib/utils/embedded/conf/rpi_inst.conf:1.5
--- src/distrib/utils/embedded/conf/rpi_inst.conf:1.4 Mon Sep 16 15:23:57 2013
+++ src/distrib/utils/embedded/conf/rpi_inst.conf Thu Apr 3 01:36:20 2014
@@ -1,10 +1,12 @@
-# $NetBSD: rpi_inst.conf,v 1.4 2013/09/16 15:23:57 ast Exp $
+# $NetBSD: rpi_inst.conf,v 1.5 2014/04/03 01:36:20 ozaki-r Exp $
# Raspberry Pi customization script used by mkimage
#
board=rpi_inst
kernel=$src/sys/arch/evbarm/compile/RPI/netbsd-RPI_INSTALL.bin
+. ${DIR}/conf/evbarm.conf
+
image=$HOME/${board}.img
specialdirs=/kern /proc
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: christos
Date: Mon Mar 31 18:18:45 UTC 2014
Modified Files:
src/distrib/utils/embedded/conf: x86.conf
Log Message:
remove swap; these days x86 machines don't need it.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/utils/embedded/conf/x86.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/x86.conf
diff -u src/distrib/utils/embedded/conf/x86.conf:1.2 src/distrib/utils/embedded/conf/x86.conf:1.3
--- src/distrib/utils/embedded/conf/x86.conf:1.2 Mon Mar 31 13:05:03 2014
+++ src/distrib/utils/embedded/conf/x86.conf Mon Mar 31 14:18:45 2014
@@ -1,28 +1,23 @@
-# $NetBSD: x86.conf,v 1.2 2014/03/31 17:05:03 christos Exp $
+# $NetBSD: x86.conf,v 1.3 2014/03/31 18:18:45 christos Exp $
# x86 shared config
#
image=$HOME/${board}.img
specialdirs=/kern /proc
-swap=256
extra=8 # spare space
size=0 # autocompute
netbsdid=169
-ffsoffset=$((63 * 512))
+ffsoffset=63b
make_label_x86() {
# compute all sizes in terms of sectors
local totalsize=$(( ${newsize} * 1024 * 2 / 512 ))
- local swapsize=$(( ${swap} * 1024 ))
-
local aoffset=63
- local asize=$(( ${totalsize} - ${swapsize} - ${aoffset} ))
-
- local swapoffset=$(( ${aoffset} + ${asize} ))
+ local asize=$(( ${totalsize} - ${aoffset} ))
local bps=512
local spt=32
@@ -52,7 +47,6 @@ drivedata: 0
8 partitions:
# size offsetfstype [fsize bsize cpg/sgs]
a: ${asize} ${aoffset}4.2BSD ${fsize} ${bsize} 0 #
- b: ${swapsize} ${swapoffset} swap #
c: ${totalsize} 0 unused 0 0 #
d: ${totalsize} 0 unused 0 0 #
EOF
@@ -62,8 +56,7 @@ make_fstab_x86_normal() {
cat ${mnt}/etc/fstab EOF
# NetBSD /etc/fstab
# See /usr/share/examples/fstab/ for more examples.
-/dev/sd0a / ffs rw,log 1 1
-/dev/sd0b none swap sw 0 0
+/dev/${rootdev}0a / ffs rw,log 1 1
kernfs /kern kernfs rw
ptyfs /dev/pts ptyfs rw
procfs /proc procfs rw
@@ -77,8 +70,7 @@ make_fstab_x86_minwrites() {
cat ${mnt}/etc/fstab EOF
# NetBSD /etc/fstab
# See /usr/share/examples/fstab/ for more examples.
-/dev/sd0a / ffs rw,log,noatime,nodevmtime 1 1
-/dev/sd0b none swap sw 0 0
+/dev/${rootdev}0a / ffs rw,log,noatime,nodevmtime 1 1
kernfs /kern kernfs rw
ptyfs /dev/pts ptyfs rw
procfs /proc procfs rw
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: skrll
Date: Thu Nov 28 13:39:18 UTC 2013
Modified Files:
src/distrib/utils/embedded/conf: rpi.conf
Log Message:
Put console=fb back as autodetect is bunged up.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/distrib/utils/embedded/conf/rpi.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/rpi.conf
diff -u src/distrib/utils/embedded/conf/rpi.conf:1.23 src/distrib/utils/embedded/conf/rpi.conf:1.24
--- src/distrib/utils/embedded/conf/rpi.conf:1.23 Mon Sep 16 15:23:57 2013
+++ src/distrib/utils/embedded/conf/rpi.conf Thu Nov 28 13:39:18 2013
@@ -1,4 +1,4 @@
-# $NetBSD: rpi.conf,v 1.23 2013/09/16 15:23:57 ast Exp $
+# $NetBSD: rpi.conf,v 1.24 2013/11/28 13:39:18 skrll Exp $
# Raspberry Pi customization script used by mkimage
#
@@ -33,7 +33,7 @@ EOF
populate() {
cat ${mnt}/boot/cmdline.txt EOF
-root=ld0a
+root=ld0a console=fb
#fb=1280x1024 # to select a mode, otherwise try EDID
#fb=disable # to disable fb completely
EOF
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: skrll
Date: Fri Nov 22 11:13:54 UTC 2013
Modified Files:
src/distrib/utils/embedded/conf: evbarm.conf
Log Message:
Fix /dev population of the evbarm images by using MAKEDEV -s and appending
to the mtree spec file passed to makefs.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/distrib/utils/embedded/conf/evbarm.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/evbarm.conf
diff -u src/distrib/utils/embedded/conf/evbarm.conf:1.12 src/distrib/utils/embedded/conf/evbarm.conf:1.13
--- src/distrib/utils/embedded/conf/evbarm.conf:1.12 Fri Jul 5 15:45:17 2013
+++ src/distrib/utils/embedded/conf/evbarm.conf Fri Nov 22 11:13:54 2013
@@ -1,4 +1,4 @@
-# $NetBSD: evbarm.conf,v 1.12 2013/07/05 15:45:17 matt Exp $
+# $NetBSD: evbarm.conf,v 1.13 2013/11/22 11:13:54 skrll Exp $
# evbarm shared config
#
image=$HOME/${board}.img
@@ -124,7 +124,8 @@ EOF
exit 1
fi
echo ${bar} running MAKEDEV ${bar}
- (cd ${mnt}/dev ${HOST_SH} ${release}/dev/MAKEDEV all)
+ ${HOST_SH} ${release}/dev/MAKEDEV -s all | sed -e 's:^\./:\./dev/:' \
+ $tmp/selected_sets
echo ${bar} creating directories ${bar}
mkdir ${mnt}/proc ${mnt}/kern
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: ast
Date: Mon Sep 16 15:23:57 UTC 2013
Modified Files:
src/distrib/utils/embedded/conf: beagleboard.conf rpi.conf
rpi_inst.conf
Log Message:
After discussions with cristos regarding the previous commit, he
convinced me it was sufficient to define GZIP_CMD only in
distrib/utils/embedded/mkimage and not again in the config files
beagleboard.conf, rpi.conf, and rpi_inst.conf similar to how the
other variables $src, $release, $mnt, ... are only defined there.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/distrib/utils/embedded/conf/beagleboard.conf
cvs rdiff -u -r1.22 -r1.23 src/distrib/utils/embedded/conf/rpi.conf
cvs rdiff -u -r1.3 -r1.4 src/distrib/utils/embedded/conf/rpi_inst.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/beagleboard.conf
diff -u src/distrib/utils/embedded/conf/beagleboard.conf:1.16 src/distrib/utils/embedded/conf/beagleboard.conf:1.17
--- src/distrib/utils/embedded/conf/beagleboard.conf:1.16 Sat Sep 14 12:51:27 2013
+++ src/distrib/utils/embedded/conf/beagleboard.conf Mon Sep 16 15:23:57 2013
@@ -1,10 +1,8 @@
-# $NetBSD: beagleboard.conf,v 1.16 2013/09/14 12:51:27 ast Exp $
+# $NetBSD: beagleboard.conf,v 1.17 2013/09/16 15:23:57 ast Exp $
# BeagleBoard customization script used by mkimage
#
board=beagleboard
-GZIP_CMD=${TOOL_GZIP:-gzip} # ${GZIP} is special to gzip(1)
-
. ${DIR}/conf/evbarm.conf
bboard_kernelimg=bboard.ub
Index: src/distrib/utils/embedded/conf/rpi.conf
diff -u src/distrib/utils/embedded/conf/rpi.conf:1.22 src/distrib/utils/embedded/conf/rpi.conf:1.23
--- src/distrib/utils/embedded/conf/rpi.conf:1.22 Sat Sep 14 12:51:27 2013
+++ src/distrib/utils/embedded/conf/rpi.conf Mon Sep 16 15:23:57 2013
@@ -1,12 +1,10 @@
-# $NetBSD: rpi.conf,v 1.22 2013/09/14 12:51:27 ast Exp $
+# $NetBSD: rpi.conf,v 1.23 2013/09/16 15:23:57 ast Exp $
# Raspberry Pi customization script used by mkimage
#
board=rpi
kernel=$src/sys/arch/evbarm/compile/RPI/netbsd-RPI.bin
-GZIP_CMD=${TOOL_GZIP:-gzip} # ${GZIP} is special to gzip(1)
-
. ${DIR}/conf/evbarm.conf
firmwaredir=$src/external/broadcom/rpi-firmware/dist
Index: src/distrib/utils/embedded/conf/rpi_inst.conf
diff -u src/distrib/utils/embedded/conf/rpi_inst.conf:1.3 src/distrib/utils/embedded/conf/rpi_inst.conf:1.4
--- src/distrib/utils/embedded/conf/rpi_inst.conf:1.3 Sat Sep 14 12:51:27 2013
+++ src/distrib/utils/embedded/conf/rpi_inst.conf Mon Sep 16 15:23:57 2013
@@ -1,12 +1,10 @@
-# $NetBSD: rpi_inst.conf,v 1.3 2013/09/14 12:51:27 ast Exp $
+# $NetBSD: rpi_inst.conf,v 1.4 2013/09/16 15:23:57 ast Exp $
# Raspberry Pi customization script used by mkimage
#
board=rpi_inst
kernel=$src/sys/arch/evbarm/compile/RPI/netbsd-RPI_INSTALL.bin
-GZIP_CMD=${TOOL_GZIP:-gzip} # ${GZIP} is special to gzip(1)
-
image=$HOME/${board}.img
specialdirs=/kern /proc
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Wed Aug 21 22:52:28 UTC 2013
Modified Files:
src/distrib/utils/embedded/conf: beagleboard.conf
Log Message:
4th time's a charm (I hope). Make sure that we pick up the kernel path passed to
mkimage command line, and not the default.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/distrib/utils/embedded/conf/beagleboard.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/beagleboard.conf
diff -u src/distrib/utils/embedded/conf/beagleboard.conf:1.14 src/distrib/utils/embedded/conf/beagleboard.conf:1.15
--- src/distrib/utils/embedded/conf/beagleboard.conf:1.14 Mon Aug 19 04:27:22 2013
+++ src/distrib/utils/embedded/conf/beagleboard.conf Wed Aug 21 22:52:28 2013
@@ -1,13 +1,8 @@
-# $NetBSD: beagleboard.conf,v 1.14 2013/08/19 04:27:22 jmcneill Exp $
+# $NetBSD: beagleboard.conf,v 1.15 2013/08/21 22:52:28 jmcneill Exp $
# BeagleBoard customization script used by mkimage
#
board=beagleboard
-kernel=$src/sys/arch/evbarm/compile/obj/BEAGLEBOARD/netbsd.ub
-
-bboard_kernel=$kernel
-bbone_kernel=$(echo $bboard_kernel | sed 's/BEAGLEBOARD/BEAGLEBONE/g')
-
. ${DIR}/conf/evbarm.conf
bboard_kernelimg=bboard.ub
@@ -35,6 +30,9 @@ EOF
}
populate() {
+ bboard_kernel=$kernel
+ bbone_kernel=$(echo $bboard_kernel | sed 's/BEAGLEBOARD/BEAGLEBONE/g')
+
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
@@ -47,7 +45,7 @@ EOF
exit 1
fi
- echo ${bar} installing BEAGLEBOARD kernel to /boot ${bar}
+ echo ${bar} installing ${bboard_kernel} to /boot/${bboard_kernelimg} ${bar}
case ${bboard_kernel} in
*.gz)
gzip -dc ${bboard_kernel} ${mnt}/boot/${bboard_kernelimg}
@@ -57,7 +55,7 @@ EOF
;;
esac
- echo ${bar} installing BEAGLEBONE kernel to /boot ${bar}
+ echo ${bar} installing ${bbone_kernel} to /boot/${bbone_kernelimg} ${bar}
case ${bbone_kernel} in
*.gz)
gzip -dc ${bbone_kernel} ${mnt}/boot/${bbone_kernelimg}
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Fri Aug 16 00:03:01 UTC 2013
Modified Files:
src/distrib/utils/embedded/conf: beagleboard.conf
Log Message:
support beaglebone and beagleboard with the same image
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/distrib/utils/embedded/conf/beagleboard.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/beagleboard.conf
diff -u src/distrib/utils/embedded/conf/beagleboard.conf:1.11 src/distrib/utils/embedded/conf/beagleboard.conf:1.12
--- src/distrib/utils/embedded/conf/beagleboard.conf:1.11 Wed Feb 20 18:33:37 2013
+++ src/distrib/utils/embedded/conf/beagleboard.conf Fri Aug 16 00:03:01 2013
@@ -1,13 +1,17 @@
-# $NetBSD: beagleboard.conf,v 1.11 2013/02/20 18:33:37 riz Exp $
+# $NetBSD: beagleboard.conf,v 1.12 2013/08/16 00:03:01 jmcneill Exp $
# BeagleBoard customization script used by mkimage
#
board=beagleboard
-kernel=$src/sys/arch/evbarm/compile/obj/BEAGLEBOARD/netbsd.ub
+
+bboard_kernel=$src/sys/arch/evbarm/compile/obj/BEAGLEBOARD/netbsd.ub
+bbone_kernel=$src/sys/arch/evbarm/compile/obj/BEAGLEBONE/netbsd.ub
. ${DIR}/conf/evbarm.conf
-kernelimg=netbsd.ub
-loadaddr=8100
+bboard_kernelimg=bboard.ub
+bboard_loadaddr=8100
+bbone_kernelimg=bbone.ub
+bbone_loadaddr=8200
make_filesystems() {
make_filesystems_evbarm
@@ -30,20 +34,34 @@ EOF
populate() {
cat ${mnt}/boot/uEnv.txt EOF
-loaduimage=fatload mmc 0 ${loadaddr} ${kernelimg}; bootm ${loadaddr} root=ld0a
+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
- if [ ! -f ${kernel} ]; then
- echo ${PROG}: Missing ${kernel} 12
+ if [ ! -f ${bboard_kernel} ]; then
+ echo ${PROG}: Missing ${bboard_kernel} 12
+ exit 1
+ fi
+ if [ ! -f ${bbone_kernel} ]; then
+ echo ${PROG}: Missing ${bbone_kernel} 12
exit 1
fi
echo ${bar} installing BEAGLEBOARD kernel to /boot ${bar}
- case ${kernel} in
+ case ${bboard_kernel} in
+ *.gz)
+ gzip -dc ${bboard_kernel} ${mnt}/boot/${bboard_kernelimg}
+ ;;
+ *)
+ cp ${bboard_kernel} ${mnt}/boot/${bboard_kernelimg}
+ ;;
+ esac
+
+ echo ${bar} installing BEAGLEBONE kernel to /boot ${bar}
+ case ${bbone_kernel} in
*.gz)
- gzip -dc ${kernel} ${mnt}/boot/${kernelimg}
+ gzip -dc ${bbone_kernel} ${mnt}/boot/${bbone_kernelimg}
;;
*)
- cp ${kernel} ${mnt}/boot/${kernelimg}
+ cp ${bbone_kernel} ${mnt}/boot/${bbone_kernelimg}
;;
esac
}
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Thu Aug 1 10:45:21 UTC 2013
Modified Files:
src/distrib/utils/embedded/conf: rpi.conf
Log Message:
use console auto detection, ok nick
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/distrib/utils/embedded/conf/rpi.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/rpi.conf
diff -u src/distrib/utils/embedded/conf/rpi.conf:1.20 src/distrib/utils/embedded/conf/rpi.conf:1.21
--- src/distrib/utils/embedded/conf/rpi.conf:1.20 Sun Mar 24 14:11:59 2013
+++ src/distrib/utils/embedded/conf/rpi.conf Thu Aug 1 10:45:21 2013
@@ -1,4 +1,4 @@
-# $NetBSD: rpi.conf,v 1.20 2013/03/24 14:11:59 jmcneill Exp $
+# $NetBSD: rpi.conf,v 1.21 2013/08/01 10:45:21 jmcneill Exp $
# Raspberry Pi customization script used by mkimage
#
@@ -33,7 +33,7 @@ EOF
populate() {
cat ${mnt}/boot/cmdline.txt EOF
-root=ld0a console=fb
+root=ld0a
#fb=1280x1024 # to select a mode, otherwise try EDID
#fb=disable # to disable fb completely
EOF
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: christos
Date: Mon May 20 19:28:44 UTC 2013
Modified Files:
src/distrib/utils/embedded/conf: evbarm.conf
Log Message:
If minwrites is set:
- set noatime, nodevmtime for root
- use tmpfs for frequently written files
- use unix sockets instead of fifos for postfix
From:
http://rich-tbp.blogspot.com/2013/03/netbsd-on-rpi-minimizing-disk-writes.html
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/distrib/utils/embedded/conf/evbarm.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/evbarm.conf
diff -u src/distrib/utils/embedded/conf/evbarm.conf:1.10 src/distrib/utils/embedded/conf/evbarm.conf:1.11
--- src/distrib/utils/embedded/conf/evbarm.conf:1.10 Fri Mar 1 09:28:22 2013
+++ src/distrib/utils/embedded/conf/evbarm.conf Mon May 20 15:28:44 2013
@@ -1,4 +1,4 @@
-# $NetBSD: evbarm.conf,v 1.10 2013/03/01 14:28:22 htodd Exp $
+# $NetBSD: evbarm.conf,v 1.11 2013/05/20 19:28:44 christos Exp $
# evbarm shared config
#
image=$HOME/${board}.img
@@ -60,7 +60,7 @@ drivedata: 0
EOF
}
-make_fstab_evbarm() {
+make_fstab_evbarm_normal() {
cat ${mnt}/etc/fstab EOF
# NetBSD /etc/fstab
# See /usr/share/examples/fstab/ for more examples.
@@ -73,8 +73,45 @@ procfs /proc procfs rw
EOF
}
+# From Richard Neswold's:
+# http://rich-tbp.blogspot.com/2013/03/netbsd-on-rpi-minimizing-disk-writes.html
+# Also for the postfix stuff below
+make_fstab_evbarm_minwrites() {
+ cat ${mnt}/etc/fstab EOF
+# NetBSD /etc/fstab
+# See /usr/share/examples/fstab/ for more examples.
+/dev/ld0a / ffs rw,log,noatime,nodevmtime 1 1
+/dev/ld0b none swap sw 0 0
+/dev/ld0e /boot msdos rw 1 1
+kernfs /kern kernfs rw
+ptyfs /dev/pts ptyfs rw
+procfs /proc procfs rw
+tmpfs /tmp tmpfs rw,-s32M
+tmpfs /var/log tmpfs rw,union,-s32M
+tmpfs /var/run tmpfs rw,union,-s1M
+tmpfs /var/mail tmpfs rw,union,-s10M
+tmpfs /var/spool/postfix tmpfs rw,union,-s20M
+tmpfs /var/db/postfix tmpfs rw,union,-s1M
+tmpfs /var/chroot tmpfs rw,union,-s10M
+EOF
+}
+
+make_fstab_evbarm() {
+ if $minwrites; then
+ make_fstab_evbarm_minwrites
+ else
+ make_fstab_evbarm_normal
+ fi
+}
+
customize_evbarm() {
cp ${release}/etc/rc.conf ${mnt}/etc/rc.conf
+ if $minwrites; then
+ mkdir ${mnt}/etc/postfix
+ (umask 022
+ sed -e 's/fifo/unix/' ${release}/etc/postfix/master.cf \
+ ${mnt}/etc/postfix/master.cf)
+ fi
cat ${mnt}/etc/rc.conf EOF
rc_configured=YES
hostname=${board}
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Sun Mar 24 14:11:59 UTC 2013
Modified Files:
src/distrib/utils/embedded/conf: rpi.conf
Log Message:
turn on devpubd
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/distrib/utils/embedded/conf/rpi.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/rpi.conf
diff -u src/distrib/utils/embedded/conf/rpi.conf:1.19 src/distrib/utils/embedded/conf/rpi.conf:1.20
--- src/distrib/utils/embedded/conf/rpi.conf:1.19 Wed Feb 20 18:33:37 2013
+++ src/distrib/utils/embedded/conf/rpi.conf Sun Mar 24 14:11:59 2013
@@ -1,4 +1,4 @@
-# $NetBSD: rpi.conf,v 1.19 2013/02/20 18:33:37 riz Exp $
+# $NetBSD: rpi.conf,v 1.20 2013/03/24 14:11:59 jmcneill Exp $
# Raspberry Pi customization script used by mkimage
#
@@ -26,6 +26,7 @@ customize() {
customize_evbarm
cat ${mnt}/etc/rc.conf EOF
wscons=YES
+devpubd=YES
EOF
}
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: garbled
Date: Wed Mar 20 14:47:21 UTC 2013
Modified Files:
src/distrib/utils/embedded/conf: rpi_inst.conf
Log Message:
Fix an empty shell function here, per Greg Troxel. Apparently empty shell
functions are not 100% portable.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/utils/embedded/conf/rpi_inst.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/rpi_inst.conf
diff -u src/distrib/utils/embedded/conf/rpi_inst.conf:1.1 src/distrib/utils/embedded/conf/rpi_inst.conf:1.2
--- src/distrib/utils/embedded/conf/rpi_inst.conf:1.1 Tue Mar 19 22:16:53 2013
+++ src/distrib/utils/embedded/conf/rpi_inst.conf Wed Mar 20 14:47:20 2013
@@ -1,4 +1,4 @@
-# $NetBSD: rpi_inst.conf,v 1.1 2013/03/19 22:16:53 garbled Exp $
+# $NetBSD: rpi_inst.conf,v 1.2 2013/03/20 14:47:20 garbled Exp $
# Raspberry Pi customization script used by mkimage
#
@@ -65,6 +65,7 @@ EOF
}
make_fstab_evbarm() {
+:
}
customize_evbarm() {
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: htodd
Date: Fri Mar 1 14:28:23 UTC 2013
Modified Files:
src/distrib/utils/embedded/conf: evbarm.conf
Log Message:
Disklabel need to use sectors, not bytes. Thanks to agc.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/distrib/utils/embedded/conf/evbarm.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/evbarm.conf
diff -u src/distrib/utils/embedded/conf/evbarm.conf:1.9 src/distrib/utils/embedded/conf/evbarm.conf:1.10
--- src/distrib/utils/embedded/conf/evbarm.conf:1.9 Thu Feb 21 15:13:10 2013
+++ src/distrib/utils/embedded/conf/evbarm.conf Fri Mar 1 14:28:22 2013
@@ -1,4 +1,4 @@
-# $NetBSD: evbarm.conf,v 1.9 2013/02/21 15:13:10 hans Exp $
+# $NetBSD: evbarm.conf,v 1.10 2013/03/01 14:28:22 htodd Exp $
# evbarm shared config
#
image=$HOME/${board}.img
@@ -14,7 +14,9 @@ size=0 # autocompute
msdosid=12
make_label_evbarm() {
- local totalsize=$(( ${newsize} * 1024 * 2 ))
+ # compute all sizes in terms of sectors
+ local totalsize=$(( ${newsize} * 1024 * 2 / 512 ))
+
local swapsize=$(( ${swap} * 1024 ))
local bootsize=$(( ${boot} * 1024 ))
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: riz
Date: Wed Feb 20 18:33:37 UTC 2013
Modified Files:
src/distrib/utils/embedded/conf: beagleboard.conf rpi.conf
Log Message:
Use gzip -dc instead of zcat - some versions of zcat don't grok
gzip.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/distrib/utils/embedded/conf/beagleboard.conf
cvs rdiff -u -r1.18 -r1.19 src/distrib/utils/embedded/conf/rpi.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/beagleboard.conf
diff -u src/distrib/utils/embedded/conf/beagleboard.conf:1.10 src/distrib/utils/embedded/conf/beagleboard.conf:1.11
--- src/distrib/utils/embedded/conf/beagleboard.conf:1.10 Sun Feb 17 20:49:16 2013
+++ src/distrib/utils/embedded/conf/beagleboard.conf Wed Feb 20 18:33:37 2013
@@ -1,4 +1,4 @@
-# $NetBSD: beagleboard.conf,v 1.10 2013/02/17 20:49:16 jmcneill Exp $
+# $NetBSD: beagleboard.conf,v 1.11 2013/02/20 18:33:37 riz Exp $
# BeagleBoard customization script used by mkimage
#
board=beagleboard
@@ -40,7 +40,7 @@ EOF
echo ${bar} installing BEAGLEBOARD kernel to /boot ${bar}
case ${kernel} in
*.gz)
- zcat ${kernel} ${mnt}/boot/${kernelimg}
+ gzip -dc ${kernel} ${mnt}/boot/${kernelimg}
;;
*)
cp ${kernel} ${mnt}/boot/${kernelimg}
Index: src/distrib/utils/embedded/conf/rpi.conf
diff -u src/distrib/utils/embedded/conf/rpi.conf:1.18 src/distrib/utils/embedded/conf/rpi.conf:1.19
--- src/distrib/utils/embedded/conf/rpi.conf:1.18 Sun Feb 17 20:49:16 2013
+++ src/distrib/utils/embedded/conf/rpi.conf Wed Feb 20 18:33:37 2013
@@ -1,4 +1,4 @@
-# $NetBSD: rpi.conf,v 1.18 2013/02/17 20:49:16 jmcneill Exp $
+# $NetBSD: rpi.conf,v 1.19 2013/02/20 18:33:37 riz Exp $
# Raspberry Pi customization script used by mkimage
#
@@ -44,7 +44,7 @@ EOF
echo ${bar} installing kernel ${bar}
case ${kernel} in
*.gz)
- zcat ${kernel} ${mnt}/boot/kernel.img
+ gzip -dc ${kernel} ${mnt}/boot/kernel.img
;;
*)
cp ${kernel} ${mnt}/boot/kernel.img
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Sun Feb 17 20:49:16 UTC 2013
Modified Files:
src/distrib/utils/embedded/conf: beagleboard.conf rpi.conf
Log Message:
gzcat - zcat
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/distrib/utils/embedded/conf/beagleboard.conf
cvs rdiff -u -r1.17 -r1.18 src/distrib/utils/embedded/conf/rpi.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/beagleboard.conf
diff -u src/distrib/utils/embedded/conf/beagleboard.conf:1.9 src/distrib/utils/embedded/conf/beagleboard.conf:1.10
--- src/distrib/utils/embedded/conf/beagleboard.conf:1.9 Sun Feb 10 16:13:00 2013
+++ src/distrib/utils/embedded/conf/beagleboard.conf Sun Feb 17 20:49:16 2013
@@ -1,4 +1,4 @@
-# $NetBSD: beagleboard.conf,v 1.9 2013/02/10 16:13:00 christos Exp $
+# $NetBSD: beagleboard.conf,v 1.10 2013/02/17 20:49:16 jmcneill Exp $
# BeagleBoard customization script used by mkimage
#
board=beagleboard
@@ -40,7 +40,7 @@ EOF
echo ${bar} installing BEAGLEBOARD kernel to /boot ${bar}
case ${kernel} in
*.gz)
- gzcat ${kernel} ${mnt}/boot/${kernelimg}
+ zcat ${kernel} ${mnt}/boot/${kernelimg}
;;
*)
cp ${kernel} ${mnt}/boot/${kernelimg}
Index: src/distrib/utils/embedded/conf/rpi.conf
diff -u src/distrib/utils/embedded/conf/rpi.conf:1.17 src/distrib/utils/embedded/conf/rpi.conf:1.18
--- src/distrib/utils/embedded/conf/rpi.conf:1.17 Sun Feb 10 21:51:53 2013
+++ src/distrib/utils/embedded/conf/rpi.conf Sun Feb 17 20:49:16 2013
@@ -1,4 +1,4 @@
-# $NetBSD: rpi.conf,v 1.17 2013/02/10 21:51:53 jmcneill Exp $
+# $NetBSD: rpi.conf,v 1.18 2013/02/17 20:49:16 jmcneill Exp $
# Raspberry Pi customization script used by mkimage
#
@@ -44,7 +44,7 @@ EOF
echo ${bar} installing kernel ${bar}
case ${kernel} in
*.gz)
- gzcat ${kernel} ${mnt}/boot/kernel.img
+ zcat ${kernel} ${mnt}/boot/kernel.img
;;
*)
cp ${kernel} ${mnt}/boot/kernel.img
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Tue Feb 12 12:04:39 UTC 2013
Modified Files:
src/distrib/utils/embedded/conf: evbarm.conf
Log Message:
create /proc and /kern
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/distrib/utils/embedded/conf/evbarm.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/evbarm.conf
diff -u src/distrib/utils/embedded/conf/evbarm.conf:1.7 src/distrib/utils/embedded/conf/evbarm.conf:1.8
--- src/distrib/utils/embedded/conf/evbarm.conf:1.7 Sun Feb 10 23:37:32 2013
+++ src/distrib/utils/embedded/conf/evbarm.conf Tue Feb 12 12:04:39 2013
@@ -1,4 +1,4 @@
-# $NetBSD: evbarm.conf,v 1.7 2013/02/10 23:37:32 jmcneill Exp $
+# $NetBSD: evbarm.conf,v 1.8 2013/02/12 12:04:39 jmcneill Exp $
# evbarm shared config
#
image=$HOME/${board}.img
@@ -85,4 +85,7 @@ EOF
fi
echo ${bar} running MAKEDEV ${bar}
(cd ${mnt}/dev sh ${release}/dev/MAKEDEV all)
+
+ echo ${bar} creating directories ${bar}
+ mkdir ${mnt}/proc ${mnt}/kern
}
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Sun Feb 10 15:56:57 UTC 2013
Modified Files:
src/distrib/utils/embedded/conf: beagleboard.conf
Log Message:
make sure kernel is installed as netbsd.ub
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/distrib/utils/embedded/conf/beagleboard.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/beagleboard.conf
diff -u src/distrib/utils/embedded/conf/beagleboard.conf:1.6 src/distrib/utils/embedded/conf/beagleboard.conf:1.7
--- src/distrib/utils/embedded/conf/beagleboard.conf:1.6 Sat Feb 9 11:19:55 2013
+++ src/distrib/utils/embedded/conf/beagleboard.conf Sun Feb 10 15:56:57 2013
@@ -1,4 +1,4 @@
-# $NetBSD: beagleboard.conf,v 1.6 2013/02/09 11:19:55 jmcneill Exp $
+# $NetBSD: beagleboard.conf,v 1.7 2013/02/10 15:56:57 jmcneill Exp $
# BeagleBoard customization script used by mkimage
#
board=beagleboard
@@ -33,10 +33,17 @@ populate() {
loaduimage=fatload mmc 0 ${loadaddr} ${kernelimg}; bootm ${loadaddr} root=ld0a
EOF
if [ ! -f ${kernel} ]; then
- echo ${PROG}: Missing ${kernel} 11
+ echo ${PROG}: Missing ${kernel} 12
exit 1
fi
- echo ${bar} installing kernel ${bar}
- cp ${kernel} ${mnt}/boot
+ echo ${bar} installing BEAGLEBOARD kernel to /boot ${bar}
+ case ${kernel} in
+ *.gz)
+ gzcat ${kernel} ${mnt}/boot/${kernelimg}
+ ;;
+ *)
+ cp ${kernel} ${mnt}/boot/${kernelimg}
+ ;;
+ esac
}
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: christos
Date: Sun Feb 10 16:06:25 UTC 2013
Modified Files:
src/distrib/utils/embedded/conf: beagleboard.conf
Log Message:
remove trailing whitespace from EOF
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/distrib/utils/embedded/conf/beagleboard.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/beagleboard.conf
diff -u src/distrib/utils/embedded/conf/beagleboard.conf:1.7 src/distrib/utils/embedded/conf/beagleboard.conf:1.8
--- src/distrib/utils/embedded/conf/beagleboard.conf:1.7 Sun Feb 10 10:56:57 2013
+++ src/distrib/utils/embedded/conf/beagleboard.conf Sun Feb 10 11:06:24 2013
@@ -1,8 +1,8 @@
-# $NetBSD: beagleboard.conf,v 1.7 2013/02/10 15:56:57 jmcneill Exp $
+# $NetBSD: beagleboard.conf,v 1.8 2013/02/10 16:06:24 christos Exp $
# BeagleBoard customization script used by mkimage
#
board=beagleboard
-kernel=$src/sys/arch/evbarm/compile/obj/BEAGLEBOARD/netbsd.ub
+kernel=$src/sys/arch/evbarm/compile/obj.evbarm/BEAGLEBOARD/netbsd.ub
. ${DIR}/conf/evbarm.conf
@@ -25,7 +25,7 @@ customize() {
customize_evbarm
cat ${mnt}/etc/rc.conf EOF
mdnsd=YES
-EOF
+EOF
}
populate() {
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Sun Feb 10 21:51:53 UTC 2013
Modified Files:
src/distrib/utils/embedded/conf: rpi.conf
Log Message:
dont use echo -n
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/distrib/utils/embedded/conf/rpi.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/rpi.conf
diff -u src/distrib/utils/embedded/conf/rpi.conf:1.16 src/distrib/utils/embedded/conf/rpi.conf:1.17
--- src/distrib/utils/embedded/conf/rpi.conf:1.16 Sat Feb 9 20:47:46 2013
+++ src/distrib/utils/embedded/conf/rpi.conf Sun Feb 10 21:51:53 2013
@@ -1,4 +1,4 @@
-# $NetBSD: rpi.conf,v 1.16 2013/02/09 20:47:46 christos Exp $
+# $NetBSD: rpi.conf,v 1.17 2013/02/10 21:51:53 jmcneill Exp $
# Raspberry Pi customization script used by mkimage
#
@@ -51,13 +51,12 @@ EOF
;;
esac
- echo -n ${bar} installing firmware files:
+ echo ${bar} installing firmware files ${bar}
(cd ${mnt}/boot
for f in ${firmwarefiles}; do
- echo -n $f
+ echo $f
cp ${firmwaredir}/${f} .
done
)
- echo ${bar}
}
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: christos
Date: Sun Feb 10 23:28:19 UTC 2013
Modified Files:
src/distrib/utils/embedded/conf: evbarm.conf
Log Message:
start with the original rc.conf
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/distrib/utils/embedded/conf/evbarm.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/evbarm.conf
diff -u src/distrib/utils/embedded/conf/evbarm.conf:1.5 src/distrib/utils/embedded/conf/evbarm.conf:1.6
--- src/distrib/utils/embedded/conf/evbarm.conf:1.5 Sun Feb 3 04:16:25 2013
+++ src/distrib/utils/embedded/conf/evbarm.conf Sun Feb 10 18:28:19 2013
@@ -1,4 +1,4 @@
-# $NetBSD: evbarm.conf,v 1.5 2013/02/03 09:16:25 christos Exp $
+# $NetBSD: evbarm.conf,v 1.6 2013/02/10 23:28:19 christos Exp $
# evbarm shared config
#
image=$HOME/${board}.img
@@ -72,6 +72,7 @@ EOF
}
customize_evbarm() {
+ cp ${release}/etc/rc.conf ${mnt}/etc/rc.conf
cat ${mnt}/etc/rc.conf EOF
sshd=YES
dhcpcd=YES
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Sun Feb 10 23:37:32 UTC 2013
Modified Files:
src/distrib/utils/embedded/conf: evbarm.conf
Log Message:
set rc_configured=YES and a hostname
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/distrib/utils/embedded/conf/evbarm.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/evbarm.conf
diff -u src/distrib/utils/embedded/conf/evbarm.conf:1.6 src/distrib/utils/embedded/conf/evbarm.conf:1.7
--- src/distrib/utils/embedded/conf/evbarm.conf:1.6 Sun Feb 10 23:28:19 2013
+++ src/distrib/utils/embedded/conf/evbarm.conf Sun Feb 10 23:37:32 2013
@@ -1,4 +1,4 @@
-# $NetBSD: evbarm.conf,v 1.6 2013/02/10 23:28:19 christos Exp $
+# $NetBSD: evbarm.conf,v 1.7 2013/02/10 23:37:32 jmcneill Exp $
# evbarm shared config
#
image=$HOME/${board}.img
@@ -74,6 +74,8 @@ EOF
customize_evbarm() {
cp ${release}/etc/rc.conf ${mnt}/etc/rc.conf
cat ${mnt}/etc/rc.conf EOF
+rc_configured=YES
+hostname=${board}
sshd=YES
dhcpcd=YES
EOF
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Sat Feb 9 11:07:26 UTC 2013
Modified Files:
src/distrib/utils/embedded/conf: rpi.conf
Log Message:
add missing }
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/distrib/utils/embedded/conf/rpi.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/rpi.conf
diff -u src/distrib/utils/embedded/conf/rpi.conf:1.14 src/distrib/utils/embedded/conf/rpi.conf:1.15
--- src/distrib/utils/embedded/conf/rpi.conf:1.14 Fri Feb 8 19:16:53 2013
+++ src/distrib/utils/embedded/conf/rpi.conf Sat Feb 9 11:07:26 2013
@@ -1,4 +1,4 @@
-# $NetBSD: rpi.conf,v 1.14 2013/02/08 19:16:53 christos Exp $
+# $NetBSD: rpi.conf,v 1.15 2013/02/09 11:07:26 jmcneill Exp $
# Raspberry Pi customization script used by mkimage
#
@@ -42,7 +42,7 @@ EOF
fi
echo ${bar} installing kernel ${bar}
- cp ${kernel ${mnt}/boot
+ cp ${kernel} ${mnt}/boot
echo -n ${bar} installing firmware files:
(cd ${mnt}/boot
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Sat Feb 9 11:19:55 UTC 2013
Modified Files:
src/distrib/utils/embedded/conf: beagleboard.conf
Log Message:
keep beagleboard conf in sync with rpi
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/distrib/utils/embedded/conf/beagleboard.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/beagleboard.conf
diff -u src/distrib/utils/embedded/conf/beagleboard.conf:1.5 src/distrib/utils/embedded/conf/beagleboard.conf:1.6
--- src/distrib/utils/embedded/conf/beagleboard.conf:1.5 Sun Feb 3 09:16:25 2013
+++ src/distrib/utils/embedded/conf/beagleboard.conf Sat Feb 9 11:19:55 2013
@@ -1,15 +1,18 @@
-# $NetBSD: beagleboard.conf,v 1.5 2013/02/03 09:16:25 christos Exp $
+# $NetBSD: beagleboard.conf,v 1.6 2013/02/09 11:19:55 jmcneill Exp $
# BeagleBoard customization script used by mkimage
#
board=beagleboard
-kernelconf=BEAGLEBOARD
-kerneldir=$src/sys/arch/evbarm/compile/obj/${kernelconf}
+kernel=$src/sys/arch/evbarm/compile/obj/BEAGLEBOARD/netbsd.ub
. ${DIR}/conf/evbarm.conf
kernelimg=netbsd.ub
loadaddr=8100
+make_filesystems() {
+ make_filesystems_evbarm
+}
+
make_label() {
make_label_evbarm
}
@@ -23,11 +26,17 @@ customize() {
cat ${mnt}/etc/rc.conf EOF
mdnsd=YES
EOF
+}
+
+populate() {
cat ${mnt}/boot/uEnv.txt EOF
loaduimage=fatload mmc 0 ${loadaddr} ${kernelimg}; bootm ${loadaddr} root=ld0a
EOF
-}
+ if [ ! -f ${kernel} ]; then
+ echo ${PROG}: Missing ${kernel} 11
+ exit 1
+ fi
-cleanup() {
- cleanup_evbarm
+ echo ${bar} installing kernel ${bar}
+ cp ${kernel} ${mnt}/boot
}
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: christos
Date: Sat Feb 9 20:47:46 UTC 2013
Modified Files:
src/distrib/utils/embedded/conf: rpi.conf
Log Message:
handle renaming and uncompressing the kernel
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/distrib/utils/embedded/conf/rpi.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/rpi.conf
diff -u src/distrib/utils/embedded/conf/rpi.conf:1.15 src/distrib/utils/embedded/conf/rpi.conf:1.16
--- src/distrib/utils/embedded/conf/rpi.conf:1.15 Sat Feb 9 06:07:26 2013
+++ src/distrib/utils/embedded/conf/rpi.conf Sat Feb 9 15:47:46 2013
@@ -1,9 +1,9 @@
-# $NetBSD: rpi.conf,v 1.15 2013/02/09 11:07:26 jmcneill Exp $
+# $NetBSD: rpi.conf,v 1.16 2013/02/09 20:47:46 christos Exp $
# Raspberry Pi customization script used by mkimage
#
board=rpi
-kernel=$src/sys/arch/evbarm/compile/RPI/kernel.img
+kernel=$src/sys/arch/evbarm/compile/RPI/netbsd-RPI.bin
. ${DIR}/conf/evbarm.conf
@@ -42,7 +42,14 @@ EOF
fi
echo ${bar} installing kernel ${bar}
- cp ${kernel} ${mnt}/boot
+ case ${kernel} in
+ *.gz)
+ gzcat ${kernel} ${mnt}/boot/kernel.img
+ ;;
+ *)
+ cp ${kernel} ${mnt}/boot/kernel.img
+ ;;
+ esac
echo -n ${bar} installing firmware files:
(cd ${mnt}/boot
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: christos
Date: Fri Feb 8 19:16:53 UTC 2013
Modified Files:
src/distrib/utils/embedded/conf: rpi.conf
Log Message:
change to take the full kernel path
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/distrib/utils/embedded/conf/rpi.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/rpi.conf
diff -u src/distrib/utils/embedded/conf/rpi.conf:1.13 src/distrib/utils/embedded/conf/rpi.conf:1.14
--- src/distrib/utils/embedded/conf/rpi.conf:1.13 Sun Feb 3 04:16:25 2013
+++ src/distrib/utils/embedded/conf/rpi.conf Fri Feb 8 14:16:53 2013
@@ -1,10 +1,9 @@
-# $NetBSD: rpi.conf,v 1.13 2013/02/03 09:16:25 christos Exp $
+# $NetBSD: rpi.conf,v 1.14 2013/02/08 19:16:53 christos Exp $
# Raspberry Pi customization script used by mkimage
#
board=rpi
-kernelconf=RPI
-kerneldir=$src/sys/arch/evbarm/compile/${kernelconf}
+kernel=$src/sys/arch/evbarm/compile/RPI/kernel.img
. ${DIR}/conf/evbarm.conf
@@ -37,13 +36,13 @@ root=ld0a console=fb
#fb=1280x1024 # to select a mode, otherwise try EDID
#fb=disable # to disable fb completely
EOF
- if [ ! -f ${kerneldir}/kernel.img ]; then
- echo ${PROG}: Missing ${kerneldir}/kernel.img 12
+ if [ ! -f ${kernel} ]; then
+ echo ${PROG}: Missing ${kernel} 12
exit 1
fi
echo ${bar} installing kernel ${bar}
- cp ${kerneldir}/kernel.img ${mnt}/boot
+ cp ${kernel ${mnt}/boot
echo -n ${bar} installing firmware files:
(cd ${mnt}/boot
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: skrll
Date: Mon Jan 28 09:06:20 UTC 2013
Modified Files:
src/distrib/utils/embedded/conf: beagleboard.conf evbarm.conf
Log Message:
Move mdnsd to beagleboard only. RPI doesn't like it at the moment.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/utils/embedded/conf/beagleboard.conf \
src/distrib/utils/embedded/conf/evbarm.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/beagleboard.conf
diff -u src/distrib/utils/embedded/conf/beagleboard.conf:1.3 src/distrib/utils/embedded/conf/beagleboard.conf:1.4
--- src/distrib/utils/embedded/conf/beagleboard.conf:1.3 Wed Jan 16 23:27:34 2013
+++ src/distrib/utils/embedded/conf/beagleboard.conf Mon Jan 28 09:06:19 2013
@@ -1,4 +1,4 @@
-# $NetBSD: beagleboard.conf,v 1.3 2013/01/16 23:27:34 christos Exp $
+# $NetBSD: beagleboard.conf,v 1.4 2013/01/28 09:06:19 skrll Exp $
# BeagleBoard customization script used by mkimage
#
board=beagleboard
@@ -22,7 +22,9 @@ make_fstab() {
customize() {
customize_evbarm
-
+ ${sudo} cat ${mnt}/etc/rc.conf EOF
+mdnsd=YES
+EOF
${sudo} cat ${mnt}/boot/uEnv.txt EOF
loaduimage=fatload mmc 0 ${loadaddr} ${kernelimg}; bootm ${loadaddr} root=ld0a
EOF
Index: src/distrib/utils/embedded/conf/evbarm.conf
diff -u src/distrib/utils/embedded/conf/evbarm.conf:1.3 src/distrib/utils/embedded/conf/evbarm.conf:1.4
--- src/distrib/utils/embedded/conf/evbarm.conf:1.3 Wed Jan 23 21:59:37 2013
+++ src/distrib/utils/embedded/conf/evbarm.conf Mon Jan 28 09:06:19 2013
@@ -1,4 +1,4 @@
-# $NetBSD: evbarm.conf,v 1.3 2013/01/23 21:59:37 skrll Exp $
+# $NetBSD: evbarm.conf,v 1.4 2013/01/28 09:06:19 skrll Exp $
# evbarm shared config
#
image=$HOME/${board}.img
@@ -87,7 +87,6 @@ customize_evbarm() {
${sudo} cat ${mnt}/etc/rc.conf EOF
sshd=YES
dhcpcd=YES
-mdnsd=YES
EOF
if [ ! -f ${mnt}/dev/MAKEDEV ]; then
echo ${PROG}: Missing ${mnt}/dev/MAKEDEV 12
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: skrll
Date: Wed Jan 23 21:59:37 UTC 2013
Modified Files:
src/distrib/utils/embedded/conf: evbarm.conf
Log Message:
Size for 512 byte sectors and base ffs partition size on totalsize minus
others.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/utils/embedded/conf/evbarm.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/evbarm.conf
diff -u src/distrib/utils/embedded/conf/evbarm.conf:1.2 src/distrib/utils/embedded/conf/evbarm.conf:1.3
--- src/distrib/utils/embedded/conf/evbarm.conf:1.2 Mon Jan 21 16:59:23 2013
+++ src/distrib/utils/embedded/conf/evbarm.conf Wed Jan 23 21:59:37 2013
@@ -1,4 +1,4 @@
-# $NetBSD: evbarm.conf,v 1.2 2013/01/21 16:59:23 skrll Exp $
+# $NetBSD: evbarm.conf,v 1.3 2013/01/23 21:59:37 skrll Exp $
# evbarm shared config
#
image=$HOME/${board}.img
@@ -19,15 +19,16 @@ tmp=/tmp/${board}.disklabel.$$
make_filesystems_evbarm() {
- local asize=$(( ${newsize} * 1024 ))
+ local totalsize=$(( ${newsize} * 1024 * 2 ))
local swapsize=$(( ${swap} * 1024 ))
local bootsize=$(( ${boot} * 1024 ))
- local bootoffset=$((${init} * 1024 ))
+ local bootoffset=$(( ${init} * 1024 ))
local swapoffset=$(( ${bootoffset} + ${bootsize} ))
+
+ local asize=$(( ${totalsize} - ${swapsize} - ${bootsize} - ${bootoffset} ))
local aoffset=$(( ${swapoffset} + ${swapsize} ))
- local totalsize=$(( ${asize} + ${swapsize} + ${bootsize} + ${bootoffset} ))
local bps=512
local spt=32
local tpc=64
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: skrll
Date: Wed Jan 23 22:20:06 UTC 2013
Modified Files:
src/distrib/utils/embedded/conf: rpi.conf
Log Message:
cmdline needs to be a line! hi jak.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/distrib/utils/embedded/conf/rpi.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/rpi.conf
diff -u src/distrib/utils/embedded/conf/rpi.conf:1.11 src/distrib/utils/embedded/conf/rpi.conf:1.12
--- src/distrib/utils/embedded/conf/rpi.conf:1.11 Mon Jan 21 17:14:23 2013
+++ src/distrib/utils/embedded/conf/rpi.conf Wed Jan 23 22:20:06 2013
@@ -1,4 +1,4 @@
-# $NetBSD: rpi.conf,v 1.11 2013/01/21 17:14:23 jakllsch Exp $
+# $NetBSD: rpi.conf,v 1.12 2013/01/23 22:20:06 skrll Exp $
# Raspberry Pi customization script used by mkimage
#
@@ -26,8 +26,7 @@ wscons=YES
EOF
${sudo} cat ${mnt}/boot/cmdline.txt EOF
-root=ld0a
-console=fb
+root=ld0a console=fb
#fb=1280x1024 # to select a mode, otherwise try EDID
#fb=disable # to disable fb completely
EOF
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: skrll
Date: Mon Jan 21 16:59:23 UTC 2013
Modified Files:
src/distrib/utils/embedded/conf: evbarm.conf rpi.conf
Log Message:
kernel.img is for rpi only
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/utils/embedded/conf/evbarm.conf
cvs rdiff -u -r1.9 -r1.10 src/distrib/utils/embedded/conf/rpi.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/evbarm.conf
diff -u src/distrib/utils/embedded/conf/evbarm.conf:1.1 src/distrib/utils/embedded/conf/evbarm.conf:1.2
--- src/distrib/utils/embedded/conf/evbarm.conf:1.1 Wed Jan 16 23:27:34 2013
+++ src/distrib/utils/embedded/conf/evbarm.conf Mon Jan 21 16:59:23 2013
@@ -1,4 +1,4 @@
-# $NetBSD: evbarm.conf,v 1.1 2013/01/16 23:27:34 christos Exp $
+# $NetBSD: evbarm.conf,v 1.2 2013/01/21 16:59:23 skrll Exp $
# evbarm shared config
#
image=$HOME/${board}.img
@@ -88,13 +88,6 @@ sshd=YES
dhcpcd=YES
mdnsd=YES
EOF
- if [ ! -f ${kerneldir}/kernel.img ]; then
- echo ${PROG}: Missing ${kerneldir}/kernel.img 12
- exit 1
- fi
- echo ${bar} installing kernel ${bar}
- ${sudo} cp ${kerneldir}/kernel.img ${mnt}/boot
-
if [ ! -f ${mnt}/dev/MAKEDEV ]; then
echo ${PROG}: Missing ${mnt}/dev/MAKEDEV 12
exit 1
Index: src/distrib/utils/embedded/conf/rpi.conf
diff -u src/distrib/utils/embedded/conf/rpi.conf:1.9 src/distrib/utils/embedded/conf/rpi.conf:1.10
--- src/distrib/utils/embedded/conf/rpi.conf:1.9 Wed Jan 16 23:27:34 2013
+++ src/distrib/utils/embedded/conf/rpi.conf Mon Jan 21 16:59:23 2013
@@ -1,4 +1,4 @@
-# $NetBSD: rpi.conf,v 1.9 2013/01/16 23:27:34 christos Exp $
+# $NetBSD: rpi.conf,v 1.10 2013/01/21 16:59:23 skrll Exp $
# Raspberry PI customization script used by mkimage
#
@@ -27,10 +27,18 @@ EOF
${sudo} cat ${mnt}/boot/cmdline.txt EOF
console=fb
-#fb=1280x1024 # to select a mode, otherwise EDID will be tried and fallback to
+#fb=1280x1024 # to select a mode, otherwise try EDID
#fb=disable # to disable fb completely
EOF
+ if [ ! -f ${kerneldir}/kernel.img ]; then
+ echo ${PROG}: Missing ${kerneldir}/kernel.img 12
+ exit 1
+ fi
+
+ echo ${bar} installing kernel ${bar}
+ ${sudo} cp ${kerneldir}/kernel.img ${mnt}/boot
+
echo -n ${bar} installing firmware files:
(cd ${mnt}/boot
for f in ${firmwarefiles}; do
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jakllsch
Date: Mon Jan 21 17:14:23 UTC 2013
Modified Files:
src/distrib/utils/embedded/conf: rpi.conf
Log Message:
Specify the root device in cmdline.txt, also, it's 'Pi', not 'PI'.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/distrib/utils/embedded/conf/rpi.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/rpi.conf
diff -u src/distrib/utils/embedded/conf/rpi.conf:1.10 src/distrib/utils/embedded/conf/rpi.conf:1.11
--- src/distrib/utils/embedded/conf/rpi.conf:1.10 Mon Jan 21 16:59:23 2013
+++ src/distrib/utils/embedded/conf/rpi.conf Mon Jan 21 17:14:23 2013
@@ -1,5 +1,5 @@
-# $NetBSD: rpi.conf,v 1.10 2013/01/21 16:59:23 skrll Exp $
-# Raspberry PI customization script used by mkimage
+# $NetBSD: rpi.conf,v 1.11 2013/01/21 17:14:23 jakllsch Exp $
+# Raspberry Pi customization script used by mkimage
#
board=rpi
@@ -26,6 +26,7 @@ wscons=YES
EOF
${sudo} cat ${mnt}/boot/cmdline.txt EOF
+root=ld0a
console=fb
#fb=1280x1024 # to select a mode, otherwise try EDID
#fb=disable # to disable fb completely
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: christos
Date: Tue Jan 15 20:55:01 UTC 2013
Modified Files:
src/distrib/utils/embedded/conf: rpi.conf
Log Message:
now that we compute sizes correctly, reduce the extra to how much free space
we want.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/distrib/utils/embedded/conf/rpi.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/rpi.conf
diff -u src/distrib/utils/embedded/conf/rpi.conf:1.7 src/distrib/utils/embedded/conf/rpi.conf:1.8
--- src/distrib/utils/embedded/conf/rpi.conf:1.7 Mon Jan 14 22:56:20 2013
+++ src/distrib/utils/embedded/conf/rpi.conf Tue Jan 15 15:55:00 2013
@@ -1,4 +1,4 @@
-# $NetBSD: rpi.conf,v 1.7 2013/01/15 03:56:20 christos Exp $
+# $NetBSD: rpi.conf,v 1.8 2013/01/15 20:55:00 christos Exp $
# Raspberry PI customization script used by mkimage
#
image=$HOME/rpi.img
@@ -12,11 +12,11 @@ kerneldir=$src/sys/arch/evbarm/compile/R
specialdirs=/kern /proc
swap=256
-extra=$(( 150 + 8 )) # cylinder groups ~150MB
+extra=8 # spare space
boot=112
init=8
-size=0
+size=0 # autocompute
msdosid=12
overhead=$(( ${swap} + ${extra} + ${init} + ${boot} ))
@@ -60,10 +60,10 @@ drivedata: 0
8 partitions:
# size offsetfstype [fsize bsize cpg/sgs]
- a: ${asize} ${aoffset}4.2BSD 2048 16384 0 #
- b: ${swapsize} ${swapoffset} swap #
- d: ${totalsize} 0 unused 0 0#
- e: ${bootsize} ${bootoffset} MSDOS #
+ a: ${asize} ${aoffset}4.2BSD ${fsize} ${bsize} 0 #
+ b: ${swapsize} ${swapoffset} swap #
+ d: ${totalsize} 0 unused 0 0 #
+ e: ${bootsize} ${bootoffset} MSDOS#
EOF
${sudo} disklabel -R ${vnddev} ${tmp}
${sudo} fdisk -f -u -0 -s ${msdosid}/${bootoffset}/${bootsize} -F ${image}
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Mon Jan 14 11:32:40 UTC 2013
Added Files:
src/distrib/utils/embedded/conf: beagleboard.conf
Log Message:
add mkimage config for generating beagleboard images
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/distrib/utils/embedded/conf/beagleboard.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/distrib/utils/embedded/conf/beagleboard.conf
diff -u /dev/null src/distrib/utils/embedded/conf/beagleboard.conf:1.1
--- /dev/null Mon Jan 14 11:32:40 2013
+++ src/distrib/utils/embedded/conf/beagleboard.conf Mon Jan 14 11:32:40 2013
@@ -0,0 +1,120 @@
+# $NetBSD: beagleboard.conf,v 1.1 2013/01/14 11:32:40 jmcneill Exp $
+# BeagleBoard customization script used by mkimage
+#
+board=beagleboard
+kernelconf=BEAGLEBOARD
+kernelimg=netbsd.ub
+loadaddr=8100
+image=$HOME/${board}.img
+
+sets=base etc comp games man misc modules tests text
+setsdir=$obj/evbarm/media
+kerneldir=$src/sys/arch/evbarm/compile/${kernelconf}
+specialdirs=/kern /proc
+
+swap=512
+size=2048
+overhead=8
+boot=112
+init=8
+msdosid=12
+
+tmp=/tmp/${board}.disklabel.$$
+
+make_filesystems() {
+
+ local asize=$(( ${size} * 1024 ))
+ local swapsize=$(( ${swap} * 1024 ))
+ local bootsize=$(( ${boot} * 1024 ))
+
+ local bootoffset=$((${init} * 1024 ))
+ local swapoffset=$(( ${bootoffset} + ${bootsize} ))
+ local aoffset=$(( ${swapoffset} + ${swapsize} ))
+
+ local totalsize=$(( ${asize} + ${swapsize} + ${bootsize} + ${bootoffset} ))
+ local bps=512
+ local spt=32
+ local tpc=64
+ local spc=2048
+ local cylinders=$(( ${totalsize} / ${spc} ))
+
+ cat ${tmp} EOF
+type: SCSI
+disk: STORAGE DEVICE
+label: fictitious
+flags: removable
+bytes/sector: ${bps}
+sectors/track: ${spt}
+tracks/cylinder: ${tpc}
+sectors/cylinder: ${spc}
+cylinders: ${cylinders}
+total sectors: ${totalsize}
+rpm: 3600
+interleave: 1
+trackskew: 0
+cylinderskew: 0
+headswitch: 0 # microseconds
+track-to-track seek: 0 # microseconds
+drivedata: 0
+
+8 partitions:
+# size offsetfstype [fsize bsize cpg/sgs]
+ a: ${asize} ${aoffset}4.2BSD 2048 16384 0 #
+ b: ${swapsize} ${swapoffset} swap #
+ d: ${totalsize} 0 unused 0 0#
+ e: ${bootsize} ${bootoffset} MSDOS #
+EOF
+ ${sudo} disklabel -R ${vnddev} ${tmp}
+ ${sudo} fdisk -f -u -0 -s ${msdosid}/${bootoffset}/${bootsize} -F ${image}
+ ${sudo} newfs /dev/r${vnddev}a
+ ${sudo} newfs_msdos /dev/r${vnddev}e
+ ${sudo} mount /dev/${vnddev}a ${mnt}
+ ${sudo} mkdir ${mnt}/boot
+ ${sudo} mount_msdos /dev/${vnddev}e ${mnt}/boot
+}
+
+make_fstab() {
+${sudo} cat ${mnt}/etc/fstab EOF
+# NetBSD /etc/fstab
+# See /usr/share/examples/fstab/ for more examples.
+/dev/ld0a / ffs rw,log 1 1
+/dev/ld0b none swap sw 0 0
+/dev/ld0e /boot msdos rw 1 1
+kernfs /kern kernfs rw
+ptyfs /dev/pts ptyfs rw
+procfs /proc procfs rw
+EOF
+}
+
+customize() {
+
+ ${sudo} cat ${mnt}/etc/rc.conf EOF
+hostname=${board}
+sshd=YES
+dhcpcd=YES
+mdnsd=YES
+EOF
+
+ ${sudo} cat ${mnt}/boot/uEnv.txt EOF
+loaduimage=fatload mmc 0 ${loadaddr} ${kernelimg}; bootm ${loadaddr} root=ld0a
+EOF
+
+ if [ ! -f ${kerneldir}/${kernelimg} ]; then
+ echo ${PROG}: Missing ${kerneldir}/${kernelimg} 12
+ exit 1
+ fi
+ echo ${bar} installing kernel ${bar}
+ ${sudo} cp ${kerneldir}/${kernelimg} ${mnt}/boot
+
+ if [ ! -f ${mnt}/dev/MAKEDEV ]; then
+ echo ${PROG}: Missing ${mnt}/dev/MAKEDEV 12
+ exit 1
+ fi
+ echo ${bar} running MAKEDEV ${bar}
+ (cd ${mnt}/dev ${sudo} sh MAKEDEV all)
+}
+
+cleanup() {
+rm -f ${tmp}
+${sudo} umount ${mnt}/boot
+}
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Tue Jan 15 02:51:10 UTC 2013
Modified Files:
src/distrib/utils/embedded/conf: beagleboard.conf
Log Message:
set kerneldir= to the path used by build.sh
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/utils/embedded/conf/beagleboard.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/beagleboard.conf
diff -u src/distrib/utils/embedded/conf/beagleboard.conf:1.1 src/distrib/utils/embedded/conf/beagleboard.conf:1.2
--- src/distrib/utils/embedded/conf/beagleboard.conf:1.1 Mon Jan 14 11:32:40 2013
+++ src/distrib/utils/embedded/conf/beagleboard.conf Tue Jan 15 02:51:10 2013
@@ -1,4 +1,4 @@
-# $NetBSD: beagleboard.conf,v 1.1 2013/01/14 11:32:40 jmcneill Exp $
+# $NetBSD: beagleboard.conf,v 1.2 2013/01/15 02:51:10 jmcneill Exp $
# BeagleBoard customization script used by mkimage
#
board=beagleboard
@@ -9,7 +9,7 @@ image=$HOME/${board}.img
sets=base etc comp games man misc modules tests text
setsdir=$obj/evbarm/media
-kerneldir=$src/sys/arch/evbarm/compile/${kernelconf}
+kerneldir=$src/sys/arch/evbarm/compile/obj/${kernelconf}
specialdirs=/kern /proc
swap=512
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: christos
Date: Tue Jan 15 03:56:20 UTC 2013
Modified Files:
src/distrib/utils/embedded/conf: rpi.conf
Log Message:
make autosizing work (kind of)
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/distrib/utils/embedded/conf/rpi.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/rpi.conf
diff -u src/distrib/utils/embedded/conf/rpi.conf:1.6 src/distrib/utils/embedded/conf/rpi.conf:1.7
--- src/distrib/utils/embedded/conf/rpi.conf:1.6 Mon Jan 14 22:26:28 2013
+++ src/distrib/utils/embedded/conf/rpi.conf Mon Jan 14 22:56:20 2013
@@ -1,4 +1,4 @@
-# $NetBSD: rpi.conf,v 1.6 2013/01/15 03:26:28 christos Exp $
+# $NetBSD: rpi.conf,v 1.7 2013/01/15 03:56:20 christos Exp $
# Raspberry PI customization script used by mkimage
#
image=$HOME/rpi.img
@@ -6,13 +6,13 @@ image=$HOME/rpi.img
firmwaredir=$src/external/broadcom/rpi-firmware/dist
firmwarefiles=LICENCE.broadcom bootcode.bin fixup.dat fixup_cd.dat start.elf start_cd.elf
-sets=base etc comp games man misc modules tests text
+sets=base etc comp games man misc modules text
setsdir=$obj/evbarm//media/evbarm/binary/sets/
kerneldir=$src/sys/arch/evbarm/compile/RPI
specialdirs=/kern /proc
swap=256
-extra=8
+extra=$(( 150 + 8 )) # cylinder groups ~150MB
boot=112
init=8
@@ -69,7 +69,7 @@ EOF
${sudo} fdisk -f -u -0 -s ${msdosid}/${bootoffset}/${bootsize} -F ${image}
${sudo} newfs /dev/r${vnddev}a
${sudo} newfs_msdos /dev/r${vnddev}e
- ${sudo} mount /dev/${vnddev}a ${mnt}
+ ${sudo} mount -o async /dev/${vnddev}a ${mnt}
${sudo} mkdir ${mnt}/boot
${sudo} mount_msdos /dev/${vnddev}e ${mnt}/boot
}
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: christos
Date: Sun Jan 13 21:38:45 UTC 2013
Modified Files:
src/distrib/utils/embedded/conf: rpi.conf
Log Message:
Autosize label
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/utils/embedded/conf/rpi.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/rpi.conf
diff -u src/distrib/utils/embedded/conf/rpi.conf:1.1 src/distrib/utils/embedded/conf/rpi.conf:1.2
--- src/distrib/utils/embedded/conf/rpi.conf:1.1 Sun Jan 13 15:57:18 2013
+++ src/distrib/utils/embedded/conf/rpi.conf Sun Jan 13 16:38:45 2013
@@ -1,4 +1,4 @@
-# $NetBSD: rpi.conf,v 1.1 2013/01/13 20:57:18 christos Exp $
+# $NetBSD: rpi.conf,v 1.2 2013/01/13 21:38:45 christos Exp $
# Raspberry PI customization script used by mkimage
#
image=$HOME/rpi.img
@@ -11,23 +11,42 @@ setsdir=$obj/evbarm/media
kerneldir=$src/sys/arch/evbarm/compile/RPI
specialdirs=/kern /proc
+swap=512
size=2048
overhead=8
+boot=112
+init=8
tmp=/tmp/rpi.disklabel.$$
make_filesystems() {
+
+ local asize=$(( ${size} * 1024 ))
+ local swapsize=$(( ${swap} * 1024 ))
+ local bootsize=$(( ${boot} * 1024 ))
+
+ local bootoffset=$((${init} * 1024 ))
+ local swapoffset=$(( ${bootoffset} + ${bootsize} ))
+ local aoffset=$(( ${swapoffset} + ${swapsize} ))
+
+ local totalsize=$(( ${asize} + ${swapsize} + ${bootsize} + ${bootoffset} ))
+ local bps=512
+ local spt=32
+ local tpc=64
+ local spc=2048
+ local cylinders=$(( ${totalsize} / ${spc} ))
+
cat ${tmp} EOF
type: SCSI
disk: STORAGE DEVICE
label: fictitious
flags: removable
-bytes/sector: 512
-sectors/track: 32
-tracks/cylinder: 64
-sectors/cylinder: 2048
-cylinders: 7460
-total sectors: 2097152
+bytes/sector: ${bps}
+sectors/track: ${spt}
+tracks/cylinder: ${tpc}
+sectors/cylinder: ${spc}
+cylinders: ${cylinders}
+total sectors: ${totalsize}
rpm: 3600
interleave: 1
trackskew: 0
@@ -37,11 +56,11 @@ track-to-track seek: 0 # microseconds
drivedata: 0
8 partitions:
-#sizeoffset fstype [fsize bsize cpg/sgs]
- a: 1449984647168 4.2BSD 2048 16384 0 #
- b:524288122880 swap #
- d: 2097152 0 unused 0 0#
- e:114688 8192 MSDOS #
+# size offsetfstype [fsize bsize cpg/sgs]
+ a: ${asize} ${aoffset}4.2BSD 2048 16384 0 #
+ b: ${swapsize} ${swapoffset} swap #
+ d: ${totalsize} 0 unused 0 0#
+ e: ${bootsize} ${bootoffset} MSDOS #
EOF
${sudo} disklabel -R ${vnddev} ${tmp}
${sudo} fdisk -f -u -0 -s 12/8192/114688 -F ${image}
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: christos
Date: Sun Jan 13 21:46:03 UTC 2013
Modified Files:
src/distrib/utils/embedded/conf: rpi.conf
Log Message:
use variables for the fdisk command too
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/utils/embedded/conf/rpi.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/rpi.conf
diff -u src/distrib/utils/embedded/conf/rpi.conf:1.2 src/distrib/utils/embedded/conf/rpi.conf:1.3
--- src/distrib/utils/embedded/conf/rpi.conf:1.2 Sun Jan 13 16:38:45 2013
+++ src/distrib/utils/embedded/conf/rpi.conf Sun Jan 13 16:46:03 2013
@@ -1,4 +1,4 @@
-# $NetBSD: rpi.conf,v 1.2 2013/01/13 21:38:45 christos Exp $
+# $NetBSD: rpi.conf,v 1.3 2013/01/13 21:46:03 christos Exp $
# Raspberry PI customization script used by mkimage
#
image=$HOME/rpi.img
@@ -16,6 +16,7 @@ size=2048
overhead=8
boot=112
init=8
+msdosid=12
tmp=/tmp/rpi.disklabel.$$
@@ -63,7 +64,7 @@ drivedata: 0
e: ${bootsize} ${bootoffset} MSDOS #
EOF
${sudo} disklabel -R ${vnddev} ${tmp}
- ${sudo} fdisk -f -u -0 -s 12/8192/114688 -F ${image}
+ ${sudo} fdisk -f -u -0 -s ${msdosid}/${bootoffset}/${bootsize} -F ${image}
${sudo} newfs /dev/r${vnddev}a
${sudo} newfs_msdos /dev/r${vnddev}e
${sudo} mount /dev/${vnddev}a ${mnt}
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: christos
Date: Sun Jan 13 22:08:43 UTC 2013
Modified Files:
src/distrib/utils/embedded/conf: rpi.conf usermode.conf
Log Message:
append to rc.conf, don't overwrite
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/distrib/utils/embedded/conf/rpi.conf
cvs rdiff -u -r1.1 -r1.2 src/distrib/utils/embedded/conf/usermode.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/rpi.conf
diff -u src/distrib/utils/embedded/conf/rpi.conf:1.4 src/distrib/utils/embedded/conf/rpi.conf:1.5
--- src/distrib/utils/embedded/conf/rpi.conf:1.4 Sun Jan 13 16:52:42 2013
+++ src/distrib/utils/embedded/conf/rpi.conf Sun Jan 13 17:08:43 2013
@@ -1,4 +1,4 @@
-# $NetBSD: rpi.conf,v 1.4 2013/01/13 21:52:42 christos Exp $
+# $NetBSD: rpi.conf,v 1.5 2013/01/13 22:08:43 christos Exp $
# Raspberry PI customization script used by mkimage
#
image=$HOME/rpi.img
@@ -87,7 +87,7 @@ EOF
customize() {
-${sudo} cat ${mnt}/etc/rc.conf EOF
+${sudo} cat ${mnt}/etc/rc.conf EOF
sshd=YES
dhcpcd=YES
mdnsd=YES
Index: src/distrib/utils/embedded/conf/usermode.conf
diff -u src/distrib/utils/embedded/conf/usermode.conf:1.1 src/distrib/utils/embedded/conf/usermode.conf:1.2
--- src/distrib/utils/embedded/conf/usermode.conf:1.1 Sun Jan 13 15:57:18 2013
+++ src/distrib/utils/embedded/conf/usermode.conf Sun Jan 13 17:08:43 2013
@@ -1,4 +1,4 @@
-# $NetBSD: usermode.conf,v 1.1 2013/01/13 20:57:18 christos Exp $
+# $NetBSD: usermode.conf,v 1.2 2013/01/13 22:08:43 christos Exp $
# NetBSD/usermode customization script used by mkimage
custom=custom
image=usermode.img
@@ -37,7 +37,7 @@ EOF
}
customize() {
-${sudo} cat ${mnt}/etc/rc.conf EOF
+${sudo} cat ${mnt}/etc/rc.conf EOF
# make sure we have the right rw filesystem at boot
critical_filesystems_local=/var.cow /var /etc.cow /etc /root.cow /root
