CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: christos
Date: Thu Mar 14 15:41:54 UTC 2024
Modified Files:
src/distrib/utils/embedded/conf: armv7.conf
Log Message:
Fix reproducible build (Jan-Benedict Glaw)
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 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.46 src/distrib/utils/embedded/conf/armv7.conf:1.47
--- src/distrib/utils/embedded/conf/armv7.conf:1.46 Wed Apr 19 14:39:18 2023
+++ src/distrib/utils/embedded/conf/armv7.conf Thu Mar 14 11:41:54 2024
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.46 2023/04/19 18:39:18 brook Exp $
+# $NetBSD: armv7.conf,v 1.47 2024/03/14 15:41:54 christos Exp $
# ARMv7 customization script used by mkimage
#
board=armv7
@@ -45,7 +45,11 @@ populate_common() {
fi
# Install boot script
- "${MKUBOOTIMAGE}" -A arm -C none -O netbsd -T script -a 0 -n "NetBSD/armv7 boot" "${mnt}/boot/boot.cmd" "${mnt}/boot/boot.scr"
+ [ -n "${MKREPRO_TIMESTAMP}" ] && \
+ MKUBOOTIMAGEARGS="-t ${MKREPRO_TIMESTAMP}"
+ "${MKUBOOTIMAGE}" -A arm -C none -O netbsd -T script \
+ ${MKUBOOTIMAGEARGS} -a 0 -n "NetBSD/armv7 boot" \
+ "${mnt}/boot/boot.cmd" "${mnt}/boot/boot.scr"
}
populate_rpi() {
CVS commit: src/distrib/utils/embedded/conf
Module Name:src Committed By: christos Date: Thu Mar 14 15:41:54 UTC 2024 Modified Files: src/distrib/utils/embedded/conf: armv7.conf Log Message: Fix reproducible build (Jan-Benedict Glaw) To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 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.
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Sun Jan 21 10:28:25 UTC 2024
Modified Files:
src/distrib/utils/embedded/conf: wii.conf
Log Message:
build fix: use dd with count=1 for compat with NetBSD dd(1)
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/utils/embedded/conf/wii.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/wii.conf
diff -u src/distrib/utils/embedded/conf/wii.conf:1.1 src/distrib/utils/embedded/conf/wii.conf:1.2
--- src/distrib/utils/embedded/conf/wii.conf:1.1 Sat Jan 20 21:35:59 2024
+++ src/distrib/utils/embedded/conf/wii.conf Sun Jan 21 10:28:25 2024
@@ -1,4 +1,4 @@
-# $NetBSD: wii.conf,v 1.1 2024/01/20 21:35:59 jmcneill Exp $
+# $NetBSD: wii.conf,v 1.2 2024/01/21 10:28:25 jmcneill Exp $
# Nintendo Wii customization script used by mkimage
#
board=wii
@@ -55,8 +55,8 @@ populate() {
# Add swap space
rm -f ${mnt}${swap_file}
- dd if=/dev/zero of=${mnt}${swap_file} bs=1 count=0 \
- seek=$((${swap_size_MB} * 1024 * 1024))
+ dd if=/dev/zero of=${mnt}${swap_file} bs=1 count=1 \
+ seek=$((${swap_size_MB} * 1024 * 1024 - 1))
echo ".${swap_file} type=file uname=root gname=wheel mode=0600" \
>> "$tmp/selected_sets"
}
CVS commit: src/distrib/utils/embedded/conf
Module Name:src Committed By: jmcneill Date: Sun Jan 21 10:28:25 UTC 2024 Modified Files: src/distrib/utils/embedded/conf: wii.conf Log Message: build fix: use dd with count=1 for compat with NetBSD dd(1) To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/distrib/utils/embedded/conf/wii.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/utils/embedded/conf
Module Name:src Committed By: yamt Date: Sat Nov 19 09:19:28 UTC 2022 Modified Files: src/distrib/utils/embedded/conf: armv7.conf rpi.conf rpi_inst.conf Log Message: Update a few www.raspberrypi.com URLs To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/distrib/utils/embedded/conf/armv7.conf cvs rdiff -u -r1.39 -r1.40 src/distrib/utils/embedded/conf/rpi.conf cvs rdiff -u -r1.18 -r1.19 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.44 src/distrib/utils/embedded/conf/armv7.conf:1.45 --- src/distrib/utils/embedded/conf/armv7.conf:1.44 Wed May 27 21:53:04 2020 +++ src/distrib/utils/embedded/conf/armv7.conf Sat Nov 19 09:19:27 2022 @@ -1,4 +1,4 @@ -# $NetBSD: armv7.conf,v 1.44 2020/05/27 21:53:04 jmcneill Exp $ +# $NetBSD: armv7.conf,v 1.45 2022/11/19 09:19:27 yamt Exp $ # ARMv7 customization script used by mkimage # board=armv7 @@ -65,9 +65,9 @@ upstream_kernel=1 os_prefix=dtb/ cmdline=../cmdline.txt kernel=/netbsd-GENERIC.img -# Boot options, see https://www.raspberrypi.org/documentation/configuration/config-txt/boot.md +# Boot options, see https://www.raspberrypi.com/documentation/computers/config_txt.html#boot-options kernel_address=0x0140 -# UART settings, see https://www.raspberrypi.org/documentation/configuration/uart.md +# UART settings, see https://www.raspberrypi.com/documentation/computers/configuration.html#configuring-uarts 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.39 src/distrib/utils/embedded/conf/rpi.conf:1.40 --- src/distrib/utils/embedded/conf/rpi.conf:1.39 Tue Dec 1 04:21:26 2020 +++ src/distrib/utils/embedded/conf/rpi.conf Sat Nov 19 09:19:27 2022 @@ -1,4 +1,4 @@ -# $NetBSD: rpi.conf,v 1.39 2020/12/01 04:21:26 rin Exp $ +# $NetBSD: rpi.conf,v 1.40 2022/11/19 09:19:27 yamt Exp $ # Raspberry Pi customization script used by mkimage # @@ -59,7 +59,7 @@ EOF upstream_kernel=1 os_prefix=dtb/ cmdline=../cmdline.txt -# UART settings, see https://www.raspberrypi.org/documentation/configuration/uart.md +# UART settings, see https://www.raspberrypi.com/documentation/computers/configuration.html#configuring-uarts enable_uart=1 force_turbo=0 # Default kernel for BCM2836 and later Index: src/distrib/utils/embedded/conf/rpi_inst.conf diff -u src/distrib/utils/embedded/conf/rpi_inst.conf:1.18 src/distrib/utils/embedded/conf/rpi_inst.conf:1.19 --- src/distrib/utils/embedded/conf/rpi_inst.conf:1.18 Tue Jul 6 11:49:36 2021 +++ src/distrib/utils/embedded/conf/rpi_inst.conf Sat Nov 19 09:19:27 2022 @@ -1,4 +1,4 @@ -# $NetBSD: rpi_inst.conf,v 1.18 2021/07/06 11:49:36 jmcneill Exp $ +# $NetBSD: rpi_inst.conf,v 1.19 2022/11/19 09:19:27 yamt Exp $ # Raspberry Pi customization script used by mkimage # @@ -47,7 +47,7 @@ upstream_kernel=1 os_prefix=dtb/ cmdline=../cmdline.txt kernel=/kernel.img -# UART settings, see https://www.raspberrypi.org/documentation/configuration/uart.md +# UART settings, https://www.raspberrypi.com/documentation/computers/configuration.html#configuring-uarts enable_uart=1 force_turbo=0 EOF
CVS commit: src/distrib/utils/embedded/conf
Module Name:src Committed By: yamt Date: Sat Nov 19 09:19:28 UTC 2022 Modified Files: src/distrib/utils/embedded/conf: armv7.conf rpi.conf rpi_inst.conf Log Message: Update a few www.raspberrypi.com URLs To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/distrib/utils/embedded/conf/armv7.conf cvs rdiff -u -r1.39 -r1.40 src/distrib/utils/embedded/conf/rpi.conf cvs rdiff -u -r1.18 -r1.19 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.
CVS commit: src/distrib/utils/embedded/conf
Module Name:src Committed By: jmcneill Date: Sun Oct 30 15:08:50 UTC 2022 Modified Files: src/distrib/utils/embedded/conf: evbarm.conf Log Message: Silence a warning when machdep.dmi.chassis-asset-tag is not present To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 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.
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Sun Oct 30 15:08:50 UTC 2022
Modified Files:
src/distrib/utils/embedded/conf: evbarm.conf
Log Message:
Silence a warning when machdep.dmi.chassis-asset-tag is not present
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 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.40 src/distrib/utils/embedded/conf/evbarm.conf:1.41
--- src/distrib/utils/embedded/conf/evbarm.conf:1.40 Sat Oct 15 18:32:30 2022
+++ src/distrib/utils/embedded/conf/evbarm.conf Sun Oct 30 15:08:50 2022
@@ -1,4 +1,4 @@
-# $NetBSD: evbarm.conf,v 1.40 2022/10/15 18:32:30 jmcneill Exp $
+# $NetBSD: evbarm.conf,v 1.41 2022/10/30 15:08:50 jmcneill Exp $
# evbarm shared config
#
image=$HOME/${board}.img
@@ -154,7 +154,7 @@ is_cloud() {
fi
# Oracle OCI
- case "\$(/sbin/sysctl -n machdep.dmi.chassis-asset-tag)" in
+ case "\$(/sbin/sysctl -n machdep.dmi.chassis-asset-tag 2>/dev/null)" in
OracleCloud*)
ret=YES
;;
CVS commit: src/distrib/utils/embedded/conf
Module Name:src Committed By: jmcneill Date: Sat Oct 16 14:05:48 UTC 2021 Modified Files: src/distrib/utils/embedded/conf: arm64.conf Log Message: Background dhcpcd if ec2_init is not enabled to speed up boot. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 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.13 src/distrib/utils/embedded/conf/arm64.conf:1.14 --- src/distrib/utils/embedded/conf/arm64.conf:1.13 Thu Jul 1 17:32:07 2021 +++ src/distrib/utils/embedded/conf/arm64.conf Sat Oct 16 14:05:48 2021 @@ -1,4 +1,4 @@ -# $NetBSD: arm64.conf,v 1.13 2021/07/01 17:32:07 jmcneill Exp $ +# $NetBSD: arm64.conf,v 1.14 2021/10/16 14:05:48 jmcneill Exp $ # ARM64 customization script used by mkimage # board=arm64 @@ -31,6 +31,8 @@ wscons=\$(dev_exists wsdisplay0) ec2_init=\$(dev_exists ena0) if checkyesno ec2_init ; then dhcpcd_flags="\$dhcpcd_flags -w" +else + dhcpcd_flags="\$dhcpcd_flags -b" fi EOF }
CVS commit: src/distrib/utils/embedded/conf
Module Name:src Committed By: jmcneill Date: Sat Oct 16 14:05:48 UTC 2021 Modified Files: src/distrib/utils/embedded/conf: arm64.conf Log Message: Background dhcpcd if ec2_init is not enabled to speed up boot. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 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.
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: 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.
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.
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: 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.
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: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.
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: 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.
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: 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.
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.
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.
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.
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.
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: 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.
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 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.
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: 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.
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.
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: 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.
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: 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.
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: 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.
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: 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.
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Wed Oct 30 21:43:42 UTC 2019
Modified Files:
src/distrib/utils/embedded/conf: armv7.conf
Log Message:
Move omap3 dtb files to /boot/dtb
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 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.38 src/distrib/utils/embedded/conf/armv7.conf:1.39
--- src/distrib/utils/embedded/conf/armv7.conf:1.38 Wed Oct 30 14:34:30 2019
+++ src/distrib/utils/embedded/conf/armv7.conf Wed Oct 30 21:43:42 2019
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.38 2019/10/30 14:34:30 martin Exp $
+# $NetBSD: armv7.conf,v 1.39 2019/10/30 21:43:42 jmcneill Exp $
# ARMv7 customization script used by mkimage
#
board=armv7
@@ -143,7 +143,7 @@ populate() {
for k in ${kernels}; do
tgt="$(basename ${k} | sed 's/\.gz$//')"
case "${tgt}" in
- sun*.dtb|am335x-*.dtb|meson8b-*.dtb|tegra*.dtb|vexpress*.dtb)
+ sun*.dtb|am335x-*.dtb|omap3-*.dtb|meson8b-*.dtb|tegra*.dtb|vexpress*.dtb)
pfx="dtb/";;
*)
pfx=;;
CVS commit: src/distrib/utils/embedded/conf
Module Name:src Committed By: jmcneill Date: Wed Oct 30 21:43:42 UTC 2019 Modified Files: src/distrib/utils/embedded/conf: armv7.conf Log Message: Move omap3 dtb files to /boot/dtb To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 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.
CVS commit: src/distrib/utils/embedded/conf
Module Name:src Committed By: martin Date: Wed Oct 30 14:34:30 UTC 2019 Modified Files: src/distrib/utils/embedded/conf: armv7.conf Log Message: Remove debug output, fix a progress message To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 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.
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: martin
Date: Wed Oct 30 14:34:30 UTC 2019
Modified Files:
src/distrib/utils/embedded/conf: armv7.conf
Log Message:
Remove debug output, fix a progress message
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 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.37 src/distrib/utils/embedded/conf/armv7.conf:1.38
--- src/distrib/utils/embedded/conf/armv7.conf:1.37 Wed Oct 30 12:28:32 2019
+++ src/distrib/utils/embedded/conf/armv7.conf Wed Oct 30 14:34:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.37 2019/10/30 12:28:32 martin Exp $
+# $NetBSD: armv7.conf,v 1.38 2019/10/30 14:34:30 martin Exp $
# ARMv7 customization script used by mkimage
#
board=armv7
@@ -148,7 +148,7 @@ populate() {
*)
pfx=;;
esac
- echo "${bar} installing ${k} to /boot/${tgt} (on ${mnt}, pfx=${pfx}) ${bar}"
+ echo "${bar} installing ${k} to /boot/${pfx}${tgt} ${bar}"
case "${k}" in
*.gz)
${GZIP_CMD} -dc "${k}" > "${mnt}/boot/${pfx}${tgt}"
CVS commit: src/distrib/utils/embedded/conf
Module Name:src Committed By: martin Date: Wed Oct 30 12:28:32 UTC 2019 Modified Files: src/distrib/utils/embedded/conf: armv7.conf Log Message: Move a lot of *.dtb files to a dtb/ subdirectory on the FAT partition. Mkimage (eroneously) creates a FAT16 partition (despite the configuration asking for FAT32), and that has a root directory size limit. Idea from Jared. To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 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.
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: martin
Date: Wed Oct 30 12:28:32 UTC 2019
Modified Files:
src/distrib/utils/embedded/conf: armv7.conf
Log Message:
Move a lot of *.dtb files to a dtb/ subdirectory on the FAT partition.
Mkimage (eroneously) creates a FAT16 partition (despite the configuration
asking for FAT32), and that has a root directory size limit.
Idea from Jared.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 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.36 src/distrib/utils/embedded/conf/armv7.conf:1.37
--- src/distrib/utils/embedded/conf/armv7.conf:1.36 Sun Oct 27 21:38:58 2019
+++ src/distrib/utils/embedded/conf/armv7.conf Wed Oct 30 12:28:32 2019
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.36 2019/10/27 21:38:58 jmcneill Exp $
+# $NetBSD: armv7.conf,v 1.37 2019/10/30 12:28:32 martin Exp $
# ARMv7 customization script used by mkimage
#
board=armv7
@@ -106,7 +106,7 @@ populate_amlogic() {
ODROIDC-UBOOT-CONFIG
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"
+setenv bootcmd "fatload mmc 0:1 0x2100 ${odroidc1_kernelimg}; fatload mmc 0:1 0x2000 dtb/meson8b-odroidc1.dtb; bootm 0x2100 - 0x2000"
run bootcmd
EOF
}
@@ -135,16 +135,26 @@ populate() {
done
done
+ # "kernels" includes some .dtb files that should go into a separate
+ # directory
+ mkdir -p "${mnt}/boot/dtb"
+
# install kernels to /boot partition
for k in ${kernels}; do
tgt="$(basename ${k} | sed 's/\.gz$//')"
- echo "${bar} installing ${k} to /boot/${tgt} ${bar}"
+ case "${tgt}" in
+ sun*.dtb|am335x-*.dtb|meson8b-*.dtb|tegra*.dtb|vexpress*.dtb)
+ pfx="dtb/";;
+ *)
+ pfx=;;
+ esac
+ echo "${bar} installing ${k} to /boot/${tgt} (on ${mnt}, pfx=${pfx}) ${bar}"
case "${k}" in
*.gz)
- ${GZIP_CMD} -dc "${k}" > "${mnt}/boot/${tgt}"
+ ${GZIP_CMD} -dc "${k}" > "${mnt}/boot/${pfx}${tgt}"
;;
*)
- cp "${k}" "${mnt}/boot/${tgt}"
+ cp "${k}" "${mnt}/boot/${pfx}${tgt}"
;;
esac ||
fail "Copy of ${k} to ${mnt}/boot/${tgt} failed"
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: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.
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: 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.
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: 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.
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: 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.
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: 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.
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: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.
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: 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.
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: 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.
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: 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.
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: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.
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 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.
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: 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.
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: 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.
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: 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.
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: 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.
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: 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.
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: 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.
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: 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.
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.
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: 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.
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: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.
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: 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.
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: 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.
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: 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.
