adapt to new dir layout in dtb packages; ok deraadt

diff --git a/distrib/armv7/miniroot/Makefile.inc b/distrib/armv7/miniroot/Makefile.inc
index 753c7c8..0dc15a7 100644 (file)
--- a/distrib/armv7/miniroot/Makefile.inc
+++ b/distrib/armv7/miniroot/Makefile.inc
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile.inc,v 1.31 2023/04/24 15:31:14 krw Exp $
+#      $OpenBSD: Makefile.inc,v 1.32 2023/09/25 16:42:19 sthen Exp $
 
 FS=            miniroot-${BOARD}-${OSrev}.img
 FSSIZE=                71424   # ffs+msdos, actually
@@ -24,7 +24,7 @@ ${FS}: bsd.rd
        mount -o-l /dev/`cat vnd`i ${MOUNT_POINT}
 
 .for DTB in ${DTBS}
-       cp ${PDTB}/${DTB} ${MOUNT_POINT}/
+       cp ${PDTB}/${DTBDIR}${DTB} ${MOUNT_POINT}/
 .endfor
 .if ${PLATFORM} == "OMAP"
        cp ${PUBOOT}/${UBOOT}/{MLO,u-boot.img} ${MOUNT_POINT}/

diff --git a/distrib/armv7/miniroot/am335x/Makefile b/distrib/armv7/miniroot/am335x/Makefile
index ddafff5..7722e69 100644 (file)
--- a/distrib/armv7/miniroot/am335x/Makefile
+++ b/distrib/armv7/miniroot/am335x/Makefile
@@ -1,5 +1,6 @@
 BOARD= am335x
 PLATFORM=OMAP
+DTBDIR= ti/omap/
 UBOOT= am335x_evm
 DTBS=\
        am335x-bone.dtb \

diff --git a/distrib/armv7/miniroot/cubie/Makefile b/distrib/armv7/miniroot/cubie/Makefile
index ba0e9ed..06014f0 100644 (file)
--- a/distrib/armv7/miniroot/cubie/Makefile
+++ b/distrib/armv7/miniroot/cubie/Makefile
@@ -1,5 +1,6 @@
 BOARD= cubie
 PLATFORM=SUNXI
+DTBDIR= allwinner/
 UBOOT= Cubieboard2
 DTBS=\
        sun7i-a20-cubieboard2.dtb

diff --git a/distrib/armv7/miniroot/cubox/Makefile b/distrib/armv7/miniroot/cubox/Makefile
index 8160b42..a5e6486 100644 (file)
--- a/distrib/armv7/miniroot/cubox/Makefile
+++ b/distrib/armv7/miniroot/cubox/Makefile
@@ -1,5 +1,6 @@
 BOARD= cubox
 PLATFORM=IMX
+DTBDIR= nxp/imx/
 UBOOT= mx6cuboxi
 DTBS=\
        imx6dl-cubox-i.dtb \

diff --git a/distrib/armv7/miniroot/nitrogen/Makefile b/distrib/armv7/miniroot/nitrogen/Makefile
index 292ed42..a6f4a5a 100644 (file)
--- a/distrib/armv7/miniroot/nitrogen/Makefile
+++ b/distrib/armv7/miniroot/nitrogen/Makefile
@@ -1,5 +1,6 @@
 BOARD= nitrogen
 PLATFORM=IMX
+DTBDIR= nxp/imx/
 UBOOT= nitrogen6q
 DTBS=\
        imx6dl-nitrogen6x.dtb \

diff --git a/distrib/armv7/miniroot/panda/Makefile b/distrib/armv7/miniroot/panda/Makefile
index adca657..941c63a 100644 (file)
--- a/distrib/armv7/miniroot/panda/Makefile
+++ b/distrib/armv7/miniroot/panda/Makefile
@@ -1,5 +1,6 @@
 BOARD= panda
 PLATFORM=OMAP
+DTBDIR= ti/omap/
 UBOOT= omap4_panda
 DTBS=\
        omap4-duovero-parlor.dtb \

diff --git a/distrib/armv7/miniroot/wandboard/Makefile b/distrib/armv7/miniroot/wandboard/Makefile
index 4cc23e2..a7b61f2 100644 (file)
--- a/distrib/armv7/miniroot/wandboard/Makefile
+++ b/distrib/armv7/miniroot/wandboard/Makefile
@@ -1,5 +1,6 @@
 BOARD= wandboard
 PLATFORM=IMX
+DTBDIR= nxp/imx/
 UBOOT= wandboard
 DTBS=\
        imx6dl-wandboard.dtb \

