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
englishm · Jul 31, 2018 · 742899f · 742899f
1 parent 548fc89
commit 742899f
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 39 deletions.
diff --git a/release/arm/BANANAPI.conf b/release/arm/BANANAPI.conf
@@ -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
 }
diff --git a/release/arm/BEAGLEBONE.conf b/release/arm/BEAGLEBONE.conf
@@ -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}

diff --git a/release/arm/CUBIEBOARD.conf b/release/arm/CUBIEBOARD.conf
@@ -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
 }
diff --git a/release/arm/CUBIEBOARD2.conf b/release/arm/CUBIEBOARD2.conf
@@ -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
 }
diff --git a/release/arm/CUBOX-HUMMINGBOARD.conf b/release/arm/CUBOX-HUMMINGBOARD.conf
@@ -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
 }
diff --git a/release/arm/PANDABOARD.conf b/release/arm/PANDABOARD.conf
@@ -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}

diff --git a/release/arm/RPI-B.conf b/release/arm/RPI-B.conf
@@ -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}

diff --git a/release/arm/RPI2.conf b/release/arm/RPI2.conf
@@ -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}

diff --git a/release/arm/WANDBOARD.conf b/release/arm/WANDBOARD.conf
@@ -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
 }