From owner-svn-ports-all@freebsd.org Wed Oct 9 19:54:31 2019 Return-Path: Delivered-To: svn-ports-all@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 CD78912DB04; Wed, 9 Oct 2019 19:54:31 +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 46pQ0R4smbz3wjp; Wed, 9 Oct 2019 19:54:31 +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 8A3BE1D97A; Wed, 9 Oct 2019 19:54:31 +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 x99JsVgs000273; Wed, 9 Oct 2019 19:54:31 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x99JsUn6000270; Wed, 9 Oct 2019 19:54:30 GMT (envelope-from manu@FreeBSD.org) Message-Id: <201910091954.x99JsUn6000270@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Wed, 9 Oct 2019 19:54:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r514189 - in head/sysutils: u-boot-master u-boot-rock64 X-SVN-Group: ports-head X-SVN-Commit-Author: manu X-SVN-Commit-Paths: in head/sysutils: u-boot-master u-boot-rock64 X-SVN-Commit-Revision: 514189 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Oct 2019 19:54:31 -0000 Author: manu Date: Wed Oct 9 19:54:30 2019 New Revision: 514189 URL: https://svnweb.freebsd.org/changeset/ports/514189 Log: sysutils/u-boot-rock64: Add two DRAM related patches Add two new patches related to DRAM controller initialization. This allow us to use SPL+TPL from mainline u-boot and not relying on RockChip miniloader anymore. Thanks to jmcneill@NetBSD.Org for the tip. Modified: head/sysutils/u-boot-master/Makefile head/sysutils/u-boot-master/distinfo head/sysutils/u-boot-rock64/Makefile Modified: head/sysutils/u-boot-master/Makefile ============================================================================== --- head/sysutils/u-boot-master/Makefile Wed Oct 9 19:29:47 2019 (r514188) +++ head/sysutils/u-boot-master/Makefile Wed Oct 9 19:54:30 2019 (r514189) @@ -151,7 +151,6 @@ MAKE_ENV+= BL31=${LOCALBASE}/share/atf-sun50i_a64/bl31 .if defined(FAMILY) && ${FAMILY} == rk3328 BUILD_DEPENDS+= ${LOCALBASE}/share/atf-rk3328/bl31.elf:sysutils/atf-rk3328 \ - ${LOCALBASE}/share/linux-rkbin/bin/rk33/rk3328_ddr_333MHz_v1.16.bin:sysutils/linux-rkbin \ ${PYTHON_PKGNAMEPREFIX}pyelftools>0:devel/py-pyelftools@${PY_FLAVOR} MAKE_ENV+= BL31=${LOCALBASE}/share/atf-rk3328/bl31.elf .endif @@ -219,10 +218,6 @@ post-build: .for i in ${UBOOT_EXTRA_TARGETS} (cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${i}) .endfor -.endif -.if defined(FAMILY) && ${FAMILY} == rk3328 - mkimage -n rk3328 -T rksd -d ${LOCALBASE}/share/linux-rkbin/bin/rk33/rk3328_ddr_333MHz_v1.16.bin ${WRKSRC}/idbloader.img - cat ${WRKSRC}/spl/u-boot-spl.bin >> ${WRKSRC}/idbloader.img .endif # If we need to put anything into WRKSRC, do so now so we can build the PLIST # in do-install Modified: head/sysutils/u-boot-master/distinfo ============================================================================== --- head/sysutils/u-boot-master/distinfo Wed Oct 9 19:29:47 2019 (r514188) +++ head/sysutils/u-boot-master/distinfo Wed Oct 9 19:54:30 2019 (r514189) @@ -1,4 +1,4 @@ -TIMESTAMP = 1570557780 +TIMESTAMP = 1570649997 SHA256 (u-boot/u-boot-2019.10.tar.bz2) = 8d6d6070739522dd236cba7055b8736bfe92b4fac0ea18ad809829ca79667014 SIZE (u-boot/u-boot-2019.10.tar.bz2) = 14214608 SHA256 (u-boot/939129/raw) = 2a4ebf283aec8e74ec77b3cb071c6883f73807454ca94fea78361c7391187b97 @@ -7,3 +7,7 @@ SHA256 (u-boot/1036621/raw) = 28dbd66d14fab9dc782ce091 SIZE (u-boot/1036621/raw) = 480 SHA256 (u-boot/1173473/raw) = 4f182d6f99b1d868237607200d64a1d8a2d57ea44fc25ca49bce929ad6457228 SIZE (u-boot/1173473/raw) = 433 +SHA256 (u-boot/1172554/raw) = d1a39d7d6487cfb481392e7ea4f0bf0d209c08e0c3426c29d7eeaeb9b806cf42 +SIZE (u-boot/1172554/raw) = 640 +SHA256 (u-boot/1172555/raw) = 09d17a62fb6bc7c7ab73bfc7061fc5da2b5a32e7deb098c9f76aed8ff8991751 +SIZE (u-boot/1172555/raw) = 568 Modified: head/sysutils/u-boot-rock64/Makefile ============================================================================== --- head/sysutils/u-boot-rock64/Makefile Wed Oct 9 19:29:47 2019 (r514188) +++ head/sysutils/u-boot-rock64/Makefile Wed Oct 9 19:54:30 2019 (r514189) @@ -2,7 +2,11 @@ MASTERDIR= ${.CURDIR}/../u-boot-master -PATCHFILES+= 1173473/raw +U_BOOT_SLAVE_PORTREVISION_2019.10= 1 + +PATCHFILES+= 1173473/raw \ + 1172554/raw \ + 1172555/raw MODEL= rock64 BOARD_CONFIG= rock64-rk3328_defconfig