From e90c2c36380d42556953d73b07e204656a60db73 Mon Sep 17 00:00:00 2001 From: Andrew Turner Date: Fri, 16 Feb 2018 16:22:54 +0000 Subject: [PATCH] Put the pine64 root filesystem on teh correct partition. The Pine64 root filesystem was incorrectly created directly on the MBR partition. This can cause the loader to get confused when loading the kernel from this filesystem. The loader will see this as a small partition meaning later checks to ensure it doesn't read past the end of the disk incorrectly report a failure. This seems to work mostly by accident with the released images as they are smaller than the reported size, however after growfs has run the image may no longer boot. Reviewed by: gjb, emaste, imp Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D14343 --- release/arm64/PINE64.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/arm64/PINE64.conf b/release/arm64/PINE64.conf index 5ed296b5904b..58124a21af60 100644 --- a/release/arm64/PINE64.conf +++ b/release/arm64/PINE64.conf @@ -11,7 +11,7 @@ FAT_SIZE="54m -b 1m" FAT_TYPE="16" IMAGE_SIZE="2560M" KERNEL="GENERIC" -MD_ARGS="-x 16384 -y 255" +MD_ARGS="-x 63 -y 255" NODOC=1 PART_SCHEME="MBR" export BOARDNAME="PINE64" @@ -25,7 +25,7 @@ arm_install_uboot() { of=/dev/${mddev} bs=1k seek=8 conv=sync chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} - chroot ${CHROOTDIR} mount /dev/${mddev}s2 ${UFSMOUNT} + chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} BOOTFILES="$(chroot ${CHROOTDIR} \ env TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \