summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsg <jsg@openbsd.org>2016-09-04 10:06:11 +0000
committerjsg <jsg@openbsd.org>2016-09-04 10:06:11 +0000
commit3c8cd7cc03f79614055af568189e6588f713bcc1 (patch)
tree0921e78a82ca52d0551c68e65aafd2cc9540953f
parentMove files created by root during install/upgrade in a subdir of (diff)
downloadwireguard-openbsd-3c8cd7cc03f79614055af568189e6588f713bcc1.tar.xz
wireguard-openbsd-3c8cd7cc03f79614055af568189e6588f713bcc1.zip
Switch the cubie miniroot from the Allwinner A10 based Cubieboard1
to the Allwinner A20 based Cubieboard2 now that problems with cortex A7 are fixed. There seems to be more people with the Cubieboard2 than the Cubieboard1.
-rw-r--r--distrib/armv7/miniroot/cubie/Makefile4
-rw-r--r--distrib/armv7/ramdisk/install.md4
-rw-r--r--distrib/armv7/ramdisk/list6
-rw-r--r--distrib/notes/armv7/contents4
4 files changed, 9 insertions, 9 deletions
diff --git a/distrib/armv7/miniroot/cubie/Makefile b/distrib/armv7/miniroot/cubie/Makefile
index 020bf563d73..ba0e9edd8aa 100644
--- a/distrib/armv7/miniroot/cubie/Makefile
+++ b/distrib/armv7/miniroot/cubie/Makefile
@@ -1,7 +1,7 @@
BOARD= cubie
PLATFORM=SUNXI
-UBOOT= Cubieboard
+UBOOT= Cubieboard2
DTBS=\
- sun4i-a10-cubieboard.dtb
+ sun7i-a20-cubieboard2.dtb
.include "${.CURDIR}/../Makefile.inc"
diff --git a/distrib/armv7/ramdisk/install.md b/distrib/armv7/ramdisk/install.md
index 094e4199659..0d498cebacd 100644
--- a/distrib/armv7/ramdisk/install.md
+++ b/distrib/armv7/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.41 2016/09/04 09:52:03 rpe Exp $
+# $OpenBSD: install.md,v 1.42 2016/09/04 10:06:11 jsg Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@ md_installboot() {
*AM335x*) _plat=am335x;;
*'OMAP3 BeagleBoard'*) _plat=beagle;;
*OMAP4*) _plat=panda;;
- *Cubieboard*) _plat=cubie;;
+ *'Cubietech Cubieboard2'*) _plat=cubie;;
*Cubox-i*|*HummingBoard*) _plat=cubox;;
*Wandboard*) _plat=wandboard;;
*Nitrogen6*|*'SABRE Lite'*) _plat=nitrogen;;
diff --git a/distrib/armv7/ramdisk/list b/distrib/armv7/ramdisk/list
index b74612bbd0c..c15547b4b7e 100644
--- a/distrib/armv7/ramdisk/list
+++ b/distrib/armv7/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.22 2016/09/04 09:54:22 rpe Exp $
+# $OpenBSD: list,v 1.23 2016/09/04 10:06:11 jsg Exp $
SRCDIRS distrib/special
@@ -129,8 +129,8 @@ COPY /usr/local/share/dtb/arm/omap3-beagle-xm-ab.dtb /usr/mdec/beagle/omap3-beag
COPY /usr/local/share/dtb/arm/omap3-beagle-xm.dtb /usr/mdec/beagle/omap3-beagle-xm.dtb
COPY /usr/local/share/dtb/arm/omap3-beagle.dtb /usr/mdec/beagle/omap3-beagle.dtb
-COPY /usr/local/share/u-boot/Cubieboard/u-boot-sunxi-with-spl.bin /usr/mdec/cubie/u-boot-sunxi-with-spl.bin
-COPY /usr/local/share/dtb/arm/sun4i-a10-cubieboard.dtb /usr/mdec/cubie/sun4i-a10-cubieboard.dtb
+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/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 c6bde07bc27..75bfa9c3738 100644
--- a/distrib/notes/armv7/contents
+++ b/distrib/notes/armv7/contents
@@ -1,4 +1,4 @@
-dnl $OpenBSD: contents,v 1.10 2015/12/30 23:48:59 rpe Exp $
+dnl $OpenBSD: contents,v 1.11 2016/09/04 10:06:11 jsg Exp $
TopPart
miniroot-am335x-{:--:}OSrev.fs
@@ -11,7 +11,7 @@ TopPart
miniroot-cubie-{:--:}OSrev.fs
A miniroot filesystem to be used for
- installation; Cubieboard1 version.
+ installation; Cubieboard2 version.
miniroot-cubox-{:--:}OSrev.fs
A miniroot filesystem to be used for