diff --git a/distrib/armv7/ramdisk/list b/distrib/armv7/ramdisk/list
index ad58619..7e703d5 100644 (file)
--- a/distrib/armv7/ramdisk/list
+++ b/distrib/armv7/ramdisk/list
@@ -1,4 +1,4 @@
-#      $OpenBSD: list,v 1.48 2023/04/28 01:24:14 kevlo Exp $
+#      $OpenBSD: list,v 1.49 2023/09/25 16:42:19 sthen Exp $
 
 SRCDIRS distrib/special
 
@@ -105,69 +105,69 @@ COPY    ${DESTDIR}/etc/firmware/urtwn-rtl8192eu   etc/firmware/urtwn-rtl8192eu
 MKDIR                                          usr/mdec/am335x
 COPY   /usr/local/share/u-boot/am335x_evm/MLO  usr/mdec/am335x/MLO
 COPY   /usr/local/share/u-boot/am335x_evm/u-boot.img   usr/mdec/am335x/u-boot.img
-COPY   /usr/local/share/dtb/arm/am335x-bone.dtb        usr/mdec/am335x/am335x-bone.dtb
-COPY   /usr/local/share/dtb/arm/am335x-boneblack.dtb   usr/mdec/am335x/am335x-boneblack.dtb
-COPY   /usr/local/share/dtb/arm/am335x-pocketbeagle.dtb        usr/mdec/am335x/am335x-pocketbeagle.dtb
-COPY   /usr/local/share/dtb/arm/am335x-boneblack-wireless.dtb  usr/mdec/am335x/am335x-boneblack-wireless.dtb
-COPY   /usr/local/share/dtb/arm/am335x-boneblue.dtb    usr/mdec/am335x/am335x-boneblue.dtb
-COPY   /usr/local/share/dtb/arm/am335x-bonegreen.dtb   usr/mdec/am335x/am335x-bonegreen.dtb
-COPY   /usr/local/share/dtb/arm/am335x-bonegreen-wireless.dtb  usr/mdec/am335x/am335x-bonegreen-wireless.dtb
-COPY   /usr/local/share/dtb/arm/am335x-evm.dtb         usr/mdec/am335x/am335x-evm.dtb
-COPY   /usr/local/share/dtb/arm/am335x-evmsk.dtb       usr/mdec/am335x/am335x-evmsk.dtb
-COPY   /usr/local/share/dtb/arm/am335x-icev2.dtb       usr/mdec/am335x/am335x-icev2.dtb
+COPY   /usr/local/share/dtb/arm/ti/omap/am335x-bone.dtb        usr/mdec/am335x/am335x-bone.dtb
+COPY   /usr/local/share/dtb/arm/ti/omap/am335x-boneblack.dtb   usr/mdec/am335x/am335x-boneblack.dtb
+COPY   /usr/local/share/dtb/arm/ti/omap/am335x-pocketbeagle.dtb        usr/mdec/am335x/am335x-pocketbeagle.dtb
+COPY   /usr/local/share/dtb/arm/ti/omap/am335x-boneblack-wireless.dtb  usr/mdec/am335x/am335x-boneblack-wireless.dtb
+COPY   /usr/local/share/dtb/arm/ti/omap/am335x-boneblue.dtb    usr/mdec/am335x/am335x-boneblue.dtb
+COPY   /usr/local/share/dtb/arm/ti/omap/am335x-bonegreen.dtb   usr/mdec/am335x/am335x-bonegreen.dtb
+COPY   /usr/local/share/dtb/arm/ti/omap/am335x-bonegreen-wireless.dtb  usr/mdec/am335x/am335x-bonegreen-wireless.dtb
+COPY   /usr/local/share/dtb/arm/ti/omap/am335x-evm.dtb         usr/mdec/am335x/am335x-evm.dtb
+COPY   /usr/local/share/dtb/arm/ti/omap/am335x-evmsk.dtb       usr/mdec/am335x/am335x-evmsk.dtb
+COPY   /usr/local/share/dtb/arm/ti/omap/am335x-icev2.dtb       usr/mdec/am335x/am335x-icev2.dtb
 
 MKDIR                                                  usr/mdec/cubie
 COPY   /usr/local/share/u-boot/Cubieboard2/u-boot-sunxi-with-spl.bin   usr/mdec/cubie/u-boot-sunxi-with-spl.bin
