summaryrefslogtreecommitdiff
path: root/distrib/arm64
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2019-06-23 14:34:10 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2019-06-23 14:34:10 +0000
commit195ca059741a78a7c9fde668fd12da1c7ebe9e8f (patch)
tree1e0d58361d7efc98872557092409aa4c1d7d882d /distrib/arm64
parentae7cad33495c99a6d11a82c999947dc9e3df78f7 (diff)
Create space for the bootloader/firmware for Rockchip SoCs by leaving
more empty space before the MS-DOS and OpenBSD partitions. Also make sure we don't overwrite the firmware with the Pine64 on anything but the Pine64 and Pine64+. With help from jsg@ ok deraadt@, jsg@, patrick@
Diffstat (limited to 'distrib/arm64')
-rw-r--r--distrib/arm64/ramdisk/Makefile6
-rw-r--r--distrib/arm64/ramdisk/install.md6
2 files changed, 6 insertions, 6 deletions
diff --git a/distrib/arm64/ramdisk/Makefile b/distrib/arm64/ramdisk/Makefile
index b069a36fb0d..674337e99d2 100644
--- a/distrib/arm64/ramdisk/Makefile
+++ b/distrib/arm64/ramdisk/Makefile
@@ -1,13 +1,13 @@
-# $OpenBSD: Makefile,v 1.14 2019/05/03 20:03:58 deraadt Exp $
+# $OpenBSD: Makefile,v 1.15 2019/06/23 14:34:09 kettenis Exp $
FS= miniroot${OSrev}.fs
-FSSIZE= 43008
+FSSIZE= 67584
FSDISKTYPE= miniroot
MOUNT_POINT= /mnt
MTREE= ${UTILS}/mtree.conf
RAMDISK= RAMDISK
-MSDOSSTART= 8192
+MSDOSSTART= 32768
MSDOSSIZE= 8192
FFSSTART!= expr ${MSDOSSTART} + ${MSDOSSIZE}
diff --git a/distrib/arm64/ramdisk/install.md b/distrib/arm64/ramdisk/install.md
index ac69b80e5c8..9a341e42d14 100644
--- a/distrib/arm64/ramdisk/install.md
+++ b/distrib/arm64/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.11 2018/10/12 18:37:22 kettenis Exp $
+# $OpenBSD: install.md,v 1.12 2019/06/23 14:34:09 kettenis Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@ md_installboot() {
local _disk=/dev/$1 _mdec _plat
case $(sysctl -n hw.product) in
- *Pine64*) _plat=pine64;;
+ Pine64*(+)) _plat=pine64;;
*'Raspberry Pi'*) _plat=rpi;;
esac
@@ -74,7 +74,7 @@ md_prep_fdisk() {
local _disk=$1 _d
local bootparttype="C"
- local bootsectorstart="8192"
+ local bootsectorstart="32768"
local bootsectorsize="32768"
local bootsectorend=$(($bootsectorstart + $bootsectorsize))
local bootfstype="msdos"