Author: gjb
Date: Fri Oct 2 02:08:40 2015
New Revision: 288469
URL: https://svnweb.freebsd.org/changeset/base/288469
Log:
MFC r288374:
In addition to the ubldr file, also copy ubldr.bin to the
MS-DOS partition. This will help with transitioning to
a single arm/armv6 userland build which could be used for
all FreeBSD/armv6 images without UBLDR_LOADADDR being set
for each board (ultimately requiring a separate buildworld
for each currently).
Sponsored by: The FreeBSD Foundation
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/10/release/arm/BEAGLEBONE.conf
==============================================================================
--- stable/10/release/arm/BEAGLEBONE.conf Fri Oct 2 02:06:36 2015
(r288468)
+++ stable/10/release/arm/BEAGLEBONE.conf Fri Oct 2 02:08:40 2015
(r288469)
@@ -26,6 +26,8 @@ arm_install_uboot() {
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 -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr
+ chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \
+ ${FATMOUNT}/ubldr.bin
chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot
sync
umount_loop ${CHROOTDIR}/${FATMOUNT}
Modified: stable/10/release/arm/CUBOX-HUMMINGBOARD.conf
==============================================================================
--- stable/10/release/arm/CUBOX-HUMMINGBOARD.conf Fri Oct 2 02:06:36
2015 (r288468)
+++ stable/10/release/arm/CUBOX-HUMMINGBOARD.conf Fri Oct 2 02:08:40
2015 (r288469)
@@ -28,6 +28,8 @@ arm_install_uboot() {
chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr
+ chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \
+ ${FATMOUNT}/ubldr.bin
chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot
sync
umount_loop ${CHROOTDIR}/${FATMOUNT}
Modified: stable/10/release/arm/GUMSTIX.conf
==============================================================================
--- stable/10/release/arm/GUMSTIX.conf Fri Oct 2 02:06:36 2015
(r288468)
+++ stable/10/release/arm/GUMSTIX.conf Fri Oct 2 02:08:40 2015
(r288469)
@@ -26,6 +26,8 @@ arm_install_uboot() {
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 -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr
+ chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \
+ ${FATMOUNT}/ubldr.bin
chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot
sync
umount_loop ${CHROOTDIR}/${FATMOUNT}
Modified: stable/10/release/arm/PANDABOARD.conf
==============================================================================
--- stable/10/release/arm/PANDABOARD.conf Fri Oct 2 02:06:36 2015
(r288468)
+++ stable/10/release/arm/PANDABOARD.conf Fri Oct 2 02:08:40 2015
(r288469)
@@ -26,6 +26,8 @@ arm_install_uboot() {
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 -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr
+ chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \
+ ${FATMOUNT}/ubldr.bin
chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot
sync
umount_loop ${CHROOTDIR}/${FATMOUNT}
Modified: stable/10/release/arm/RPI-B.conf
==============================================================================
--- stable/10/release/arm/RPI-B.conf Fri Oct 2 02:06:36 2015
(r288468)
+++ stable/10/release/arm/RPI-B.conf Fri Oct 2 02:08:40 2015
(r288469)
@@ -30,6 +30,8 @@ arm_install_uboot() {
${FATMOUNT}/${_UF}
done
chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr
+ chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \
+ ${FATMOUNT}/ubldr.bin
chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/dtb/rpi.dtb \
${FATMOUNT}/rpi.dtb
chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot
Modified: stable/10/release/arm/RPI2.conf
==============================================================================
--- stable/10/release/arm/RPI2.conf Fri Oct 2 02:06:36 2015
(r288468)
+++ stable/10/release/arm/RPI2.conf Fri Oct 2 02:08:40 2015
(r288469)
@@ -31,6 +31,8 @@ arm_install_uboot() {
${FATMOUNT}/${_UF}
done
chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr
+ chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \
+ ${FATMOUNT}/ubldr.bin
chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/dtb/rpi2.dtb \
${FATMOUNT}/rpi2.dtb
chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot
Modified: stable/10/release/arm/WANDBOARD.conf
==============================================================================
--- stable/10/release/arm/WANDBOARD.conf Fri Oct 2 02:06:36 2015
(r288468)
+++ stable/10/release/arm/WANDBOARD.conf Fri Oct 2 02:08:40 2015
(r288469)
@@ -29,6 +29,8 @@ arm_install_uboot() {
chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr
+ chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \
+ ${FATMOUNT}/ubldr.bin
chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot
sync
umount_loop ${CHROOTDIR}/${FATMOUNT}
_______________________________________________
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"
