From owner-svn-ports-head@freebsd.org Tue Jun 9 09:40:06 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id ABBD734EAB3; Tue, 9 Jun 2020 09:40:06 +0000 (UTC) (envelope-from manu@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49h4pt48GFz47jP; Tue, 9 Jun 2020 09:40:06 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 85436136C6; Tue, 9 Jun 2020 09:40:06 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0599e6Ga041222; Tue, 9 Jun 2020 09:40:06 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0599e6Ib041221; Tue, 9 Jun 2020 09:40:06 GMT (envelope-from manu@FreeBSD.org) Message-Id: <202006090940.0599e6Ib041221@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Tue, 9 Jun 2020 09:40:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r538299 - in head/sysutils/u-boot-beaglebone: . files X-SVN-Group: ports-head X-SVN-Commit-Author: manu X-SVN-Commit-Paths: in head/sysutils/u-boot-beaglebone: . files X-SVN-Commit-Revision: 538299 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Jun 2020 09:40:06 -0000 Author: manu Date: Tue Jun 9 09:40:05 2020 New Revision: 538299 URL: https://svnweb.freebsd.org/changeset/ports/538299 Log: sysutils/u-boot-beaglebone: Fix eMMC boot Due to rename of CONFIG_NAND -> CONFIG_MTD_RAW_NAND the BBB will not boot from eMMC. https://github.com/u-boot/u-boot/commit/88718be3001055fa2801a44ab10570279b3f2cb7 https://github.com/u-boot/u-boot/commit/d4c2f6b7e3e2bfd297367d292aa641095c7a18e2 Submitted by: Oskar Holmund (oskar.holmlund@ohdata.se) Differential Revision: https://reviews.freebsd.org/D25190 Modified: head/sysutils/u-boot-beaglebone/Makefile head/sysutils/u-boot-beaglebone/files/bbb_fragment Modified: head/sysutils/u-boot-beaglebone/Makefile ============================================================================== --- head/sysutils/u-boot-beaglebone/Makefile Tue Jun 9 09:32:55 2020 (r538298) +++ head/sysutils/u-boot-beaglebone/Makefile Tue Jun 9 09:40:05 2020 (r538299) @@ -6,6 +6,8 @@ MODEL= beaglebone BOARD_CONFIG= am335x_evm_defconfig FAMILY= omap +U_BOOT_SLAVE_PORTREVISION_2020.04= 1 + CONFIG_FRAGMENT= ${.CURDIR}/files/bbb_fragment FRAGMENT_NAME= bbb_fragment Modified: head/sysutils/u-boot-beaglebone/files/bbb_fragment ============================================================================== --- head/sysutils/u-boot-beaglebone/files/bbb_fragment Tue Jun 9 09:32:55 2020 (r538298) +++ head/sysutils/u-boot-beaglebone/files/bbb_fragment Tue Jun 9 09:40:05 2020 (r538299) @@ -2,7 +2,8 @@ CONFIG_API=y CONFIG_ARMV7_NONSEC=n CONFIG_CMD_CACHE=y CONFIG_BOOTCOMMAND="if test ${boot_fit} -eq 1; then run update_to_fit; fi; run findfdt; run init_console; setenv boot_targets mmc0 mmc1 pxe dhcp; run distro_bootcmd" -CONFIG_NAND=n +CONFIG_MTD=n +CONFIG_MTD_RAW_NAND=n CONFIG_SPL_NAND_SUPPORT=n CONFIG_CMD_NAND=n CONFIG_DFU_NAND=n