CVS commit: pkgsrc/sysutils

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/sysutils
From: "matthew green" <mrg%netbsd.org@localhost>
Date: Wed, 9 Feb 2022 01:57:57 +0000

Module Name:    pkgsrc
Committed By:   mrg
Date:           Wed Feb  9 01:57:57 UTC 2022

Modified Files:
        pkgsrc/sysutils: Makefile
Added Files:
        pkgsrc/sysutils/trusted-firmware-a: distinfo trusted-firmware-a-dist.mk
            trusted-firmware-a.mk
        pkgsrc/sysutils/trusted-firmware-a-fiptool: DESCR Makefile PLIST
            distinfo
        pkgsrc/sysutils/trusted-firmware-a-fiptool/patches: patch-Makefile
        pkgsrc/sysutils/trusted-firmware-a-rk3328: DESCR Makefile PLIST
            buildlink3.mk
        pkgsrc/sysutils/trusted-firmware-a-rk3399: DESCR Makefile PLIST
            buildlink3.mk

Log Message:
Add Trusted Firmware-A (TF-A, the new name for Arm'sATF) v2.6 with
support for rk3328 (not yet tested), rk3399 (tested), and fiptool.

these will obsolete the existing arm-trusted-firmware* (v2.3) packages
once all consumers are updated and tested, and currently the sun50i_a64
and sun50i-h6 targets are not yet available.


To generate a diff of this commit:
cvs rdiff -u -r1.990 -r1.991 pkgsrc/sysutils/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/trusted-firmware-a/distinfo \
    pkgsrc/sysutils/trusted-firmware-a/trusted-firmware-a-dist.mk \
    pkgsrc/sysutils/trusted-firmware-a/trusted-firmware-a.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/trusted-firmware-a-fiptool/DESCR \
    pkgsrc/sysutils/trusted-firmware-a-fiptool/Makefile \
    pkgsrc/sysutils/trusted-firmware-a-fiptool/PLIST \
    pkgsrc/sysutils/trusted-firmware-a-fiptool/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/trusted-firmware-a-fiptool/patches/patch-Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/trusted-firmware-a-rk3328/DESCR \
    pkgsrc/sysutils/trusted-firmware-a-rk3328/Makefile \
    pkgsrc/sysutils/trusted-firmware-a-rk3328/PLIST \
    pkgsrc/sysutils/trusted-firmware-a-rk3328/buildlink3.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/trusted-firmware-a-rk3399/DESCR \
    pkgsrc/sysutils/trusted-firmware-a-rk3399/Makefile \
    pkgsrc/sysutils/trusted-firmware-a-rk3399/PLIST \
    pkgsrc/sysutils/trusted-firmware-a-rk3399/buildlink3.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/Makefile
diff -u pkgsrc/sysutils/Makefile:1.990 pkgsrc/sysutils/Makefile:1.991
--- pkgsrc/sysutils/Makefile:1.990      Sat Feb  5 03:14:19 2022
+++ pkgsrc/sysutils/Makefile    Wed Feb  9 01:57:57 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.990 2022/02/05 03:14:19 ryoon Exp $
+# $NetBSD: Makefile,v 1.991 2022/02/09 01:57:57 mrg Exp $
 #
 
 COMMENT=       System utilities
@@ -706,6 +706,9 @@ SUBDIR+=    tphdisk
 SUBDIR+=       trash
 SUBDIR+=       tre-command
 SUBDIR+=       tree
+SUBDIR+=       trusted-firmware-a-fiptool
+SUBDIR+=       trusted-firmware-a-rk3328
+SUBDIR+=       trusted-firmware-a-rk3399
 SUBDIR+=       ts
 SUBDIR+=       tsm8
 SUBDIR+=       ttyplot

Added files:

Index: pkgsrc/sysutils/trusted-firmware-a/distinfo
diff -u /dev/null pkgsrc/sysutils/trusted-firmware-a/distinfo:1.1
--- /dev/null   Wed Feb  9 01:57:57 2022
+++ pkgsrc/sysutils/trusted-firmware-a/distinfo Wed Feb  9 01:57:57 2022
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2022/02/09 01:57:57 mrg Exp $
+
+BLAKE2s (arm-trusted-firmware-2.6.zip) = 00bfe714f77eb95a3fbbbe1a89667aa9ce70f55bcde4e8f0a8c36ac36d78ece1
+SHA512 (arm-trusted-firmware-2.6.zip) = 3d5ef0f39017aad6bc469ba367604941e0aa7f5ce69f1709492e282aaff8188ff18ee7a224271c3d6c0479cac98954feb6faf9355c83a7351d8693ae61beac03
+Size (arm-trusted-firmware-2.6.zip) = 8010252 bytes
Index: pkgsrc/sysutils/trusted-firmware-a/trusted-firmware-a-dist.mk
diff -u /dev/null pkgsrc/sysutils/trusted-firmware-a/trusted-firmware-a-dist.mk:1.1
--- /dev/null   Wed Feb  9 01:57:57 2022
+++ pkgsrc/sysutils/trusted-firmware-a/trusted-firmware-a-dist.mk       Wed Feb  9 01:57:57 2022
@@ -0,0 +1,20 @@
+# $NetBSD: trusted-firmware-a-dist.mk,v 1.1 2022/02/09 01:57:57 mrg Exp $
+
+# When updating, don't forget to also update trusted-firmware-a-fiptool.
+VERSION=       2.6
+
+GITHUB_PROJECT=        arm-trusted-firmware
+GITHUB_TAG=    v${VERSION}
+
+DISTNAME=      ${GITHUB_PROJECT}-${VERSION}
+DISTINFO_FILE?=        ${.CURDIR}/../../sysutils/trusted-firmware-a/distinfo
+CATEGORIES=    sysutils
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=ARM-software/}
+EXTRACT_SUFX=  .zip
+PATCHDIR?=     ${.CURDIR}/../../sysutils/trusted-firmware-a/patches
+
+MAINTAINER=    port-arm%NetBSD.org@localhost
+HOMEPAGE=      https://github.com/ARM-software/arm-trusted-firmware/
+LICENSE=       modified-bsd
+
+USE_TOOLS+=    gmake
Index: pkgsrc/sysutils/trusted-firmware-a/trusted-firmware-a.mk
diff -u /dev/null pkgsrc/sysutils/trusted-firmware-a/trusted-firmware-a.mk:1.1
--- /dev/null   Wed Feb  9 01:57:57 2022
+++ pkgsrc/sysutils/trusted-firmware-a/trusted-firmware-a.mk    Wed Feb  9 01:57:57 2022
@@ -0,0 +1,52 @@
+# $NetBSD: trusted-firmware-a.mk,v 1.1 2022/02/09 01:57:57 mrg Exp $
+
+.include "../../sysutils/trusted-firmware-a/trusted-firmware-a-dist.mk"
+
+PKGNAME?=      trusted-firmware-a-${PLATFORM}-${VERSION}
+
+RELRO_SUPPORTED=       no
+MAKE_FLAGS+=   CROSS_COMPILE=${PREFIX}/cross-aarch64-none-elf/bin/aarch64-none-elf-
+.if !empty(ATF_CORTEX_M0:Myes)
+MAKE_FLAGS+=   M0_CROSS_COMPILE=${PREFIX}/cross-arm-none-eabi/bin/arm-none-eabi-
+.endif
+MAKE_FLAGS+=   PLAT=${PLATFORM}
+MAKE_FLAGS+=   CFLAGS='-gdwarf-2'
+#MAKE_FLAGS+=  DEBUG=1
+#MAKE_FLAGS+=  LOG_LEVEL=50
+#MAKE_FLAGS+=  V=1
+MAKE_FLAGS+=   BUILD_STRING=${GITHUB_TAG}
+BUILD_TARGET=  bl31
+
+BUILD_DEPENDS+=        cross-aarch64-none-elf-gcc-[0-9]*:../../cross/aarch64-none-elf-gcc
+.if !empty(ATF_CORTEX_M0:Myes)
+BUILD_DEPENDS+=        cross-arm-none-eabi-gcc-[0-9]*:../../cross/arm-none-eabi-gcc
+.endif
+
+.if empty(MAKE_FLAGS:MDEBUG=1)
+BL31_DIR=release
+.else
+BL31_DIR=debug
+.endif
+
+BL31_SUFFIX?=  bin
+
+.if !target(do-install)
+do-install:
+       ${INSTALL_DATA_DIR} \
+            ${DESTDIR}${PREFIX}/share/trusted-firmware-a/${PLATFORM}
+.if ${BL31_SUFFIX} == "bin"
+       ${INSTALL_DATA} \
+           ${WRKSRC}/build/${PLATFORM}/${BL31_DIR}/bl31.${BL31_SUFFIX} \
+           ${DESTDIR}${PREFIX}/share/trusted-firmware-a/${PLATFORM}/
+.else
+       ${INSTALL_DATA} \
+           ${WRKSRC}/build/${PLATFORM}/${BL31_DIR}/bl31/bl31.${BL31_SUFFIX} \
+           ${DESTDIR}${PREFIX}/share/trusted-firmware-a/${PLATFORM}/
+.endif
+.endif
+
+# XXX kludge. pkgsrc passes down run path flags in LDFLAGS assuming
+# gcc is used for linking, but here we call the linker directly.
+COMPILER_RPATH_FLAG=   -R
+
+.include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/trusted-firmware-a-fiptool/DESCR
diff -u /dev/null pkgsrc/sysutils/trusted-firmware-a-fiptool/DESCR:1.1
--- /dev/null   Wed Feb  9 01:57:57 2022
+++ pkgsrc/sysutils/trusted-firmware-a-fiptool/DESCR    Wed Feb  9 01:57:57 2022
@@ -0,0 +1,20 @@
+Trusted Firmware-A (TF-A) provides a reference implementation of secure
+world software for ARMv8-A, including a Secure Monitor executing at
+Exception Level 3 (EL3). It implements various ARM interface standards,
+such as:
+
+    The Power State Coordination Interface (PSCI)
+    Trusted Board Boot Requirements (TBBR, ARM DEN0006C-1)
+    SMC Calling Convention
+    System Control and Management Interface
+
+As far as possible the code is designed for reuse or porting to other
+ARMv8-A model and hardware platforms.
+
+ARM will continue development in collaboration with interested parties to
+provide a full reference implementation of Secure Monitor code and ARM
+standards to the benefit of all developers working with ARMv8-A TrustZone
+technology.
+
+This package provides "fiptool", used to wrap parts of trusted firmware
+with u-boot.
Index: pkgsrc/sysutils/trusted-firmware-a-fiptool/Makefile
diff -u /dev/null pkgsrc/sysutils/trusted-firmware-a-fiptool/Makefile:1.1
--- /dev/null   Wed Feb  9 01:57:57 2022
+++ pkgsrc/sysutils/trusted-firmware-a-fiptool/Makefile Wed Feb  9 01:57:57 2022
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile,v 1.1 2022/02/09 01:57:57 mrg Exp $
+
+# We override WRKSRC, so we provide our own patches (and thus distinfo)
+DISTINFO_FILE= ${.CURDIR}/distinfo
+PATCHDIR=      ${.CURDIR}/patches
+
+.include "../../sysutils/trusted-firmware-a/trusted-firmware-a-dist.mk"
+
+PKGNAME=       ${DISTNAME:S/arm-trusted-firmware/trusted-firmware-a-fiptool/}
+WRKSRC=                ${WRKDIR}/${DISTNAME}/tools/fiptool
+
+INSTALLATION_DIRS=     bin
+
+do-install:
+       ${INSTALL_PROGRAM} ${WRKSRC}/fiptool ${DESTDIR}${PREFIX}/bin
+
+.include "../../security/openssl/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/trusted-firmware-a-fiptool/PLIST
diff -u /dev/null pkgsrc/sysutils/trusted-firmware-a-fiptool/PLIST:1.1
--- /dev/null   Wed Feb  9 01:57:57 2022
+++ pkgsrc/sysutils/trusted-firmware-a-fiptool/PLIST    Wed Feb  9 01:57:57 2022
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2022/02/09 01:57:57 mrg Exp $
+bin/fiptool
Index: pkgsrc/sysutils/trusted-firmware-a-fiptool/distinfo
diff -u /dev/null pkgsrc/sysutils/trusted-firmware-a-fiptool/distinfo:1.1
--- /dev/null   Wed Feb  9 01:57:57 2022
+++ pkgsrc/sysutils/trusted-firmware-a-fiptool/distinfo Wed Feb  9 01:57:57 2022
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2022/02/09 01:57:57 mrg Exp $
+
+BLAKE2s (arm-trusted-firmware-2.6.zip) = 00bfe714f77eb95a3fbbbe1a89667aa9ce70f55bcde4e8f0a8c36ac36d78ece1
+SHA512 (arm-trusted-firmware-2.6.zip) = 3d5ef0f39017aad6bc469ba367604941e0aa7f5ce69f1709492e282aaff8188ff18ee7a224271c3d6c0479cac98954feb6faf9355c83a7351d8693ae61beac03
+Size (arm-trusted-firmware-2.6.zip) = 8010252 bytes
+SHA1 (patch-Makefile) = 90cedf2c6c04fbf00bd8b2782add95b46c2ebcc0

