From owner-svn-ports-head@freebsd.org Sat Jul 27 14:56:01 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 F3F9DBB7F6; Sat, 27 Jul 2019 14:56:00 +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 D630D88DB6; Sat, 27 Jul 2019 14:56:00 +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 B087EFB1; Sat, 27 Jul 2019 14:56:00 +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 x6REu00C088883; Sat, 27 Jul 2019 14:56:00 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6REtxsY088876; Sat, 27 Jul 2019 14:55:59 GMT (envelope-from manu@FreeBSD.org) Message-Id: <201907271455.x6REtxsY088876@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Sat, 27 Jul 2019 14:55:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r507459 - in head/sysutils: . u-boot-master u-boot-rockpro64 X-SVN-Group: ports-head X-SVN-Commit-Author: manu X-SVN-Commit-Paths: in head/sysutils: . u-boot-master u-boot-rockpro64 X-SVN-Commit-Revision: 507459 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D630D88DB6 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.92 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.92)[-0.923,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] 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: Sat, 27 Jul 2019 14:56:01 -0000 Author: manu Date: Sat Jul 27 14:55:59 2019 New Revision: 507459 URL: https://svnweb.freebsd.org/changeset/ports/507459 Log: sysutils/u-boot-rockpro64: Add new u-boot port for Pine64 RockPro64 board This use the DDR blob and miniloader from RockChip + trust FW + ATF + u-boot proper. Added: head/sysutils/u-boot-rockpro64/ head/sysutils/u-boot-rockpro64/Makefile (contents, props changed) head/sysutils/u-boot-rockpro64/pkg-descr (contents, props changed) Modified: head/sysutils/Makefile head/sysutils/u-boot-master/Makefile Modified: head/sysutils/Makefile ============================================================================== --- head/sysutils/Makefile Sat Jul 27 14:54:09 2019 (r507458) +++ head/sysutils/Makefile Sat Jul 27 14:55:59 2019 (r507459) @@ -1401,6 +1401,7 @@ SUBDIR += u-boot-pinebook SUBDIR += u-boot-riotboard SUBDIR += u-boot-rock64 + SUBDIR += u-boot-rockpro64 SUBDIR += u-boot-rpi SUBDIR += u-boot-rpi-0-w SUBDIR += u-boot-rpi2 Modified: head/sysutils/u-boot-master/Makefile ============================================================================== --- head/sysutils/u-boot-master/Makefile Sat Jul 27 14:54:09 2019 (r507458) +++ head/sysutils/u-boot-master/Makefile Sat Jul 27 14:55:59 2019 (r507459) @@ -22,6 +22,10 @@ BUILD_DEPENDS+= gsed:textproc/gsed \ BUILD_DEPENDS+= ${COMPILER}:devel/${COMPILER} USES= bison gmake python:2.7,build shebangfix tar:bz2 +.if defined(FAMILY) && ${FAMILY} == rk3399 +USES+= linux +USE_LINUX+= base:build +.endif BINARY_ALIAS= bison=${LOCALBASE}/bin/bison dtc=${LOCALBASE}/bin/dtc sed=gsed swig=swig3.0 python2=python2.7 SHEBANG_FILES= tools/binman/binman.py arch/arm/mach-rockchip/make_fit_atf.py @@ -94,7 +98,7 @@ UBOOT_PLIST_RK3328= idbloader.img u-boot.itb UBOOT_ARCH_RK3328= aarch64 # Override for RK3399 family -UBOOT_PLIST_RK3399= idbspl.img u-boot.itb +UBOOT_PLIST_RK3399= idbloader.img trust.img uboot.img UBOOT_ARCH_RK3399= aarch64 # Override for ARMADA38X family @@ -146,13 +150,15 @@ 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 \ - ${PYTHON_PKGNAMEPREFIX}pyelftools>0:devel/py-pyelftools@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}pyelftools>0:devel/py-pyelftools@${PY_FLAVOR} \ + ${LOCALBASE}/bin/rk-trust_merger:sysutils/linux-rkbin MAKE_ENV+= BL31=${LOCALBASE}/share/atf-rk3328/bl31.elf .endif .if defined(FAMILY) && ${FAMILY} == rk3399 BUILD_DEPENDS+= ${LOCALBASE}/share/atf-rk3399/bl31.elf:sysutils/atf-rk3399 \ - ${PYTHON_PKGNAMEPREFIX}pyelftools>0:devel/py-pyelftools@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}pyelftools>0:devel/py-pyelftools@${PY_FLAVOR} \ + ${LOCALBASE}/bin/rk-trust_merger:sysutils/linux-rkbin MAKE_ENV+= BL31=${LOCALBASE}/share/atf-rk3399/bl31.elf .endif @@ -219,7 +225,10 @@ post-build: cat ${WRKSRC}/spl/u-boot-spl.bin >> ${WRKSRC}/idbloader.img .endif .if defined(FAMILY) && ${FAMILY} == rk3399 - mkimage -n rk3399 -T rksd -d ${WRKSRC}/spl/u-boot-spl.bin ${WRKSRC}/idbspl.img + mkimage -n rk3399 -T rksd -d ${LOCALBASE}/share/linux-rkbin/bin/rk33/rk3399_ddr_800MHz_v1.23.bin ${WRKSRC}/idbloader.img + cat ${LOCALBASE}/share/linux-rkbin/bin/rk33/rk3399_miniloader_v1.19.bin >> ${WRKSRC}/idbloader.img + (cd ${WRKSRC} && rk-trust_merger ${LOCALBASE}/share/linux-rkbin/rktrust/RK3399TRUST.ini) + (cd ${WRKSRC} && rk-loaderimage --pack --uboot u-boot-dtb.bin uboot.img) .endif # If we need to put anything into WRKSRC, do so now so we can build the PLIST # in do-install Added: head/sysutils/u-boot-rockpro64/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/u-boot-rockpro64/Makefile Sat Jul 27 14:55:59 2019 (r507459) @@ -0,0 +1,9 @@ +# $FreeBSD$ + +MASTERDIR= ${.CURDIR}/../u-boot-master + +MODEL= rockpro64 +BOARD_CONFIG= rockpro64-rk3399_defconfig +FAMILY= rk3399 + +.include "${MASTERDIR}/Makefile" Added: head/sysutils/u-boot-rockpro64/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/u-boot-rockpro64/pkg-descr Sat Jul 27 14:55:59 2019 (r507459) @@ -0,0 +1,8 @@ +U-Boot loader and related files for the Pine64 RockPro64. + +To install this bootloader on an sdcard just do: +dd if=/usr/local/share/u-boot/u-boot-rockpro64/idbloader.img of=/path/to/sdcarddevice seek=64 bs=512 conv=sync +dd if=/usr/local/share/u-boot/u-boot-rockpro64/trust.img of=/path/to/sdcarddevice seek=24576 bs=512 conv=sync +dd if=/usr/local/share/u-boot/u-boot-rockpro64/uboot.img of=/path/to/sdcarddevice seek=16384 bs=512 conv=sync + +WWW: http://www.denx.de/wiki/U-Boot