summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsg <jsg@openbsd.org>2019-09-25 06:20:22 +0000
committerjsg <jsg@openbsd.org>2019-09-25 06:20:22 +0000
commitb7781c15f69a8496ce8fee0bed4df9ab7bf8c2a2 (patch)
tree4cb594fa21acd5f3028f41ad8a7154e0b8fb7b9f
parentUpdate acces point channel in node list when receiving packets from same (diff)
downloadwireguard-openbsd-b7781c15f69a8496ce8fee0bed4df9ab7bf8c2a2.tar.xz
wireguard-openbsd-b7781c15f69a8496ce8fee0bed4df9ab7bf8c2a2.zip
Change the offset filesystems start on disk for armv7 from 1MB to 16MB.
Matches arm64 and is required for rk3288 with TPL now U-Boot is expected to be found at sector 16384 (8MB). ok kettenis@ patrick@
-rw-r--r--distrib/armv7/miniroot/Makefile.inc6
-rw-r--r--distrib/armv7/ramdisk/install.md4
2 files changed, 5 insertions, 5 deletions
diff --git a/distrib/armv7/miniroot/Makefile.inc b/distrib/armv7/miniroot/Makefile.inc
index 9f1b86f52ba..7298f169186 100644
--- a/distrib/armv7/miniroot/Makefile.inc
+++ b/distrib/armv7/miniroot/Makefile.inc
@@ -1,13 +1,13 @@
-# $OpenBSD: Makefile.inc,v 1.23 2019/05/03 20:03:58 deraadt Exp $
+# $OpenBSD: Makefile.inc,v 1.24 2019/09/25 06:20:22 jsg Exp $
FS= miniroot-${BOARD}-${OSrev}.fs
-FSSIZE= 36864 # ffs+msdos, actually
+FSSIZE= 67584 # ffs+msdos, actually
MOUNT_POINT= /mnt
MKUBOOT?= mkuboot
DISKTYPE= miniroot
-MSDOSSTART= 2048
+MSDOSSTART= 32768
MSDOSSIZE= 4096
FFSSTART!= expr ${MSDOSSTART} + ${MSDOSSIZE}
diff --git a/distrib/armv7/ramdisk/install.md b/distrib/armv7/ramdisk/install.md
index f16cc60c7d3..7ed5b77d0f3 100644
--- a/distrib/armv7/ramdisk/install.md
+++ b/distrib/armv7/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.49 2018/03/23 05:02:27 deraadt Exp $
+# $OpenBSD: install.md,v 1.50 2019/09/25 06:20:23 jsg Exp $
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -88,7 +88,7 @@ md_prep_fdisk() {
local _disk=$1 _d
local bootparttype="C"
- local bootsectorstart="2048"
+ local bootsectorstart="32768"
local bootsectorsize="32768"
local bootsectorend=$(($bootsectorstart + $bootsectorsize))
local bootfstype="msdos"