Author: gjb
Date: Thu Mar 29 19:29:12 2018
New Revision: 331741
URL: https://svnweb.freebsd.org/changeset/base/331741
Log:
MFC r331562 (manu):
release: arm: Copy boot.scr from ports
Latest u-boot update need u-boot script to load and start ubldr.
(See D14230 for more details)
Copy this file for our arm release on the fat partition.
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/GUMSTIX.conf
stable/11/release/arm/PANDABOARD.conf
stable/11/release/arm/RPI-B.conf
stable/11/release/arm/RPI2.conf
stable/11/release/arm/WANDBOARD.conf
Directory Properties:
stable/11/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/10/release/arm/BEAGLEBONE.conf
stable/10/release/arm/CUBOX-HUMMINGBOARD.conf
stable/10/release/arm/GUMSTIX.conf
stable/10/release/arm/PANDABOARD.conf
stable/10/release/arm/RPI-B.conf
stable/10/release/arm/RPI2.conf
stable/10/release/arm/WANDBOARD.conf
Directory Properties:
stable/10/ (props changed)
Modified: stable/11/release/arm/BANANAPI.conf
==============================================================================
--- stable/11/release/arm/BANANAPI.conf Thu Mar 29 17:44:55 2018
(r331740)
+++ stable/11/release/arm/BANANAPI.conf Thu Mar 29 19:29:12 2018
(r331741)
@@ -26,6 +26,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} 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
Modified: stable/11/release/arm/BEAGLEBONE.conf
==============================================================================
--- stable/11/release/arm/BEAGLEBONE.conf Thu Mar 29 17:44:55 2018
(r331740)
+++ stable/11/release/arm/BEAGLEBONE.conf Thu Mar 29 19:29:12 2018
(r331741)
@@ -25,6 +25,7 @@ arm_install_uboot() {
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} ln ${UFSMOUNT}/boot/dtb/beaglebone.dtb \
Modified: stable/11/release/arm/CUBIEBOARD.conf
==============================================================================
--- stable/11/release/arm/CUBIEBOARD.conf Thu Mar 29 17:44:55 2018
(r331740)
+++ stable/11/release/arm/CUBIEBOARD.conf Thu Mar 29 19:29:12 2018
(r331741)
@@ -25,6 +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} 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
Modified: stable/11/release/arm/CUBIEBOARD2.conf
==============================================================================
--- stable/11/release/arm/CUBIEBOARD2.conf Thu Mar 29 17:44:55 2018
(r331740)
+++ stable/11/release/arm/CUBIEBOARD2.conf Thu Mar 29 19:29:12 2018
(r331741)
@@ -26,6 +26,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} 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
Modified: stable/11/release/arm/CUBOX-HUMMINGBOARD.conf
==============================================================================
--- stable/11/release/arm/CUBOX-HUMMINGBOARD.conf Thu Mar 29 17:44:55
2018 (r331740)
+++ stable/11/release/arm/CUBOX-HUMMINGBOARD.conf Thu Mar 29 19:29:12
2018 (r331741)
@@ -26,6 +26,7 @@ arm_install_uboot() {
of=/dev/${mddev} bs=512 seek=2 conv=sync
chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
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
Modified: stable/11/release/arm/GUMSTIX.conf
==============================================================================
--- stable/11/release/arm/GUMSTIX.conf Thu Mar 29 17:44:55 2018
(r331740)
+++ stable/11/release/arm/GUMSTIX.conf Thu Mar 29 19:29:12 2018
(r331741)
@@ -25,6 +25,7 @@ arm_install_uboot() {
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
Modified: stable/11/release/arm/PANDABOARD.conf
==============================================================================
--- stable/11/release/arm/PANDABOARD.conf Thu Mar 29 17:44:55 2018
(r331740)
+++ stable/11/release/arm/PANDABOARD.conf Thu Mar 29 19:29:12 2018
(r331741)
@@ -25,6 +25,7 @@ arm_install_uboot() {
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
Modified: stable/11/release/arm/RPI-B.conf
==============================================================================
--- stable/11/release/arm/RPI-B.conf Thu Mar 29 17:44:55 2018
(r331740)
+++ stable/11/release/arm/RPI-B.conf Thu Mar 29 19:29:12 2018
(r331741)
@@ -40,6 +40,7 @@ arm_install_uboot() {
${FATMOUNT}/ubldr.bin
chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/dtb/rpi.dtb \
${FATMOUNT}/rpi.dtb
+ chroot ${CHROOTDIR} cp ${UBOOT_DIR}/boot.scr ${FATMOUNT}/boot.scr
chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot
sync
umount_loop ${CHROOTDIR}/${FATMOUNT}
Modified: stable/11/release/arm/RPI2.conf
==============================================================================
--- stable/11/release/arm/RPI2.conf Thu Mar 29 17:44:55 2018
(r331740)
+++ stable/11/release/arm/RPI2.conf Thu Mar 29 19:29:12 2018
(r331741)
@@ -40,6 +40,7 @@ arm_install_uboot() {
${FATMOUNT}/ubldr.bin
chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/dtb/rpi2.dtb \
${FATMOUNT}/rpi2.dtb
+ chroot ${CHROOTDIR} cp ${UBOOT_DIR}/boot.scr ${FATMOUNT}/boot.scr
chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot
sync
umount_loop ${CHROOTDIR}/${FATMOUNT}
Modified: stable/11/release/arm/WANDBOARD.conf
==============================================================================
--- stable/11/release/arm/WANDBOARD.conf Thu Mar 29 17:44:55 2018
(r331740)
+++ stable/11/release/arm/WANDBOARD.conf Thu Mar 29 19:29:12 2018
(r331741)
@@ -26,6 +26,7 @@ arm_install_uboot() {
of=/dev/${mddev} bs=512 seek=2 conv=sync
chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
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
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
