From owner-svn-ports-head@freebsd.org Mon Sep 16 15:07:45 2019 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 661A1125094; Mon, 16 Sep 2019 15:07:45 +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) server-signature RSA-PSS (4096 bits) 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 46X8k925cTz3K1C; Mon, 16 Sep 2019 15:07:45 +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 2B51222041; Mon, 16 Sep 2019 15:07:45 +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 x8GF7jwg052998; Mon, 16 Sep 2019 15:07:45 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8GF7iBs052997; Mon, 16 Sep 2019 15:07:44 GMT (envelope-from manu@FreeBSD.org) Message-Id: <201909161507.x8GF7iBs052997@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Mon, 16 Sep 2019 15:07:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r512180 - 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: 512180 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.29 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: Mon, 16 Sep 2019 15:07:45 -0000 Author: manu Date: Mon Sep 16 15:07:44 2019 New Revision: 512180 URL: https://svnweb.freebsd.org/changeset/ports/512180 Log: u-boot-beaglebone: Add some fragment data to disable NAND Since u-boot merged the beaglebone defconfig with the am335x_evm ones eMMC support is seriously broken. Disabling NAND support (which isn't present on BBB) make this works again as they share some pins. Also remove the legacy_mmc targets as it is Linux centric. 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 Mon Sep 16 14:02:47 2019 (r512179) +++ head/sysutils/u-boot-beaglebone/Makefile Mon Sep 16 15:07:44 2019 (r512180) @@ -2,6 +2,8 @@ MASTERDIR= ${.CURDIR}/../u-boot-master +U_BOOT_SLAVE_PORTREVISION_2019.07= 1 + MODEL= beaglebone BOARD_CONFIG= am335x_evm_defconfig FAMILY= omap Modified: head/sysutils/u-boot-beaglebone/files/bbb_fragment ============================================================================== --- head/sysutils/u-boot-beaglebone/files/bbb_fragment Mon Sep 16 14:02:47 2019 (r512179) +++ head/sysutils/u-boot-beaglebone/files/bbb_fragment Mon Sep 16 15:07:44 2019 (r512180) @@ -1,4 +1,10 @@ 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; run distro_bootcmd" +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_SPL_NAND_SUPPORT=n +CONFIG_CMD_NAND=n +CONFIG_DFU_NAND=n +CONFIG_ENV_IS_IN_MMC=y +CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT"