Author: manu
Date: Tue Jul 31 19:12:31 2018
New Revision: 336998
URL: https://svnweb.freebsd.org/changeset/base/336998
Log:
release: arm: Always boot armv6/v7 image with EFI
boot.scr is a u-boot script that loads and execute ubldr.bin
If not present u-boot will automatically boot loader.efi which
is already installed.
This means that all armv6/armv7 images are now booted via EFI
Tested-On: RPI-B
Tested-On: RPI2
Tested-On: OrangePi One
Tested-On: All lot of other boards
MFC after: Never
Relnotes: yes
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/RPI-B.conf
head/release/arm/RPI2.conf
head/release/arm/WANDBOARD.conf
Modified: head/release/arm/BANANAPI.conf
==============================================================================
--- head/release/arm/BANANAPI.conf Tue Jul 31 19:10:50 2018
(r336997)
+++ head/release/arm/BANANAPI.conf Tue Jul 31 19:12:31 2018
(r336998)
@@ -19,15 +19,8 @@ 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:10:50 2018
(r336997)
+++ head/release/arm/BEAGLEBONE.conf Tue Jul 31 19:12:31 2018
(r336998)
@@ -23,7 +23,6 @@ arm_install_uboot() {
chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
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
sync
umount_loop ${CHROOTDIR}/${FATMOUNT}
chroot ${CHROOTDIR} rmdir ${FATMOUNT}
Modified: head/release/arm/CUBIEBOARD.conf
==============================================================================
--- head/release/arm/CUBIEBOARD.conf Tue Jul 31 19:10:50 2018
(r336997)
+++ head/release/arm/CUBIEBOARD.conf Tue Jul 31 19:12:31 2018
(r336998)
@@ -19,15 +19,8 @@ export BOARDNAME="CUBIEBOARD"
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"
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/CUBIEBOARD2.conf
==============================================================================
--- head/release/arm/CUBIEBOARD2.conf Tue Jul 31 19:10:50 2018
(r336997)
+++ head/release/arm/CUBIEBOARD2.conf Tue Jul 31 19:12:31 2018
(r336998)
@@ -19,15 +19,8 @@ export BOARDNAME="CUBIEBOARD2"
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"
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/CUBOX-HUMMINGBOARD.conf
==============================================================================
--- head/release/arm/CUBOX-HUMMINGBOARD.conf Tue Jul 31 19:10:50 2018
(r336997)
+++ head/release/arm/CUBOX-HUMMINGBOARD.conf Tue Jul 31 19:12:31 2018
(r336998)
@@ -19,15 +19,8 @@ export BOARDNAME="CUBOX-HUMMINGBOARD"
arm_install_uboot() {
UBOOT_DIR="/usr/local/share/u-boot/u-boot-cubox-hummingboard"
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
}
Modified: head/release/arm/PANDABOARD.conf
==============================================================================
--- head/release/arm/PANDABOARD.conf Tue Jul 31 19:10:50 2018
(r336997)
+++ head/release/arm/PANDABOARD.conf Tue Jul 31 19:12:31 2018
(r336998)
@@ -23,7 +23,6 @@ arm_install_uboot() {
chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
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
sync
umount_loop ${CHROOTDIR}/${FATMOUNT}
chroot ${CHROOTDIR} rmdir ${FATMOUNT}
Modified: head/release/arm/RPI-B.conf
==============================================================================
--- head/release/arm/RPI-B.conf Tue Jul 31 19:10:50 2018 (r336997)
+++ head/release/arm/RPI-B.conf Tue Jul 31 19:12:31 2018 (r336998)
@@ -43,7 +43,6 @@ arm_install_uboot() {
chroot ${CHROOTDIR} cp -p ${OL_DIR}/${_OL} \
${FATMOUNT}/overlays/${_OL}
done
- chroot ${CHROOTDIR} cp ${UBOOT_DIR}/boot.scr ${FATMOUNT}/boot.scr
sync
umount_loop ${CHROOTDIR}/${FATMOUNT}
chroot ${CHROOTDIR} rmdir ${FATMOUNT}
Modified: head/release/arm/RPI2.conf
==============================================================================
--- head/release/arm/RPI2.conf Tue Jul 31 19:10:50 2018 (r336997)
+++ head/release/arm/RPI2.conf Tue Jul 31 19:12:31 2018 (r336998)
@@ -42,7 +42,6 @@ arm_install_uboot() {
chroot ${CHROOTDIR} cp -p ${OL_DIR}/${_OL} \
${FATMOUNT}/overlays/${_OL}
done
- chroot ${CHROOTDIR} cp ${UBOOT_DIR}/boot.scr ${FATMOUNT}/boot.scr
sync
umount_loop ${CHROOTDIR}/${FATMOUNT}
chroot ${CHROOTDIR} rmdir ${FATMOUNT}
Modified: head/release/arm/WANDBOARD.conf
==============================================================================
--- head/release/arm/WANDBOARD.conf Tue Jul 31 19:10:50 2018
(r336997)
+++ head/release/arm/WANDBOARD.conf Tue Jul 31 19:12:31 2018
(r336998)
@@ -19,15 +19,8 @@ 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-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"
