Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 3 Aug 2018 21:59:01 +0000 (UTC)
From:      Emmanuel Vadot <manu@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   svn commit: r337274 - stable/11/release/arm
Message-ID:  <201808032159.w73Lx1p5009667@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: manu
Date: Fri Aug  3 21:59:01 2018
New Revision: 337274
URL: https://svnweb.freebsd.org/changeset/base/337274

Log:
  MFC r336997:
  
  release: Restore copy of boot.scr for some board
  
  This is not a problem for 12-CURRENT as EFI boot works but it doesn't
  for 11.
  While here some board arm_install_uboot also copy ubldr.bin et create
  firstboot files but it's already done in arm_install_boot
  
  Reviewed by:	gjb
  Differential Revision:	https://reviews.freebsd.org/D16481

Modified:
  stable/11/release/arm/BANANAPI.conf
  stable/11/release/arm/BEAGLEBONE.conf
  stable/11/release/arm/CUBIEBOARD.conf
  stable/11/release/arm/CUBIEBOARD2.conf
  stable/11/release/arm/CUBOX-HUMMINGBOARD.conf
  stable/11/release/arm/PANDABOARD.conf
  stable/11/release/arm/WANDBOARD.conf
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/release/arm/BANANAPI.conf
==============================================================================
--- stable/11/release/arm/BANANAPI.conf	Fri Aug  3 20:04:06 2018	(r337273)
+++ stable/11/release/arm/BANANAPI.conf	Fri Aug  3 21:59:01 2018	(r337274)
@@ -20,20 +20,15 @@ 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}" "${UFSMOUNT}"
+	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
 	chroot ${CHROOTDIR} cp ${UBOOT_DIR}/boot.scr ${FATMOUNT}/boot.scr
-	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
-	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \
-		${FATMOUNT}/ubldr.bin
-	chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot
 	sync
 	umount_loop ${CHROOTDIR}/${FATMOUNT}
-	umount_loop ${CHROOTDIR}/${UFSMOUNT}
 	chroot ${CHROOTDIR} rmdir ${FATMOUNT}
-	chroot ${CHROOTDIR} rmdir ${UFSMOUNT}
-	
+
 	return 0
 }

Modified: stable/11/release/arm/BEAGLEBONE.conf
==============================================================================
--- stable/11/release/arm/BEAGLEBONE.conf	Fri Aug  3 20:04:06 2018	(r337273)
+++ stable/11/release/arm/BEAGLEBONE.conf	Fri Aug  3 21:59:01 2018	(r337274)
@@ -30,6 +30,6 @@ arm_install_uboot() {
 	sync
 	umount_loop ${CHROOTDIR}/${FATMOUNT}
 	chroot ${CHROOTDIR} rmdir ${FATMOUNT}
-	
+
 	return 0
 }

Modified: stable/11/release/arm/CUBIEBOARD.conf
==============================================================================
--- stable/11/release/arm/CUBIEBOARD.conf	Fri Aug  3 20:04:06 2018	(r337273)
+++ stable/11/release/arm/CUBIEBOARD.conf	Fri Aug  3 21:59:01 2018	(r337274)
@@ -20,21 +20,14 @@ 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"
-	UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
 	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
 		of=/dev/${mddev} bs=1k seek=8 conv=sync
-	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
+	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
 	chroot ${CHROOTDIR} cp ${UBOOT_DIR}/boot.scr ${FATMOUNT}/boot.scr
-	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
-	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \
-		${FATMOUNT}/ubldr.bin
-	chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot
 	sync
 	umount_loop ${CHROOTDIR}/${FATMOUNT}
-	umount_loop ${CHROOTDIR}/${UFSMOUNT}
 	chroot ${CHROOTDIR} rmdir ${FATMOUNT}
-	chroot ${CHROOTDIR} rmdir ${UFSMOUNT}
-	
+
 	return 0
 }

Modified: stable/11/release/arm/CUBIEBOARD2.conf
==============================================================================
--- stable/11/release/arm/CUBIEBOARD2.conf	Fri Aug  3 20:04:06 2018	(r337273)
+++ stable/11/release/arm/CUBIEBOARD2.conf	Fri Aug  3 21:59:01 2018	(r337274)
@@ -21,23 +21,14 @@ 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"
-	UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
 	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
 		of=/dev/${mddev} bs=1k seek=8 conv=sync
-	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
+	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
 	chroot ${CHROOTDIR} cp ${UBOOT_DIR}/boot.scr ${FATMOUNT}/boot.scr
-	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
-	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \
-		${FATMOUNT}/ubldr.bin
-	chroot ${CHROOTDIR} ln ${UFSMOUNT}/boot/dtb/cubieboard2.dtb \
-		${UFSMOUNT}/boot/dtb/sun7i-a20-cubieboard2.dtb
-	chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot
 	sync
 	umount_loop ${CHROOTDIR}/${FATMOUNT}
-	umount_loop ${CHROOTDIR}/${UFSMOUNT}
 	chroot ${CHROOTDIR} rmdir ${FATMOUNT}
-	chroot ${CHROOTDIR} rmdir ${UFSMOUNT}
-	
+
 	return 0
 }

Modified: stable/11/release/arm/CUBOX-HUMMINGBOARD.conf
==============================================================================
--- stable/11/release/arm/CUBOX-HUMMINGBOARD.conf	Fri Aug  3 20:04:06 2018	(r337273)
+++ stable/11/release/arm/CUBOX-HUMMINGBOARD.conf	Fri Aug  3 21:59:01 2018	(r337274)
@@ -21,21 +21,14 @@ arm_install_uboot() {
 	UBOOT_DIR="/usr/local/share/u-boot/u-boot-cubox-hummingboard"
 	UBOOT_FILES="u-boot.imx"
 	FATMOUNT="${DESTDIR%${KERNEL}}/fat"
-	UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
 	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
 		of=/dev/${mddev} bs=512 seek=2 conv=sync
-	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
+	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
 	chroot ${CHROOTDIR} cp ${UBOOT_DIR}/boot.scr ${FATMOUNT}/boot.scr
-	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
-	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \
-		${FATMOUNT}/ubldr.bin
-	chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot
 	sync
 	umount_loop ${CHROOTDIR}/${FATMOUNT}
-	umount_loop ${CHROOTDIR}/${UFSMOUNT}
 	chroot ${CHROOTDIR} rmdir ${FATMOUNT}
-	chroot ${CHROOTDIR} rmdir ${UFSMOUNT}
-	
+
 	return 0
 }

Modified: stable/11/release/arm/PANDABOARD.conf
==============================================================================
--- stable/11/release/arm/PANDABOARD.conf	Fri Aug  3 20:04:06 2018	(r337273)
+++ stable/11/release/arm/PANDABOARD.conf	Fri Aug  3 21:59:01 2018	(r337274)
@@ -19,21 +19,14 @@ WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000"
 arm_install_uboot() {
 	UBOOT_DIR="/usr/local/share/u-boot/u-boot-pandaboard"
 	FATMOUNT="${DESTDIR%${KERNEL}}/fat"
-	UFSMOUNT="${DESTDIR%${KERNEL}}/ufs"
-	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
+	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
-	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
 	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
-	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \
-		${FATMOUNT}/ubldr.bin
-	chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot
 	sync
 	umount_loop ${CHROOTDIR}/${FATMOUNT}
-	umount_loop ${CHROOTDIR}/${UFSMOUNT}
 	chroot ${CHROOTDIR} rmdir ${FATMOUNT}
-	chroot ${CHROOTDIR} rmdir ${UFSMOUNT}
-	
+
 	return 0
 }

Modified: stable/11/release/arm/WANDBOARD.conf
==============================================================================
--- stable/11/release/arm/WANDBOARD.conf	Fri Aug  3 20:04:06 2018	(r337273)
+++ stable/11/release/arm/WANDBOARD.conf	Fri Aug  3 21:59:01 2018	(r337274)
@@ -20,8 +20,15 @@ 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
 }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808032159.w73Lx1p5009667>