From owner-svn-src-head@freebsd.org Fri Feb 16 16:22:55 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A1F89F2228D; Fri, 16 Feb 2018 16:22:55 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5195F83BB8; Fri, 16 Feb 2018 16:22:55 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4C27A1013C; Fri, 16 Feb 2018 16:22:55 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1GGMthj086460; Fri, 16 Feb 2018 16:22:55 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1GGMtEj086459; Fri, 16 Feb 2018 16:22:55 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201802161622.w1GGMtEj086459@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Fri, 16 Feb 2018 16:22:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r329382 - head/release/arm64 X-SVN-Group: head X-SVN-Commit-Author: andrew X-SVN-Commit-Paths: head/release/arm64 X-SVN-Commit-Revision: 329382 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Feb 2018 16:22:55 -0000 Author: andrew Date: Fri Feb 16 16:22:54 2018 New Revision: 329382 URL: https://svnweb.freebsd.org/changeset/base/329382 Log: 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 Modified: head/release/arm64/PINE64.conf Modified: head/release/arm64/PINE64.conf ============================================================================== --- head/release/arm64/PINE64.conf Fri Feb 16 16:16:33 2018 (r329381) +++ head/release/arm64/PINE64.conf Fri Feb 16 16:22:54 2018 (r329382) @@ -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} \