From nobody Mon May 01 06:32:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q8tg55BPvz47t6N; Mon, 1 May 2023 06:32:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q8tg51Wpxz3skY; Mon, 1 May 2023 06:32:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682922753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bifXbOxRfh+OlX43MGbPoGE1N3V/nkH7b+4TLsC5JA0=; b=nXMtECCuWWp3OwzUIMkT6p+OcyLoDQtKmPl5Rxl8hNtQq9B5Fk/Cm7p/qdKuT/dclJwNZZ sh7R+GeNf/jYQnsDTtgAM4mrCbr52vCXracTBbO2bDG87TdktWtB6OBZ/U9lyC/EwdvC0q mYKtpoj0AGGpA6j5UyB1VGIsHLlb2+lIm3V38DjNJViRWtrysbs384Pl5fPk5bZnaUldgN NTFjNHEjgOk2RtZ6h4TpbTTZR54v6xc1bQ0YjqUzZ3Z4q75pc3QVzzbf6draUJQ66ejCw7 8lQ3EpKio8WpmiP05QcVVkMl6ZgcD+dIM6ok8srNupYw26BhQo8vLTtMH3gqqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682922753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bifXbOxRfh+OlX43MGbPoGE1N3V/nkH7b+4TLsC5JA0=; b=p57txRSbjrexRxhB5FQujIJv+rm12QZTNKJvyjA+YbmucmjcXW4QHvZ8mF98ThmoSXAH6U SrAexNCSRQImSh5xFeK+YUJrTJOg8NlSuarMqQWKA0c3JZdrsD2xV90mbcYO1aiO5CnlVF 0MRjJmU1onCkVTkEflBLUcXbS0Ooqwow9eMDAGqEAGgNkUekYm7GZ4TVT6hncACoRF4BoK yPpqCOHlqa9t7hEYEY/fE2QXqKY6YkvYwsYE2g2dLcL1sm9iT28oceHI8B0IbLZEt1Qs6+ by36F+VxZfR3aSMJ9P36DWJnzlml9CyICBY8CEWs5mfL2rlLydwniE6Nv4Hy0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682922753; a=rsa-sha256; cv=none; b=LevqeNkilyuSXeD3/7AT9T68DduXxrO2+b/HiwmiOzUkhsMovJnRateoHChxB6i5yGIPps KbIsWs4zCMd2am88jbPxb/BlPKXorkkXaceGjF6kce2Y16xaeXkgpUXrB6Vos2Ca+J6MK6 Ad727Il+TgN2Jw+X8EgDKSUXxJSLvg7NNhPiQxOlj+32YnAsXKIsnu5pXBw6mUAlfDNpsw QZVGjzHAARuyoHB2n5T7BySihzNyugr5L+8Vtm13iOYJmlSRHLk0KvV9G8BzWPRAxrzdQq T29VzWOaGkr5MhnSWVScgegA4IiMwNNj3RsRhD13+aAHUgpYjr1OQFpaxHuIjg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q8tg50Lnhzw1y; Mon, 1 May 2023 06:32:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3416WWpJ012761; Mon, 1 May 2023 06:32:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3416WWxK012760; Mon, 1 May 2023 06:32:32 GMT (envelope-from git) Date: Mon, 1 May 2023 06:32:32 GMT Message-Id: <202305010632.3416WWxK012760@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: ea9075959bf3 - main - armv7: release: Stop installing BBB u-boot List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ea9075959bf3a6e98d9638467500a690267f3947 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=ea9075959bf3a6e98d9638467500a690267f3947 commit ea9075959bf3a6e98d9638467500a690267f3947 Author: Emmanuel Vadot AuthorDate: 2023-04-27 06:21:47 +0000 Commit: Emmanuel Vadot 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 }