From: jsg <jsg@openbsd.org>
Date: Mon, 26 Jan 2015 01:55:55 +0000 (+0000)
Subject: Rename miniroot-sunxi to miniroot-cubie as the u-boot included
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=a272496f86baec171cad7a74e62933fc177d0ef1;p=openbsd

Rename miniroot-sunxi to miniroot-cubie as the u-boot included
in the image is for Cubieboard1.  Discussed with bmercer@
While here switch from using the separate spl and u-boot images
to the combined spl and u-boot 'u-boot-sunxi-with-spl.bin'.
---

diff --git a/distrib/armv7/miniroot/Makefile b/distrib/armv7/miniroot/Makefile
index 01ad1ee0df6..a27cf050f27 100644
--- a/distrib/armv7/miniroot/Makefile
+++ b/distrib/armv7/miniroot/Makefile
@@ -1,3 +1,3 @@
-SUBDIR= am335x beagle panda imx sunxi
+SUBDIR= am335x beagle panda imx cubie
 
 .include <bsd.subdir.mk>
diff --git a/distrib/armv7/miniroot/Makefile.inc b/distrib/armv7/miniroot/Makefile.inc
index 10dbc670fdb..af51d31de27 100644
--- a/distrib/armv7/miniroot/Makefile.inc
+++ b/distrib/armv7/miniroot/Makefile.inc
@@ -76,8 +76,8 @@ rd_teardown:
 	@df -i ${MOUNT_POINT}
 	-umount ${MOUNT_POINT}
 .if ${PLATFORM} == "SUNXI"
-	dd if=/usr/mdec/sunxi/sunxi-spl.bin of=${VND_CDEV} bs=1024 seek=8
-	dd if=/usr/mdec/sunxi/u-boot.bin of=${VND_CDEV} bs=1024 seek=32
+	dd if=/usr/mdec/${BOARD}/u-boot-sunxi-with-spl.bin \
+	    of=${VND_CDEV} bs=1024 seek=8
 .endif
 	-vnconfig -u ${VND}
 
diff --git a/distrib/armv7/miniroot/cubie/Makefile b/distrib/armv7/miniroot/cubie/Makefile
new file mode 100644
index 00000000000..5d95b9eaa6a
--- /dev/null
+++ b/distrib/armv7/miniroot/cubie/Makefile
@@ -0,0 +1,5 @@
+BOARD=	cubie
+PLATFORM=SUNXI
+LOADADDR=0x40200000
+
+.include "${.CURDIR}/../Makefile.inc"
diff --git a/distrib/armv7/miniroot/sunxi/Makefile b/distrib/armv7/miniroot/sunxi/Makefile
deleted file mode 100644
index d87fa21bd55..00000000000
--- a/distrib/armv7/miniroot/sunxi/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-BOARD=	sunxi
-PLATFORM=SUNXI
-LOADADDR=0x40200000
-
-.include "${.CURDIR}/../Makefile.inc"
diff --git a/distrib/armv7/ramdisk/install.md b/distrib/armv7/ramdisk/install.md
index b493d37d5ce..dfc893bd6db 100644
--- a/distrib/armv7/ramdisk/install.md
+++ b/distrib/armv7/ramdisk/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.5 2014/02/26 16:01:32 maja Exp $
+#	$OpenBSD: install.md,v 1.6 2015/01/26 01:55:55 jsg Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -111,7 +111,7 @@ bootargs=sd0i:/bsd
 mmcboot=mmc rescan ; fatload mmc 0 ${LOADADDR} bsd.umg && bootm ${LOADADDR};
 uenvcmd=run mmcboot;
 __EOT
-		cp /mnt/usr/mdec/sunxi/{sunxi-spl,u-boot}.bin /mnt/mnt/
+		cp /mnt/usr/mdec/cubie/u-boot-sunxi-with-spl.bin /mnt/mnt/
 	fi
 }
 
diff --git a/distrib/notes/armv7/contents b/distrib/notes/armv7/contents
index 425df0fbde8..a9a81e9304f 100644
--- a/distrib/notes/armv7/contents
+++ b/distrib/notes/armv7/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.5 2014/11/10 07:15:41 jsg Exp $
+dnl	$OpenBSD: contents,v 1.6 2015/01/26 01:55:55 jsg Exp $
 TopPart
 
 	miniroot-am335x-{:--:}OSrev.fs
@@ -17,9 +17,9 @@ TopPart
 			A miniroot filesystem to be used for
 			installation; PandaBoard (ES) version.
 
-	miniroot-sunxi-{:--:}OSrev.fs
+	miniroot-cubie-{:--:}OSrev.fs
 			A miniroot filesystem to be used for
-			installation; Allwinner A1X/A20 version.
+			installation; Cubieboard1 version.
 
 OpenBSDdistsets
 
diff --git a/distrib/notes/armv7/prep b/distrib/notes/armv7/prep
index 7dd5a7308e0..c1e65067a80 100644
--- a/distrib/notes/armv7/prep
+++ b/distrib/notes/armv7/prep
@@ -1,9 +1,9 @@
-dnl	$OpenBSD: prep,v 1.5 2014/11/14 06:12:36 jsg Exp $
+dnl	$OpenBSD: prep,v 1.6 2015/01/26 01:55:55 jsg Exp $
 Please be aware that OpenBSD support for this platform is far from
 complete.
 
 OpenBSD can be installed onto a disk by copying the miniroot for your
-board "miniroot-{am335x,beagle,imx,panda,sunxi}-{:--:}OSrev.fs"
+board "miniroot-{am335x,beagle,imx,panda,cubie}-{:--:}OSrev.fs"
 image to an SD card or by booting the ramdisk kernel over the network
 using a TFTP server.
 
diff --git a/etc/etc.armv7/Makefile.inc b/etc/etc.armv7/Makefile.inc
index 744f91da047..4f44675204b 100644
--- a/etc/etc.armv7/Makefile.inc
+++ b/etc/etc.armv7/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.5 2014/03/05 14:47:34 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.6 2015/01/26 01:55:55 jsg Exp $
 
 ALLSOC=IMX OMAP SUNXI
 KERNELS=
@@ -40,4 +40,4 @@ bootblocks:
 
 MDEXT+=	miniroot-am335x-${OSrev}.fs miniroot-beagle-${OSrev}.fs \
 	miniroot-imx-${OSrev}.fs miniroot-panda-${OSrev}.fs \
-	miniroot-sunxi-${OSrev}.fs
+	miniroot-cubie-${OSrev}.fs