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).

Requested by:	ian
MFC after:	3 days
Sponsored by:	The FreeBSD Foundation

diff --git a/release/arm/BEAGLEBONE.conf b/release/arm/BEAGLEBONE.conf
index 4fcb07d21d72237cfb7d03528fd9a78c3aab3869..f9bb1625d6ed4a8b8ea1d8c3a74c86e31eaab376 100644 (file)
--- a/release/arm/BEAGLEBONE.conf
+++ b/release/arm/BEAGLEBONE.conf
@@ -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}

diff --git a/release/arm/CUBOX-HUMMINGBOARD.conf b/release/arm/CUBOX-HUMMINGBOARD.conf
index 79e9389a5389412e155fd91c7a65b8bf534e6034..d69ca8eddbc222be38f56c0869445c9091f5a55e 100644 (file)
--- a/release/arm/CUBOX-HUMMINGBOARD.conf
+++ b/release/arm/CUBOX-HUMMINGBOARD.conf
@@ -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}

diff --git a/release/arm/GUMSTIX.conf b/release/arm/GUMSTIX.conf
index 6812a5f499630a94f5dbba62246c0daa7dcbe575..38445b15ea7378d213b24e319261ac1697e07ad2 100644 (file)
--- a/release/arm/GUMSTIX.conf
+++ b/release/arm/GUMSTIX.conf
@@ -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}

diff --git a/release/arm/PANDABOARD.conf b/release/arm/PANDABOARD.conf
index 6b75566319f80860bc9ad1551fdb1a9156798e6c..0b238dfc18055845f5512fb58016ec279f17f659 100644 (file)
--- a/release/arm/PANDABOARD.conf
+++ b/release/arm/PANDABOARD.conf
@@ -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}

diff --git a/release/arm/RPI-B.conf b/release/arm/RPI-B.conf
index e5abaab9fd18898f0c2f574b37bce93a5f3138af..b97b7d09b76cef5aff5b96add4de3f53a15fc9e9 100644 (file)
--- a/release/arm/RPI-B.conf
+++ b/release/arm/RPI-B.conf
@@ -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

diff --git a/release/arm/RPI2.conf b/release/arm/RPI2.conf
index 2da7e96988b1f970a3c658eceb6b9475d2358e0a..886a5aa1ae9e55144a7dcbe14f7af4037ce180a8 100644 (file)
--- a/release/arm/RPI2.conf
+++ b/release/arm/RPI2.conf
@@ -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/rpi2.dtb \
                ${FATMOUNT}/rpi2.dtb
        chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot

diff --git a/release/arm/WANDBOARD.conf b/release/arm/WANDBOARD.conf
index 4033d0938fc16b855abf9fd4ed9a275c4c59548a..1afdc720de2de85168539c91e369238581f7925f 100644 (file)
--- a/release/arm/WANDBOARD.conf
+++ b/release/arm/WANDBOARD.conf
@@ -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}