Fix location of DTB files after 6.12 DTS import and re-organisation.

skrll · skrll · commit fe6d88ad1ba3 · 2026-01-25T07:55:38.000Z
diff --git a/distrib/utils/embedded/conf/armv7.conf b/distrib/utils/embedded/conf/armv7.conf
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.47 2024/03/14 15:41:54 christos Exp $
+# $NetBSD: armv7.conf,v 1.48 2026/01/25 07:55:38 skrll Exp $
 # ARMv7 customization script used by mkimage
 #
 board=armv7
@@ -67,7 +67,7 @@ EOF
 		cat > ${mnt}/boot/config.txt << EOF
 #
 upstream_kernel=1
-os_prefix=dtb/
+os_prefix=dtb/broadcom/
 cmdline=../cmdline.txt
 kernel=/netbsd-GENERIC.img
 # Boot options, see https://www.raspberrypi.com/documentation/computers/config_txt.html#boot-options
diff --git a/distrib/utils/embedded/conf/rpi.conf b/distrib/utils/embedded/conf/rpi.conf
@@ -1,4 +1,4 @@
-# $NetBSD: rpi.conf,v 1.40 2022/11/19 09:19:27 yamt Exp $
+# $NetBSD: rpi.conf,v 1.41 2026/01/25 07:55:38 skrll Exp $
 # Raspberry Pi customization script used by mkimage
 #
 
@@ -57,7 +57,7 @@ EOF
 	cat > ${mnt}/boot/config.txt << EOF
 #
 upstream_kernel=1
-os_prefix=dtb/
+os_prefix=dtb/broadcom/
 cmdline=../cmdline.txt
 # UART settings, see https://www.raspberrypi.com/documentation/computers/configuration.html#configuring-uarts
 enable_uart=1
diff --git a/distrib/utils/embedded/conf/rpi_inst.conf b/distrib/utils/embedded/conf/rpi_inst.conf
@@ -1,4 +1,4 @@
-# $NetBSD: rpi_inst.conf,v 1.19 2022/11/19 09:19:27 yamt Exp $
+# $NetBSD: rpi_inst.conf,v 1.20 2026/01/25 07:55:38 skrll Exp $
 # Raspberry Pi customization script used by mkimage
 #
 
@@ -44,7 +44,7 @@ EOF
 	cat > ${mnt}/boot/config.txt << EOF
 #
 upstream_kernel=1
-os_prefix=dtb/
+os_prefix=dtb/broadcom/
 cmdline=../cmdline.txt
 kernel=/kernel.img
 # UART settings, https://www.raspberrypi.com/documentation/computers/configuration.html#configuring-uarts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# $NetBSD: armv7.conf,v 1.47 2024/03/14 15:41:54 christos Exp $`
	`1`	`+# $NetBSD: armv7.conf,v 1.48 2026/01/25 07:55:38 skrll Exp $`
`2`	`2`	`# ARMv7 customization script used by mkimage`
`3`	`3`	`#`
`4`	`4`	`board=armv7`
`@@ -67,7 +67,7 @@ EOF`
`67`	`67`	`cat > ${mnt}/boot/config.txt << EOF`
`68`	`68`	`#`
`69`	`69`	`upstream_kernel=1`
`70`		`-os_prefix=dtb/`
	`70`	`+os_prefix=dtb/broadcom/`
`71`	`71`	`cmdline=../cmdline.txt`
`72`	`72`	`kernel=/netbsd-GENERIC.img`
`73`	`73`	`# Boot options, see https://www.raspberrypi.com/documentation/computers/config_txt.html#boot-options`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# $NetBSD: rpi.conf,v 1.40 2022/11/19 09:19:27 yamt Exp $`
	`1`	`+# $NetBSD: rpi.conf,v 1.41 2026/01/25 07:55:38 skrll Exp $`
`2`	`2`	`# Raspberry Pi customization script used by mkimage`
`3`	`3`	`#`
`4`	`4`
`@@ -57,7 +57,7 @@ EOF`
`57`	`57`	`cat > ${mnt}/boot/config.txt << EOF`
`58`	`58`	`#`
`59`	`59`	`upstream_kernel=1`
`60`		`-os_prefix=dtb/`
	`60`	`+os_prefix=dtb/broadcom/`
`61`	`61`	`cmdline=../cmdline.txt`
`62`	`62`	`# UART settings, see https://www.raspberrypi.com/documentation/computers/configuration.html#configuring-uarts`
`63`	`63`	`enable_uart=1`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# $NetBSD: rpi_inst.conf,v 1.19 2022/11/19 09:19:27 yamt Exp $`
	`1`	`+# $NetBSD: rpi_inst.conf,v 1.20 2026/01/25 07:55:38 skrll Exp $`
`2`	`2`	`# Raspberry Pi customization script used by mkimage`
`3`	`3`	`#`
`4`	`4`
`@@ -44,7 +44,7 @@ EOF`
`44`	`44`	`cat > ${mnt}/boot/config.txt << EOF`
`45`	`45`	`#`
`46`	`46`	`upstream_kernel=1`
`47`		`-os_prefix=dtb/`
	`47`	`+os_prefix=dtb/broadcom/`
`48`	`48`	`cmdline=../cmdline.txt`
`49`	`49`	`kernel=/kernel.img`
`50`	`50`	`# UART settings, https://www.raspberrypi.com/documentation/computers/configuration.html#configuring-uarts`