-COPY   /usr/local/share/dtb/arm/sun7i-a20-cubieboard2.dtb      usr/mdec/cubie/sun7i-a20-cubieboard2.dtb
+COPY   /usr/local/share/dtb/arm/allwinner/sun7i-a20-cubieboard2.dtb    usr/mdec/cubie/sun7i-a20-cubieboard2.dtb
 
 MKDIR                                                  usr/mdec/panda
 COPY   /usr/local/share/u-boot/omap4_panda/MLO         usr/mdec/panda/MLO
 COPY   /usr/local/share/u-boot/omap4_panda/u-boot.img  usr/mdec/panda/u-boot.img
-COPY   /usr/local/share/dtb/arm/omap4-duovero-parlor.dtb       usr/mdec/panda/omap4-duovero-parlor.dtb
-COPY   /usr/local/share/dtb/arm/omap4-panda-a4.dtb     usr/mdec/panda/omap4-panda-a4.dtb
-COPY   /usr/local/share/dtb/arm/omap4-panda-es.dtb     usr/mdec/panda/omap4-panda-es.dtb
-COPY   /usr/local/share/dtb/arm/omap4-panda.dtb        usr/mdec/panda/omap4-panda.dtb
-COPY   /usr/local/share/dtb/arm/omap4-sdp.dtb          usr/mdec/panda/omap4-sdp.dtb
+COPY   /usr/local/share/dtb/arm/ti/omap/omap4-duovero-parlor.dtb       usr/mdec/panda/omap4-duovero-parlor.dtb
+COPY   /usr/local/share/dtb/arm/ti/omap/omap4-panda-a4.dtb     usr/mdec/panda/omap4-panda-a4.dtb
+COPY   /usr/local/share/dtb/arm/ti/omap/omap4-panda-es.dtb     usr/mdec/panda/omap4-panda-es.dtb
+COPY   /usr/local/share/dtb/arm/ti/omap/omap4-panda.dtb        usr/mdec/panda/omap4-panda.dtb
+COPY   /usr/local/share/dtb/arm/ti/omap/omap4-sdp.dtb          usr/mdec/panda/omap4-sdp.dtb
 
 MKDIR                                                  usr/mdec/cubox
 COPY   /usr/local/share/u-boot/mx6cuboxi/SPL           usr/mdec/cubox/SPL
 COPY   /usr/local/share/u-boot/mx6cuboxi/u-boot.img    usr/mdec/cubox/u-boot.img
-COPY   /usr/local/share/dtb/arm/imx6dl-cubox-i.dtb     usr/mdec/cubox/imx6dl-cubox-i.dtb
-COPY   /usr/local/share/dtb/arm/imx6dl-cubox-i-emmc-som-v15.dtb        usr/mdec/cubox/imx6dl-cubox-i-emmc-som-v15.dtb
-COPY   /usr/local/share/dtb/arm/imx6dl-cubox-i-som-v15.dtb     usr/mdec/cubox/imx6dl-cubox-i-som-v15.dtb
-COPY   /usr/local/share/dtb/arm/imx6dl-hummingboard.dtb        usr/mdec/cubox/imx6dl-hummingboard.dtb
-COPY   /usr/local/share/dtb/arm/imx6dl-hummingboard-emmc-som-v15.dtb   usr/mdec/cubox/imx6dl-hummingboard-emmc-som-v15.dtb
-COPY   /usr/local/share/dtb/arm/imx6dl-hummingboard-som-v15.dtb        usr/mdec/cubox/imx6dl-hummingboard-som-v15.dtb
-COPY   /usr/local/share/dtb/arm/imx6dl-hummingboard2.dtb       usr/mdec/cubox/imx6dl-hummingboard2.dtb
-COPY   /usr/local/share/dtb/arm/imx6dl-hummingboard2-emmc-som-v15.dtb  usr/mdec/cubox/imx6dl-hummingboard2-emmc-som-v15.dtb
-COPY   /usr/local/share/dtb/arm/imx6dl-hummingboard2-som-v15.dtb       usr/mdec/cubox/imx6dl-hummingboard2-som-v15.dtb
-COPY   /usr/local/share/dtb/arm/imx6q-cubox-i.dtb      usr/mdec/cubox/imx6q-cubox-i.dtb
-COPY   /usr/local/share/dtb/arm/imx6q-cubox-i-emmc-som-v15.dtb usr/mdec/cubox/imx6q-cubox-i-emmc-som-v15.dtb
-COPY   /usr/local/share/dtb/arm/imx6q-cubox-i-som-v15.dtb      usr/mdec/cubox/imx6q-cubox-i-som-v15.dtb
-COPY   /usr/local/share/dtb/arm/imx6q-hummingboard.dtb usr/mdec/cubox/imx6q-hummingboard.dtb
-COPY   /usr/local/share/dtb/arm/imx6q-hummingboard-emmc-som-v15.dtb    usr/mdec/cubox/imx6q-hummingboard-emmc-som-v15.dtb
-COPY   /usr/local/share/dtb/arm/imx6q-hummingboard-som-v15.dtb usr/mdec/cubox/imx6q-hummingboard-som-v15.dtb
-COPY   /usr/local/share/dtb/arm/imx6q-hummingboard2.dtb        usr/mdec/cubox/imx6q-hummingboard2.dtb
-COPY   /usr/local/share/dtb/arm/imx6q-hummingboard2-emmc-som-v15.dtb   usr/mdec/cubox/imx6q-hummingboard2-emmc-som-v15.dtb
-COPY   /usr/local/share/dtb/arm/imx6q-hummingboard2-som-v15.dtb        usr/mdec/cubox/imx6q-hummingboard2-som-v15.dtb
+COPY   /usr/local/share/dtb/arm/nxp/imx/imx6dl-cubox-i.dtb     usr/mdec/cubox/imx6dl-cubox-i.dtb
+COPY   /usr/local/share/dtb/arm/nxp/imx/imx6dl-cubox-i-emmc-som-v15.dtb        usr/mdec/cubox/imx6dl-cubox-i-emmc-som-v15.dtb
+COPY   /usr/local/share/dtb/arm/nxp/imx/imx6dl-cubox-i-som-v15.dtb     usr/mdec/cubox/imx6dl-cubox-i-som-v15.dtb
+COPY   /usr/local/share/dtb/arm/nxp/imx/imx6dl-hummingboard.dtb        usr/mdec/cubox/imx6dl-hummingboard.dtb
+COPY   /usr/local/share/dtb/arm/nxp/imx/imx6dl-hummingboard-emmc-som-v15.dtb   usr/mdec/cubox/imx6dl-hummingboard-emmc-som-v15.dtb
+COPY   /usr/local/share/dtb/arm/nxp/imx/imx6dl-hummingboard-som-v15.dtb        usr/mdec/cubox/imx6dl-hummingboard-som-v15.dtb
+COPY   /usr/local/share/dtb/arm/nxp/imx/imx6dl-hummingboard2.dtb       usr/mdec/cubox/imx6dl-hummingboard2.dtb
+COPY   /usr/local/share/dtb/arm/nxp/imx/imx6dl-hummingboard2-emmc-som-v15.dtb  usr/mdec/cubox/imx6dl-hummingboard2-emmc-som-v15.dtb
+COPY   /usr/local/share/dtb/arm/nxp/imx/imx6dl-hummingboard2-som-v15.dtb       usr/mdec/cubox/imx6dl-hummingboard2-som-v15.dtb
+COPY   /usr/local/share/dtb/arm/nxp/imx/imx6q-cubox-i.dtb      usr/mdec/cubox/imx6q-cubox-i.dtb
+COPY   /usr/local/share/dtb/arm/nxp/imx/imx6q-cubox-i-emmc-som-v15.dtb usr/mdec/cubox/imx6q-cubox-i-emmc-som-v15.dtb
+COPY   /usr/local/share/dtb/arm/nxp/imx/imx6q-cubox-i-som-v15.dtb      usr/mdec/cubox/imx6q-cubox-i-som-v15.dtb
+COPY   /usr/local/share/dtb/arm/nxp/imx/imx6q-hummingboard.dtb usr/mdec/cubox/imx6q-hummingboard.dtb
+COPY   /usr/local/share/dtb/arm/nxp/imx/imx6q-hummingboard-emmc-som-v15.dtb    usr/mdec/cubox/imx6q-hummingboard-emmc-som-v15.dtb
+COPY   /usr/local/share/dtb/arm/nxp/imx/imx6q-hummingboard-som-v15.dtb usr/mdec/cubox/imx6q-hummingboard-som-v15.dtb
+COPY   /usr/local/share/dtb/arm/nxp/imx/imx6q-hummingboard2.dtb        usr/mdec/cubox/imx6q-hummingboard2.dtb
+COPY   /usr/local/share/dtb/arm/nxp/imx/imx6q-hummingboard2-emmc-som-v15.dtb   usr/mdec/cubox/imx6q-hummingboard2-emmc-som-v15.dtb
+COPY   /usr/local/share/dtb/arm/nxp/imx/imx6q-hummingboard2-som-v15.dtb        usr/mdec/cubox/imx6q-hummingboard2-som-v15.dtb
 
 MKDIR                                                  usr/mdec/nitrogen
