Remove the "cubie" miniroot. There are far more popular armv7 boards

with Allwinner SoCs and the presence of this particular miniroot is making
it hard to update U-Boot.

ok jsg@

diff --git a/distrib/armv7/miniroot/Makefile b/distrib/armv7/miniroot/Makefile
index be9f361..cf5337e 100644 (file)
--- a/distrib/armv7/miniroot/Makefile
+++ b/distrib/armv7/miniroot/Makefile
@@ -1,3 +1,3 @@
-SUBDIR= am335x cubie cubox nitrogen panda wandboard
+SUBDIR= am335x cubox nitrogen panda wandboard
 
 .include <bsd.subdir.mk>

diff --git a/distrib/armv7/miniroot/Makefile.inc b/distrib/armv7/miniroot/Makefile.inc
index 0dc15a7..ad4a0d6 100644 (file)
--- a/distrib/armv7/miniroot/Makefile.inc
+++ b/distrib/armv7/miniroot/Makefile.inc
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile.inc,v 1.32 2023/09/25 16:42:19 sthen Exp $
+#      $OpenBSD: Makefile.inc,v 1.33 2024/04/09 11:13:51 kettenis Exp $
 
 FS=            miniroot-${BOARD}-${OSrev}.img
 FSSIZE=                71424   # ffs+msdos, actually
@@ -38,10 +38,6 @@ ${FS}: bsd.rd
        dd if=${PUBOOT}/${UBOOT}/u-boot.img of=/dev/r`cat vnd`c \
            bs=1024 seek=69 conv=sync
 .endif
-.if ${PLATFORM} == "SUNXI"
-       dd if=${PUBOOT}/${UBOOT}/u-boot-sunxi-with-spl.bin \
-           of=/dev/r`cat vnd`c bs=1024 seek=8 conv=sync
-.endif
 
        mkdir -p ${MOUNT_POINT}/efi/boot
        cp /usr/mdec/BOOTARM.EFI ${MOUNT_POINT}/efi/boot/bootarm.efi

diff --git a/distrib/armv7/miniroot/cubie/Makefile b/distrib/armv7/miniroot/cubie/Makefile
deleted file mode 100644 (file)
index 06014f0..0000000
--- a/distrib/armv7/miniroot/cubie/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-BOARD= cubie
-PLATFORM=SUNXI
-DTBDIR= allwinner/
-UBOOT= Cubieboard2
-DTBS=\
-       sun7i-a20-cubieboard2.dtb
-
-.include "${.CURDIR}/../Makefile.inc"

diff --git a/distrib/armv7/ramdisk/install.md b/distrib/armv7/ramdisk/install.md
index 812835b..079073d 100644 (file)
--- a/distrib/armv7/ramdisk/install.md
+++ b/distrib/armv7/ramdisk/install.md
@@ -1,4 +1,4 @@
-#      $OpenBSD: install.md,v 1.56 2023/04/20 19:42:52 kettenis Exp $
+#      $OpenBSD: install.md,v 1.57 2024/04/09 11:13:51 kettenis Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -39,7 +39,6 @@ md_installboot() {
        case $(sysctl -n hw.product) in
        *AM335x*)                       _plat=am335x;;
        *OMAP4*)                        _plat=panda;;
-       *'Cubietech Cubieboard2'*)      _plat=cubie;;
        *Cubox-i*|*HummingBoard*)       _plat=cubox;;
        *Wandboard*)                    _plat=wandboard;;
        *Nitrogen6*|*'SABRE Lite'*)     _plat=nitrogen;;
@@ -79,11 +78,6 @@ md_installboot() {
                mkuboot -t script -a arm -o linux /tmp/i/boot.cmd \
                    /mnt/mnt/6x_bootscript
                ;;
-       cubie)
-               cp $_mdec/*.dtb /mnt/mnt/
-               dd if=$_mdec/u-boot-sunxi-with-spl.bin of=/dev/${_disk}c \
-                   bs=1024 seek=8 status=none
-               ;;
        esac
 
        umount /mnt/mnt

diff --git a/distrib/armv7/ramdisk/list b/distrib/armv7/ramdisk/list
index 7e703d5..a0f50dd 100644 (file)
--- a/distrib/armv7/ramdisk/list
+++ b/distrib/armv7/ramdisk/list
@@ -1,4 +1,4 @@
-#      $OpenBSD: list,v 1.49 2023/09/25 16:42:19 sthen Exp $
+#      $OpenBSD: list,v 1.50 2024/04/09 11:13:51 kettenis Exp $
 
 SRCDIRS distrib/special
 
@@ -116,10 +116,6 @@ COPY       /usr/local/share/dtb/arm/ti/omap/am335x-evm.dtb         usr/mdec/am335x/am335x-evm
 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/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

diff --git a/distrib/notes/armv7/contents b/distrib/notes/armv7/contents
index 027cd12..5e49668 100644 (file)
--- a/distrib/notes/armv7/contents
+++ b/distrib/notes/armv7/contents
@@ -1,14 +1,10 @@
-dnl    $OpenBSD: contents,v 1.16 2023/03/16 18:04:08 miod Exp $
+dnl    $OpenBSD: contents,v 1.17 2024/04/09 11:13:51 kettenis Exp $
 TopPart
 
        miniroot-am335x-{:--:}OSrev.img
                        A miniroot filesystem to be used for
                        installation; BeagleBone version.
 
-       miniroot-cubie-{:--:}OSrev.img
-                       A miniroot filesystem to be used for
-                       installation; Cubieboard2 version.
-
        miniroot-cubox-{:--:}OSrev.img
                        A miniroot filesystem to be used for
                        installation; CuBox-i version.

diff --git a/etc/etc.armv7/Makefile.inc b/etc/etc.armv7/Makefile.inc
index f7d6128..dc67cba 100644 (file)
--- a/etc/etc.armv7/Makefile.inc
+++ b/etc/etc.armv7/Makefile.inc
@@ -1,10 +1,9 @@
-#      $OpenBSD: Makefile.inc,v 1.17 2020/05/17 17:04:29 deraadt Exp $
+#      $OpenBSD: Makefile.inc,v 1.18 2024/04/09 11:13:51 kettenis Exp $
 
 bootblocks:
        cp -p ${DESTDIR}/usr/mdec/BOOTARM.EFI ${RELEASEDIR}
 
 MDEXT= bsd.rd BOOTARM.EFI \
-       miniroot-am335x-${OSrev}.img \
-       miniroot-cubie-${OSrev}.img miniroot-cubox-${OSrev}.img \
+       miniroot-am335x-${OSrev}.img miniroot-cubox-${OSrev}.img \
        miniroot-nitrogen-${OSrev}.img miniroot-panda-${OSrev}.img \
        miniroot-wandboard-${OSrev}.img