git: ea9075959bf3 - main - armv7: release: Stop installing BBB u-boot
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 01 May 2023 06:32:32 UTC
The branch main has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=ea9075959bf3a6e98d9638467500a690267f3947
commit ea9075959bf3a6e98d9638467500a690267f3947
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2023-04-27 06:21:47 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-05-01 06:32:21 +0000
armv7: release: Stop installing BBB u-boot
BBB code was removed from GENERIC kernel as it's not functional.
Stop installing u-boot for a platform that we don't boot on.
Reviewed by: imp, gjb
Approved by: re@ (gjb)
MFC after: never
Sponsored by: Beckhoff Automation GmbH & Co. KG
Differential Revision: https://reviews.freebsd.org/D39844
---
release/arm/GENERICSD.conf | 17 +----------------
1 file changed, 1 insertion(+), 16 deletions(-)
diff --git a/release/arm/GENERICSD.conf b/release/arm/GENERICSD.conf
index 32b780d04385..2a0672db9bbd 100644
--- a/release/arm/GENERICSD.conf
+++ b/release/arm/GENERICSD.conf
@@ -6,13 +6,12 @@
EMBEDDED_TARGET_ARCH="armv7"
EMBEDDED_TARGET="arm"
EMBEDDEDBUILD=1
-EMBEDDEDPORTS="sysutils/u-boot-beaglebone sysutils/u-boot-rpi2 sysutils/rpi-firmware"
+EMBEDDEDPORTS="sysutils/u-boot-rpi2 sysutils/rpi-firmware"
FAT_SIZE="50m -b 1m"
FAT_TYPE="16"
IMAGE_SIZE="5120M"
KERNEL="GENERIC"
MD_ARGS="-x 63 -y 255"
-BBB_UBOOT_DIR="/usr/local/share/u-boot/u-boot-beaglebone"
RPI_UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi2"
RPI_FIRMWARE_DIR="/usr/local/share/rpi-firmware"
RPI_OL_DIR="${RPI_FIRMWARE_DIR}/overlays"
@@ -49,20 +48,6 @@ arm_install_uboot_rpi2() {
return 0
}
-arm_install_uboot_bbb() {
- FATMOUNT="${DESTDIR%${KERNEL}}/fat"
- chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}"
- chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
- chroot ${CHROOTDIR} cp -p ${BBB_UBOOT_DIR}/MLO ${FATMOUNT}/MLO
- chroot ${CHROOTDIR} cp -p ${BBB_UBOOT_DIR}/u-boot.img ${FATMOUNT}/u-boot.img
- sync
- umount_loop ${CHROOTDIR}/${FATMOUNT}
- chroot ${CHROOTDIR} rmdir ${FATMOUNT}
-
- return 0
-}
-
arm_install_uboot() {
- arm_install_uboot_bbb
arm_install_uboot_rpi2
}