From owner-svn-src-head@freebsd.org Tue Jul 31 19:51:33 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 B16D810633A4; Tue, 31 Jul 2018 19:51:33 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mail.blih.net (mail.blih.net [212.83.177.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.blih.net", Issuer "mail.blih.net" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 0BDC07A212; Tue, 31 Jul 2018 19:51:32 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mail.blih.net (mail.blih.net [212.83.177.182]) by mail.blih.net (OpenSMTPD) with ESMTP id df6b5b98; Tue, 31 Jul 2018 21:51:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=bidouilliste.com; h=date :from:to:subject:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=mail; bh=nzcYLA3toM+3 VeZsSIgue4R6my8=; b=aJBXuH1YRplbcvZ8CVMKTZLTte+g7KjamPJAk+zukE9S ZNrsQLtMfBAZpWEIXA4zSePH3c4p5VJoyeYZL1AhE2QlTA+D5Vy8PyJON0bJCoMi 55kYgQ5F79KvzQn3UGTuBHK0rLeZZDQ1Vc+5tuGYCt45NHkRS25dlpBxWLAAEro= DomainKey-Signature: a=rsa-sha1; c=nofws; d=bidouilliste.com; h=date :from:to:subject:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; q=dns; s=mail; b=ae6j7d BF+FOmy7hQ5S1YakvMw5XCFK2VhPmCBoJkNjmq4vZ2gda2Jzl5/lL702k2OCFHOQ Js7spAuZ3q8xmLqRQjlh99Waqmz4H2uKtQayZlYFxffhMVEjvayx21JKdNvalvFJ gvkcQv6qyinEMtK9aMaa/v6s8vzk1BN2jSmyA= Received: from skull.home.blih.net (ip-9.net-89-3-105.rev.numericable.fr [89.3.105.9]) by mail.blih.net (OpenSMTPD) with ESMTPSA id bcd7e18a TLS version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO; Tue, 31 Jul 2018 21:51:31 +0200 (CEST) Date: Tue, 31 Jul 2018 21:51:31 +0200 From: Emmanuel Vadot To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r336998 - head/release/arm Message-Id: <20180731215131.ae657005f34a4bbb80ed39ce@bidouilliste.com> In-Reply-To: <201807311912.w6VJCVuL081184@repo.freebsd.org> References: <201807311912.w6VJCVuL081184@repo.freebsd.org> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.32; amd64-portbld-freebsd12.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 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: Tue, 31 Jul 2018 19:51:33 -0000 On Tue, 31 Jul 2018 19:12:31 +0000 (UTC) Emmanuel Vadot wrote: > Author: manu > Date: Tue Jul 31 19:12:31 2018 > New Revision: 336998 > URL: https://svnweb.freebsd.org/changeset/base/336998 > > Log: > release: arm: Always boot armv6/v7 image with EFI > > boot.scr is a u-boot script that loads and execute ubldr.bin > If not present u-boot will automatically boot loader.efi which > is already installed. > > This means that all armv6/armv7 images are now booted via EFI > > Tested-On: RPI-B > Tested-On: RPI2 > Tested-On: OrangePi One > Tested-On: All lot of other boards > MFC after: Never > Relnotes: yes Differencial Revision: https://reviews.freebsd.org/D16482 > Modified: > head/release/arm/BANANAPI.conf > head/release/arm/BEAGLEBONE.conf > head/release/arm/CUBIEBOARD.conf > head/release/arm/CUBIEBOARD2.conf > head/release/arm/CUBOX-HUMMINGBOARD.conf > head/release/arm/PANDABOARD.conf > head/release/arm/RPI-B.conf > head/release/arm/RPI2.conf > head/release/arm/WANDBOARD.conf > > Modified: head/release/arm/BANANAPI.conf > ============================================================================== > --- head/release/arm/BANANAPI.conf Tue Jul 31 19:10:50 2018 (r336997) > +++ head/release/arm/BANANAPI.conf Tue Jul 31 19:12:31 2018 (r336998) > @@ -19,15 +19,8 @@ export BOARDNAME="BANANAPI" > arm_install_uboot() { > UBOOT_DIR="/usr/local/share/u-boot/u-boot-bananapi" > UBOOT_FILES="u-boot-sunxi-with-spl.bin" > - FATMOUNT="${DESTDIR%${KERNEL}}/fat" > chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \ > of=/dev/${mddev} bs=1k seek=8 conv=sync > - chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" > - chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} > - chroot ${CHROOTDIR} cp ${UBOOT_DIR}/boot.scr ${FATMOUNT}/boot.scr > - sync > - umount_loop ${CHROOTDIR}/${FATMOUNT} > - chroot ${CHROOTDIR} rmdir ${FATMOUNT} > > return 0 > } > > Modified: head/release/arm/BEAGLEBONE.conf > ============================================================================== > --- head/release/arm/BEAGLEBONE.conf Tue Jul 31 19:10:50 2018 (r336997) > +++ head/release/arm/BEAGLEBONE.conf Tue Jul 31 19:12:31 2018 (r336998) > @@ -23,7 +23,6 @@ arm_install_uboot() { > chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} > chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/MLO ${FATMOUNT}/MLO > chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/u-boot.img ${FATMOUNT}/u-boot.img > - chroot ${CHROOTDIR} cp ${UBOOT_DIR}/boot.scr ${FATMOUNT}/boot.scr > sync > umount_loop ${CHROOTDIR}/${FATMOUNT} > chroot ${CHROOTDIR} rmdir ${FATMOUNT} > > Modified: head/release/arm/CUBIEBOARD.conf > ============================================================================== > --- head/release/arm/CUBIEBOARD.conf Tue Jul 31 19:10:50 2018 (r336997) > +++ head/release/arm/CUBIEBOARD.conf Tue Jul 31 19:12:31 2018 (r336998) > @@ -19,15 +19,8 @@ export BOARDNAME="CUBIEBOARD" > arm_install_uboot() { > UBOOT_DIR="/usr/local/share/u-boot/u-boot-cubieboard" > UBOOT_FILES="u-boot-sunxi-with-spl.bin" > - FATMOUNT="${DESTDIR%${KERNEL}}/fat" > chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \ > of=/dev/${mddev} bs=1k seek=8 conv=sync > - chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" > - chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} > - chroot ${CHROOTDIR} cp ${UBOOT_DIR}/boot.scr ${FATMOUNT}/boot.scr > - sync > - umount_loop ${CHROOTDIR}/${FATMOUNT} > - chroot ${CHROOTDIR} rmdir ${FATMOUNT} > > return 0 > } > > Modified: head/release/arm/CUBIEBOARD2.conf > ============================================================================== > --- head/release/arm/CUBIEBOARD2.conf Tue Jul 31 19:10:50 2018 (r336997) > +++ head/release/arm/CUBIEBOARD2.conf Tue Jul 31 19:12:31 2018 (r336998) > @@ -19,15 +19,8 @@ export BOARDNAME="CUBIEBOARD2" > arm_install_uboot() { > UBOOT_DIR="/usr/local/share/u-boot/u-boot-cubieboard2" > UBOOT_FILES="u-boot-sunxi-with-spl.bin" > - FATMOUNT="${DESTDIR%${KERNEL}}/fat" > chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \ > of=/dev/${mddev} bs=1k seek=8 conv=sync > - chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" > - chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} > - chroot ${CHROOTDIR} cp ${UBOOT_DIR}/boot.scr ${FATMOUNT}/boot.scr > - sync > - umount_loop ${CHROOTDIR}/${FATMOUNT} > - chroot ${CHROOTDIR} rmdir ${FATMOUNT} > > return 0 > } > > Modified: head/release/arm/CUBOX-HUMMINGBOARD.conf > ============================================================================== > --- head/release/arm/CUBOX-HUMMINGBOARD.conf Tue Jul 31 19:10:50 2018 (r336997) > +++ head/release/arm/CUBOX-HUMMINGBOARD.conf Tue Jul 31 19:12:31 2018 (r336998) > @@ -19,15 +19,8 @@ export BOARDNAME="CUBOX-HUMMINGBOARD" > arm_install_uboot() { > UBOOT_DIR="/usr/local/share/u-boot/u-boot-cubox-hummingboard" > UBOOT_FILES="u-boot.imx" > - FATMOUNT="${DESTDIR%${KERNEL}}/fat" > chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \ > of=/dev/${mddev} bs=512 seek=2 conv=sync > - chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" > - chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} > - chroot ${CHROOTDIR} cp ${UBOOT_DIR}/boot.scr ${FATMOUNT}/boot.scr > - sync > - umount_loop ${CHROOTDIR}/${FATMOUNT} > - chroot ${CHROOTDIR} rmdir ${FATMOUNT} > > return 0 > } > > Modified: head/release/arm/PANDABOARD.conf > ============================================================================== > --- head/release/arm/PANDABOARD.conf Tue Jul 31 19:10:50 2018 (r336997) > +++ head/release/arm/PANDABOARD.conf Tue Jul 31 19:12:31 2018 (r336998) > @@ -23,7 +23,6 @@ arm_install_uboot() { > chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} > chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/MLO ${FATMOUNT}/MLO > chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/u-boot.img ${FATMOUNT}/u-boot.img > - chroot ${CHROOTDIR} cp ${UBOOT_DIR}/boot.scr ${FATMOUNT}/boot.scr > sync > umount_loop ${CHROOTDIR}/${FATMOUNT} > chroot ${CHROOTDIR} rmdir ${FATMOUNT} > > Modified: head/release/arm/RPI-B.conf > ============================================================================== > --- head/release/arm/RPI-B.conf Tue Jul 31 19:10:50 2018 (r336997) > +++ head/release/arm/RPI-B.conf Tue Jul 31 19:12:31 2018 (r336998) > @@ -43,7 +43,6 @@ arm_install_uboot() { > chroot ${CHROOTDIR} cp -p ${OL_DIR}/${_OL} \ > ${FATMOUNT}/overlays/${_OL} > done > - chroot ${CHROOTDIR} cp ${UBOOT_DIR}/boot.scr ${FATMOUNT}/boot.scr > sync > umount_loop ${CHROOTDIR}/${FATMOUNT} > chroot ${CHROOTDIR} rmdir ${FATMOUNT} > > Modified: head/release/arm/RPI2.conf > ============================================================================== > --- head/release/arm/RPI2.conf Tue Jul 31 19:10:50 2018 (r336997) > +++ head/release/arm/RPI2.conf Tue Jul 31 19:12:31 2018 (r336998) > @@ -42,7 +42,6 @@ arm_install_uboot() { > chroot ${CHROOTDIR} cp -p ${OL_DIR}/${_OL} \ > ${FATMOUNT}/overlays/${_OL} > done > - chroot ${CHROOTDIR} cp ${UBOOT_DIR}/boot.scr ${FATMOUNT}/boot.scr > sync > umount_loop ${CHROOTDIR}/${FATMOUNT} > chroot ${CHROOTDIR} rmdir ${FATMOUNT} > > Modified: head/release/arm/WANDBOARD.conf > ============================================================================== > --- head/release/arm/WANDBOARD.conf Tue Jul 31 19:10:50 2018 (r336997) > +++ head/release/arm/WANDBOARD.conf Tue Jul 31 19:12:31 2018 (r336998) > @@ -19,15 +19,8 @@ export BOARDNAME="WANDBOARD" > arm_install_uboot() { > UBOOT_DIR="/usr/local/share/u-boot/u-boot-wandboard" > UBOOT_FILES="u-boot.imx" > - FATMOUNT="${DESTDIR%${KERNEL}}/fat" > chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \ > of=/dev/${mddev} bs=512 seek=2 conv=sync > - chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" > - chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} > - chroot ${CHROOTDIR} cp ${UBOOT_DIR}/boot.scr ${FATMOUNT}/boot.scr > - sync > - umount_loop ${CHROOTDIR}/${FATMOUNT} > - chroot ${CHROOTDIR} rmdir ${FATMOUNT} > > return 0 > } -- Emmanuel Vadot