From owner-svn-ports-head@freebsd.org Tue Feb 5 15:30:32 2019 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 375E914BD012; Tue, 5 Feb 2019 15:30:32 +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 C99EB77FBF; Tue, 5 Feb 2019 15:30: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 B37D31FC82; Tue, 5 Feb 2019 15:30: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 x15FUVpw061881; Tue, 5 Feb 2019 15:30:31 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x15FUUxR061873; Tue, 5 Feb 2019 15:30:30 GMT (envelope-from manu@FreeBSD.org) Message-Id: <201902051530.x15FUUxR061873@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Tue, 5 Feb 2019 15:30:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r492250 - in head: . sysutils sysutils/atf-allwinner sysutils/atf-master sysutils/atf-sun50i_a64 sysutils/u-boot-master X-SVN-Group: ports-head X-SVN-Commit-Author: manu X-SVN-Commit-Paths: in head: . sysutils sysutils/atf-allwinner sysutils/atf-master sysutils/atf-sun50i_a64 sysutils/u-boot-master X-SVN-Commit-Revision: 492250 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C99EB77FBF X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.99)[-0.986,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: Tue, 05 Feb 2019 15:30:32 -0000 Author: manu Date: Tue Feb 5 15:30:29 2019 New Revision: 492250 URL: https://svnweb.freebsd.org/changeset/ports/492250 Log: Add a new atf-master master port. ARM Arm Trusted Framework (sometimes called TF-A for reasons ...) provides a reference implementation of secure world software for Armv7-A and Armv8-A, including a Secure Monitor executing at Exception Level 3 (EL3). We had a port for Alwinner A64/H5 chip, but we need to introduced more ports. So convert this to a master/slave port scheme like u-boot. atf-allwinner is now badly named, when it was introduced it only support A64, now it both support A64 and H5 and there is another ATF platform for H6. Rename it with the platform name Added: head/sysutils/atf-master/ head/sysutils/atf-master/Makefile (contents, props changed) head/sysutils/atf-master/distinfo (contents, props changed) head/sysutils/atf-master/pkg-descr (contents, props changed) head/sysutils/atf-sun50i_a64/ - copied from r492249, head/sysutils/atf-allwinner/ Deleted: head/sysutils/atf-allwinner/ head/sysutils/atf-sun50i_a64/distinfo Modified: head/MOVED head/sysutils/Makefile head/sysutils/atf-sun50i_a64/Makefile head/sysutils/atf-sun50i_a64/pkg-descr head/sysutils/u-boot-master/Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Tue Feb 5 15:14:48 2019 (r492249) +++ head/MOVED Tue Feb 5 15:30:29 2019 (r492250) @@ -11587,3 +11587,4 @@ net-mgmt/icinga||2019-02-04|Removed, depends on expire net-mgmt/icli||2019-02-04|Removed, depends on expired net-mgmt/icinga-core net-mgmt/icinga-classicweb||2019-02-04|Has expired: Upstream EOLed Icinga 1.x from 2018-12-31 net-mgmt/pnp-icinga||2019-02-04|Removed, depends on expired net-mgmt/icinga-classicweb +sysutils/atf-allwinner|devel/atf-sun50i_a64|2019-02-05|Respect the ARM TF-A platform name Modified: head/sysutils/Makefile ============================================================================== --- head/sysutils/Makefile Tue Feb 5 15:14:48 2019 (r492249) +++ head/sysutils/Makefile Tue Feb 5 15:30:29 2019 (r492250) @@ -56,7 +56,7 @@ SUBDIR += asmem SUBDIR += asmon SUBDIR += asusoled - SUBDIR += atf-allwinner + SUBDIR += atf-sun50i_a64 SUBDIR += atitvout SUBDIR += atop SUBDIR += auto-admin Added: head/sysutils/atf-master/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/atf-master/Makefile Tue Feb 5 15:30:29 2019 (r492250) @@ -0,0 +1,40 @@ +# $FreeBSD$ + +PORTNAME= atf +PORTVERSION?= ${ATF_VERSION} +CATEGORIES= sysutils +PKGNAMESUFFIX?= -${PLAT} + +MAINTAINER= uboot@FreeBSD.org +COMMENT= ARM TF-A for platform ${PLAT} + +LICENSE= BSD3CLAUSE + +BUILD_DEPENDS+= aarch64-none-elf-gcc:devel/aarch64-none-elf-gcc + +USES= gmake + +USE_GITHUB= yes +GH_ACCOUNT= ARM-software +GH_PROJECT= arm-trusted-firmware +GH_TAGNAME= ${ATF_VERSION} + +SSP_UNSAFE= yes +MAKE_ENV+= CROSS_COMPILE="aarch64-none-elf-" +ALL_TARGET= ARCH="aarch64" PLAT=${PLAT} V=1 bl31 + +# Default to the latest release +ATF_VERSION?= v2.0 + +PLIST_FILES?= ${PREFIX}/share/${PORTNAME}-${PLAT}/${BL31:T} + +DESCR?= ${.CURDIR}/pkg-descr + +NO_ARCH= yes + +do-install: + ${MKDIR} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/ + ${INSTALL_DATA} ${WRKSRC}/build/${PLAT}/release/${BL31} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/ + ${INSTALL_DATA} ${DESCR} ${STAGEDIR}/${INST}/README + +.include Added: head/sysutils/atf-master/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/atf-master/distinfo Tue Feb 5 15:30:29 2019 (r492250) @@ -0,0 +1,3 @@ +TIMESTAMP = 1549376667 +SHA256 (ARM-software-arm-trusted-firmware-2.0.20181123-98aab97_GH0.tar.gz) = e5496f84f6cd550ed494d83e3c82fb75d8ebeb3d3034aa741e62cbdccfdc761c +SIZE (ARM-software-arm-trusted-firmware-2.0.20181123-98aab97_GH0.tar.gz) = 3385437 Added: head/sysutils/atf-master/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/atf-master/pkg-descr Tue Feb 5 15:30:29 2019 (r492250) @@ -0,0 +1 @@ +ARM TF-A (ATF) master port. Modified: head/sysutils/atf-sun50i_a64/Makefile ============================================================================== --- head/sysutils/atf-allwinner/Makefile Tue Feb 5 15:14:48 2019 (r492249) +++ head/sysutils/atf-sun50i_a64/Makefile Tue Feb 5 15:30:29 2019 (r492250) @@ -1,34 +1,10 @@ # $FreeBSD$ -PORTNAME= atf-allwinner +MASTERDIR= ${.CURDIR}/../atf-master + PORTVERSION= 2.0.20181123 -PORTREVISION= 1 -CATEGORIES= sysutils +ATF_VERSION= 98aab97 +PLAT= sun50i_a64 +BL31= bl31.bin -MAINTAINER= manu@FreeBSD.org -COMMENT= Arm Trusted Framework for Allwinner SoCs - -LICENSE= BSD3CLAUSE - -BUILD_DEPENDS= aarch64-none-elf-gcc:devel/aarch64-none-elf-gcc - -USES= gmake - -USE_GITHUB= yes -GH_ACCOUNT= ARM-software -GH_PROJECT= arm-trusted-firmware -GH_TAGNAME= 98aab97 - -SSP_UNSAFE= yes -MAKE_ENV+= CROSS_COMPILE="aarch64-none-elf-" -ALL_TARGET= ARCH="aarch64" PLAT=sun50i_a64 V=1 bl31 - -PLIST_FILES= ${PREFIX}/share/${PORTNAME}/bl31.bin - -NO_ARCH= yes - -do-install: - ${MKDIR} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}/ - ${INSTALL_DATA} ${WRKSRC}/build/sun50i_a64/release/bl31.bin ${STAGEDIR}/${PREFIX}/share/${PORTNAME}/ - -.include +.include "${MASTERDIR}/Makefile" Modified: head/sysutils/atf-sun50i_a64/pkg-descr ============================================================================== --- head/sysutils/atf-allwinner/pkg-descr Tue Feb 5 15:14:48 2019 (r492249) +++ head/sysutils/atf-sun50i_a64/pkg-descr Tue Feb 5 15:30:29 2019 (r492250) @@ -1,4 +1,4 @@ -Arm Trusted Framework for Allwinner 64 Bits SoCs +Arm Trusted Framework for Allwinner A64/H5 SoCs Trusted Firmware-A (TF-A) provides a reference implementation of secure world software for Armv7-A and Armv8-A, including a Secure Monitor executing at Modified: head/sysutils/u-boot-master/Makefile ============================================================================== --- head/sysutils/u-boot-master/Makefile Tue Feb 5 15:14:48 2019 (r492249) +++ head/sysutils/u-boot-master/Makefile Tue Feb 5 15:30:29 2019 (r492250) @@ -125,8 +125,8 @@ UBOOT_MOVE=${UBOOT_MOVE_${FAMILY:tu}} # Per family dependancies .if defined(FAMILY) && ${FAMILY} == allwinner64 -BUILD_DEPENDS+= ${LOCALBASE}/share/atf-allwinner/bl31.bin:sysutils/atf-allwinner -MAKE_ENV+= BL31=${LOCALBASE}/share/atf-allwinner/bl31.bin +BUILD_DEPENDS+= ${LOCALBASE}/share/atf-sun50i_a64/bl31.bin:sysutils/atf-sun50i_a64 +MAKE_ENV+= BL31=${LOCALBASE}/share/atf-sun50i_a64/bl31.bin .endif # Each u-boot family has different files to include, bring them in.