From owner-svn-ports-head@freebsd.org Fri Aug 10 15:49:15 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 100DE106E96B; Fri, 10 Aug 2018 15:49:15 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B615E7088D; Fri, 10 Aug 2018 15:49:14 +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 9454D2249; Fri, 10 Aug 2018 15:49:14 +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 w7AFnEOL053188; Fri, 10 Aug 2018 15:49:14 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7AFnDxZ053184; Fri, 10 Aug 2018 15:49:13 GMT (envelope-from manu@FreeBSD.org) Message-Id: <201808101549.w7AFnDxZ053184@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Fri, 10 Aug 2018 15:49:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r476839 - in head/sysutils: u-boot-beaglebone u-boot-beaglebone/files u-boot-master u-boot-master/files u-boot-riotboard X-SVN-Group: ports-head X-SVN-Commit-Author: manu X-SVN-Commit-Paths: in head/sysutils: u-boot-beaglebone u-boot-beaglebone/files u-boot-master u-boot-master/files u-boot-riotboard X-SVN-Commit-Revision: 476839 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.27 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: Fri, 10 Aug 2018 15:49:15 -0000 Author: manu (src committer) Date: Fri Aug 10 15:49:13 2018 New Revision: 476839 URL: https://svnweb.freebsd.org/changeset/ports/476839 Log: sysutils/u-boot-master etc.: u-boot Improvement for 2018.07 - Add metadata for IMX6 family - While here rename the riotboard family to IMX6 as it should have been - Remove the cache patches, they aren't needed anymore. I should have checked that with the 2018.07 update - beaglebone use a custom bootcmd that calls envboot, this command will try to load and source the file boot.scr (u-boot script) from the mmc. For some reason it seems to corrupts some memory or something because loading and executing ubldr.bin after running this command will either hang or cause an exception on undefined instruction. I'll check with upstream but in the meantime use a special fragment that redefine the bootcmd. Note that since u-boot will load the environment from the eMMC, one need to 'env default -f -a; saveenv' to have the bootcmd variable correctly redefined. Reviewed by: imp Approved by: imp Differential Revision: https://reviews.freebsd.org/D16599 Added: head/sysutils/u-boot-beaglebone/files/ head/sysutils/u-boot-beaglebone/files/bbb_fragment (contents, props changed) Deleted: head/sysutils/u-boot-master/files/patch-api_api.c head/sysutils/u-boot-master/files/patch-cmd_boot.c head/sysutils/u-boot-master/files/patch-cmd_elf.c Modified: head/sysutils/u-boot-beaglebone/Makefile head/sysutils/u-boot-master/Makefile head/sysutils/u-boot-riotboard/Makefile Modified: head/sysutils/u-boot-beaglebone/Makefile ============================================================================== --- head/sysutils/u-boot-beaglebone/Makefile Fri Aug 10 14:55:06 2018 (r476838) +++ head/sysutils/u-boot-beaglebone/Makefile Fri Aug 10 15:49:13 2018 (r476839) @@ -6,4 +6,7 @@ MODEL= beaglebone BOARD_CONFIG= am335x_boneblack_defconfig FAMILY= omap +CONFIG_FRAGMENT= ${.CURDIR}/files/bbb_fragment +FRAGMENT_NAME= bbb_fragment + .include "${MASTERDIR}/Makefile" Added: head/sysutils/u-boot-beaglebone/files/bbb_fragment ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/u-boot-beaglebone/files/bbb_fragment Fri Aug 10 15:49:13 2018 (r476839) @@ -0,0 +1,4 @@ +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" Modified: head/sysutils/u-boot-master/Makefile ============================================================================== --- head/sysutils/u-boot-master/Makefile Fri Aug 10 14:55:06 2018 (r476838) +++ head/sysutils/u-boot-master/Makefile Fri Aug 10 15:49:13 2018 (r476839) @@ -5,7 +5,7 @@ PORTNAME= u-boot PORTVERSION= ${UBOOT_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils PKGNAMESUFFIX?= -${MODEL} MASTER_SITES= ftp://ftp.denx.de/pub/u-boot/ @@ -83,6 +83,12 @@ UBOOT_MOVE_ZYNQ_7000=${WRKSRC}/spl/boot.bin ${.CURDIR} UBOOT_PLIST_RPI= u-boot.bin UBOOT_METADATA_RPI_FILES= ${UBOOT_PLIST_RPI} UBOOT_METADATA_RPI_METHOD= file + +# Overrides for IMX6 family +UBOOT_METADATA_IMX6_FILES= u-boot.imx +UBOOT_METADATA_IMX6_METHOD= raw +UBOOT_METADATA_IMX6_RAW_OFFSET= 2 +UBOOT_METADATA_IMX6_RAW_BS= 512 # Uboot variables .if !defined(UBOOT_VERSION) && defined(UBOOT_VERSION_${FAMILY:tu}) Modified: head/sysutils/u-boot-riotboard/Makefile ============================================================================== --- head/sysutils/u-boot-riotboard/Makefile Fri Aug 10 14:55:06 2018 (r476838) +++ head/sysutils/u-boot-riotboard/Makefile Fri Aug 10 15:49:13 2018 (r476839) @@ -4,7 +4,7 @@ MASTERDIR= ${.CURDIR}/../u-boot-master MODEL= riotboard BOARD_CONFIG= riotboard_defconfig -FAMILY= riotboard +FAMILY= imx6 UBOOT_PLIST= u-boot.imx