Author: manu
Date: Tue Jul 31 19:10:50 2018
New Revision: 336997
URL: https://svnweb.freebsd.org/changeset/base/336997

Log:
  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
  MFC after:    3 days
  Differential Revision:        https://reviews.freebsd.org/D16481

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/WANDBOARD.conf

Modified: head/release/arm/BANANAPI.conf
==============================================================================
--- head/release/arm/BANANAPI.conf      Tue Jul 31 19:08:24 2018        
(r336996)
+++ head/release/arm/BANANAPI.conf      Tue Jul 31 19:10:50 2018        
(r336997)
@@ -19,8 +19,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}"
+       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:08:24 2018        
(r336996)
+++ head/release/arm/BEAGLEBONE.conf    Tue Jul 31 19:10:50 2018        
(r336997)
@@ -27,6 +27,6 @@ arm_install_uboot() {
        sync
        umount_loop ${CHROOTDIR}/${FATMOUNT}
        chroot ${CHROOTDIR} rmdir ${FATMOUNT}
-       
+
        return 0
 }

Modified: head/release/arm/CUBIEBOARD.conf
==============================================================================
--- head/release/arm/CUBIEBOARD.conf    Tue Jul 31 19:08:24 2018        
(r336996)
+++ head/release/arm/CUBIEBOARD.conf    Tue Jul 31 19:10:50 2018        
(r336997)
@@ -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: head/release/arm/CUBIEBOARD2.conf
==============================================================================
--- head/release/arm/CUBIEBOARD2.conf   Tue Jul 31 19:08:24 2018        
(r336996)
+++ head/release/arm/CUBIEBOARD2.conf   Tue Jul 31 19:10:50 2018        
(r336997)
@@ -20,21 +20,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} touch ${UFSMOUNT}/firstboot
        sync
        umount_loop ${CHROOTDIR}/${FATMOUNT}
-       umount_loop ${CHROOTDIR}/${UFSMOUNT}
        chroot ${CHROOTDIR} rmdir ${FATMOUNT}
-       chroot ${CHROOTDIR} rmdir ${UFSMOUNT}
-       
+
        return 0
 }

Modified: head/release/arm/CUBOX-HUMMINGBOARD.conf
==============================================================================
--- head/release/arm/CUBOX-HUMMINGBOARD.conf    Tue Jul 31 19:08:24 2018        
(r336996)
+++ head/release/arm/CUBOX-HUMMINGBOARD.conf    Tue Jul 31 19:10:50 2018        
(r336997)
@@ -20,21 +20,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: head/release/arm/PANDABOARD.conf
==============================================================================
--- head/release/arm/PANDABOARD.conf    Tue Jul 31 19:08:24 2018        
(r336996)
+++ head/release/arm/PANDABOARD.conf    Tue Jul 31 19:10:50 2018        
(r336997)
@@ -19,21 +19,14 @@ export BOARDNAME="PANDABOARD"
 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: head/release/arm/WANDBOARD.conf
==============================================================================
--- head/release/arm/WANDBOARD.conf     Tue Jul 31 19:08:24 2018        
(r336996)
+++ head/release/arm/WANDBOARD.conf     Tue Jul 31 19:10:50 2018        
(r336997)
@@ -19,8 +19,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
 }
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to