-COPY   /usr/local/share/dtb/arm/imx6dl-nitrogen6x.dtb  usr/mdec/nitrogen/imx6dl-nitrogen6x.dtb
-COPY   /usr/local/share/dtb/arm/imx6dl-sabrelite.dtb   usr/mdec/nitrogen/imx6dl-sabrelite.dtb
-COPY   /usr/local/share/dtb/arm/imx6q-nitrogen6_max.dtb        usr/mdec/nitrogen/imx6q-nitrogen6_max.dtb
-COPY   /usr/local/share/dtb/arm/imx6q-nitrogen6x.dtb   usr/mdec/nitrogen/imx6q-nitrogen6x.dtb
-COPY   /usr/local/share/dtb/arm/imx6q-sabrelite.dtb    usr/mdec/nitrogen/imx6q-sabrelite.dtb
+COPY   /usr/local/share/dtb/arm/nxp/imx/imx6dl-nitrogen6x.dtb  usr/mdec/nitrogen/imx6dl-nitrogen6x.dtb
+COPY   /usr/local/share/dtb/arm/nxp/imx/imx6dl-sabrelite.dtb   usr/mdec/nitrogen/imx6dl-sabrelite.dtb
+COPY   /usr/local/share/dtb/arm/nxp/imx/imx6q-nitrogen6_max.dtb        usr/mdec/nitrogen/imx6q-nitrogen6_max.dtb
+COPY   /usr/local/share/dtb/arm/nxp/imx/imx6q-nitrogen6x.dtb   usr/mdec/nitrogen/imx6q-nitrogen6x.dtb
+COPY   /usr/local/share/dtb/arm/nxp/imx/imx6q-sabrelite.dtb    usr/mdec/nitrogen/imx6q-sabrelite.dtb
 
 MKDIR                                                  usr/mdec/wandboard
 COPY   /usr/local/share/u-boot/wandboard/SPL           usr/mdec/wandboard/SPL
 COPY   /usr/local/share/u-boot/wandboard/u-boot.img    usr/mdec/wandboard/u-boot.img
-COPY   /usr/local/share/dtb/arm/imx6dl-wandboard.dtb   usr/mdec/wandboard/imx6dl-wandboard.dtb
-COPY   /usr/local/share/dtb/arm/imx6dl-wandboard-revb1.dtb     usr/mdec/wandboard/imx6dl-wandboard-revb1.dtb
-COPY   /usr/local/share/dtb/arm/imx6dl-wandboard-revd1.dtb     usr/mdec/wandboard/imx6dl-wandboard-revd1.dtb
-COPY   /usr/local/share/dtb/arm/imx6q-wandboard.dtb    usr/mdec/wandboard/imx6q-wandboard.dtb
-COPY   /usr/local/share/dtb/arm/imx6q-wandboard-revb1.dtb      usr/mdec/wandboard/imx6q-wandboard-revb1.dtb
-COPY   /usr/local/share/dtb/arm/imx6q-wandboard-revd1.dtb      usr/mdec/wandboard/imx6q-wandboard-revd1.dtb
-COPY   /usr/local/share/dtb/arm/imx6qp-wandboard-revd1.dtb     usr/mdec/wandboard/imx6qp-wandboard-revd1.dtb
+COPY   /usr/local/share/dtb/arm/nxp/imx/imx6dl-wandboard.dtb   usr/mdec/wandboard/imx6dl-wandboard.dtb
+COPY   /usr/local/share/dtb/arm/nxp/imx/imx6dl-wandboard-revb1.dtb     usr/mdec/wandboard/imx6dl-wandboard-revb1.dtb
+COPY   /usr/local/share/dtb/arm/nxp/imx/imx6dl-wandboard-revd1.dtb     usr/mdec/wandboard/imx6dl-wandboard-revd1.dtb
+COPY   /usr/local/share/dtb/arm/nxp/imx/imx6q-wandboard.dtb    usr/mdec/wandboard/imx6q-wandboard.dtb
+COPY   /usr/local/share/dtb/arm/nxp/imx/imx6q-wandboard-revb1.dtb      usr/mdec/wandboard/imx6q-wandboard-revb1.dtb
+COPY   /usr/local/share/dtb/arm/nxp/imx/imx6q-wandboard-revd1.dtb      usr/mdec/wandboard/imx6q-wandboard-revd1.dtb
+COPY   /usr/local/share/dtb/arm/nxp/imx/imx6qp-wandboard-revd1.dtb     usr/mdec/wandboard/imx6qp-wandboard-revd1.dtb
 
 # copy the MAKEDEV script and make some devices
 SCRIPT ${DESTDIR}/dev/MAKEDEV                  dev/MAKEDEV