Index: pkgsrc/sysutils/trusted-firmware-a-fiptool/patches/patch-Makefile
diff -u /dev/null pkgsrc/sysutils/trusted-firmware-a-fiptool/patches/patch-Makefile:1.1
--- /dev/null   Wed Feb  9 01:57:57 2022
+++ pkgsrc/sysutils/trusted-firmware-a-fiptool/patches/patch-Makefile   Wed Feb  9 01:57:57 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile,v 1.1 2022/02/09 01:57:57 mrg Exp $
+
+Honor LDFLAGS.
+
+--- Makefile.orig      2020-04-20 15:56:43.000000000 +0000
++++ Makefile   2020-06-22 01:21:57.959255753 +0000
+@@ -37,7 +37,7 @@ all: ${PROJECT}
+ 
+ ${PROJECT}: ${OBJECTS} Makefile
+       @echo "  HOSTLD  $@"
+-      ${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDLIBS}
++      ${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDFLAGS} ${LDLIBS}
+       @${ECHO_BLANK_LINE}
+       @echo "Built $@ successfully"
+       @${ECHO_BLANK_LINE}

Index: pkgsrc/sysutils/trusted-firmware-a-rk3328/DESCR
diff -u /dev/null pkgsrc/sysutils/trusted-firmware-a-rk3328/DESCR:1.1
--- /dev/null   Wed Feb  9 01:57:57 2022
+++ pkgsrc/sysutils/trusted-firmware-a-rk3328/DESCR     Wed Feb  9 01:57:57 2022
@@ -0,0 +1,20 @@
+Trusted Firmware-A (TF-A) provides a reference implementation of secure
+world software for ARMv8-A, including a Secure Monitor executing at
+Exception Level 3 (EL3). It implements various ARM interface standards,
+such as:
+
+    The Power State Coordination Interface (PSCI)
+    Trusted Board Boot Requirements (TBBR, ARM DEN0006C-1)
+    SMC Calling Convention
+    System Control and Management Interface
+
+As far as possible the code is designed for reuse or porting to other
+ARMv8-A model and hardware platforms.
+
+ARM will continue development in collaboration with interested parties to
+provide a full reference implementation of Secure Monitor code and ARM
+standards to the benefit of all developers working with ARMv8-A TrustZone
+technology.
+
+This package provides mainline TF-A for the RockChip RK3328 platform,
+for example used by u-boot for the Pine64 Rock64.
Index: pkgsrc/sysutils/trusted-firmware-a-rk3328/Makefile
diff -u /dev/null pkgsrc/sysutils/trusted-firmware-a-rk3328/Makefile:1.1
--- /dev/null   Wed Feb  9 01:57:57 2022
+++ pkgsrc/sysutils/trusted-firmware-a-rk3328/Makefile  Wed Feb  9 01:57:57 2022
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2022/02/09 01:57:57 mrg Exp $
+
+PLATFORM=      rk3328
+COMMENT=       ARM Trusted Firmware for Rockchip RK3328 SoCs
+
+BL31_SUFFIX=   elf
+
+.include "../../sysutils/trusted-firmware-a/trusted-firmware-a.mk"
Index: pkgsrc/sysutils/trusted-firmware-a-rk3328/PLIST
diff -u /dev/null pkgsrc/sysutils/trusted-firmware-a-rk3328/PLIST:1.1
--- /dev/null   Wed Feb  9 01:57:57 2022
+++ pkgsrc/sysutils/trusted-firmware-a-rk3328/PLIST     Wed Feb  9 01:57:57 2022
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2022/02/09 01:57:57 mrg Exp $
+share/trusted-firmware-a/rk3328/bl31.elf
Index: pkgsrc/sysutils/trusted-firmware-a-rk3328/buildlink3.mk
diff -u /dev/null pkgsrc/sysutils/trusted-firmware-a-rk3328/buildlink3.mk:1.1
--- /dev/null   Wed Feb  9 01:57:57 2022
+++ pkgsrc/sysutils/trusted-firmware-a-rk3328/buildlink3.mk     Wed Feb  9 01:57:57 2022
@@ -0,0 +1,15 @@
+# $NetBSD: buildlink3.mk,v 1.1 2022/02/09 01:57:57 mrg Exp $
+
+BUILDLINK_DEPMETHOD.trusted-firmware-a-rk3328?=        build
+
+BUILDLINK_TREE+=       trusted-firmware-a-rk3328
+
+.if !defined(TRUSTED_FIRMWARE_A_RK3328_BUILDLINK3_MK)
+TRUSTED_FIRMWARE_A_RK3328_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.trusted-firmware-a-rk3328+=      trusted-firmware-a-rk3328>=2.6
+BUILDLINK_PKGSRCDIR.trusted-firmware-a-rk3328?=        ../../sysutils/trusted-firmware-a-rk3328
+.endif # TRUSTED_FIRMWARE_A_RK3328_BUILDLINK3_MK
+
+BUILDLINK_TREE+=       -trusted-firmware-a-rk3328
+

Index: pkgsrc/sysutils/trusted-firmware-a-rk3399/DESCR
diff -u /dev/null pkgsrc/sysutils/trusted-firmware-a-rk3399/DESCR:1.1
--- /dev/null   Wed Feb  9 01:57:57 2022
+++ pkgsrc/sysutils/trusted-firmware-a-rk3399/DESCR     Wed Feb  9 01:57:57 2022
@@ -0,0 +1,20 @@
+Trusted Firmware-A (TF-A) provides a reference implementation of secure
+world software for ARMv8-A, including a Secure Monitor executing at
+Exception Level 3 (EL3). It implements various ARM interface standards,
+such as:
+
+    The Power State Coordination Interface (PSCI)
+    Trusted Board Boot Requirements (TBBR, ARM DEN0006C-1)
+    SMC Calling Convention
+    System Control and Management Interface
+
+As far as possible the code is designed for reuse or porting to other
+ARMv8-A model and hardware platforms.
+
+ARM will continue development in collaboration with interested parties to
+provide a full reference implementation of Secure Monitor code and ARM
+standards to the benefit of all developers working with ARMv8-A TrustZone
+technology.
+
+This package provides mainline TF-A for the RockChip RK3399 platform,
+for example used by u-boot for the Pinebook Pro.
Index: pkgsrc/sysutils/trusted-firmware-a-rk3399/Makefile
diff -u /dev/null pkgsrc/sysutils/trusted-firmware-a-rk3399/Makefile:1.1
--- /dev/null   Wed Feb  9 01:57:57 2022
+++ pkgsrc/sysutils/trusted-firmware-a-rk3399/Makefile  Wed Feb  9 01:57:57 2022
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile,v 1.1 2022/02/09 01:57:57 mrg Exp $
+
+PLATFORM=      rk3399
+COMMENT=       ARM Trusted Firmware for Rockchip RK3399 SoCs
+
+BL31_SUFFIX=   elf
+
+# This package builds for Cortex-M0 *and* Cortex-A53/A72.
+ATF_CORTEX_M0= yes
+
+.include "../../sysutils/trusted-firmware-a/trusted-firmware-a.mk"
Index: pkgsrc/sysutils/trusted-firmware-a-rk3399/PLIST
diff -u /dev/null pkgsrc/sysutils/trusted-firmware-a-rk3399/PLIST:1.1
--- /dev/null   Wed Feb  9 01:57:57 2022
+++ pkgsrc/sysutils/trusted-firmware-a-rk3399/PLIST     Wed Feb  9 01:57:57 2022
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2022/02/09 01:57:57 mrg Exp $
+share/trusted-firmware-a/rk3399/bl31.elf
Index: pkgsrc/sysutils/trusted-firmware-a-rk3399/buildlink3.mk
diff -u /dev/null pkgsrc/sysutils/trusted-firmware-a-rk3399/buildlink3.mk:1.1
--- /dev/null   Wed Feb  9 01:57:57 2022
+++ pkgsrc/sysutils/trusted-firmware-a-rk3399/buildlink3.mk     Wed Feb  9 01:57:57 2022
@@ -0,0 +1,15 @@
+# $NetBSD: buildlink3.mk,v 1.1 2022/02/09 01:57:57 mrg Exp $
+
+BUILDLINK_DEPMETHOD.trusted-firmware-a-rk3399?=        build
+
+BUILDLINK_TREE+=       trusted-firmware-a-rk3399
+
+.if !defined(TRUSTED_FIRMWARE_A_RK3399_BUILDLINK3_MK)
+TRUSTED_FIRMWARE_A_RK3399_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.trusted-firmware-a-rk3399+=      trusted-firmware-a-rk3399>=2.6
+BUILDLINK_PKGSRCDIR.trusted-firmware-a-rk3399?=        ../../sysutils/trusted-firmware-a-rk3399
+.endif # TRUSTED_FIRMWARE_A_RK3399_BUILDLINK3_MK
+
+BUILDLINK_TREE+=       -trusted-firmware-a-rk3399
+

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/sysutils/intel-microcode-netbsd
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/sysutils/intel-microcode-netbsd
Indexes:

Home | Main Index | Thread Index | Old Index