CVS commit: pkgsrc/sysutils

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/sysutils
From: "Jason R Thorpe" <thorpej%netbsd.org@localhost>
Date: Tue, 30 Jun 2020 14:33:16 +0000

Module Name:    pkgsrc
Committed By:   thorpej
Date:           Tue Jun 30 14:33:16 UTC 2020

Modified Files:
        pkgsrc/sysutils/arm-trusted-firmware-fiptool: Makefile distinfo
        pkgsrc/sysutils/arm-trusted-firmware-fiptool/patches: patch-Makefile
        pkgsrc/sysutils/arm-trusted-firmware-rk3328: Makefile buildlink3.mk
        pkgsrc/sysutils/arm-trusted-firmware-rk3399: Makefile buildlink3.mk
        pkgsrc/sysutils/arm-trusted-firmware-sun50i-h6: Makefile buildlink3.mk
        pkgsrc/sysutils/arm-trusted-firmware-sun50i_a64: Makefile buildlink3.mk
Added Files:
        pkgsrc/sysutils/arm-trusted-firmware: arm-trusted-firmware-dist.mk
            arm-trusted-firmware.mk distinfo
        pkgsrc/sysutils/arm-trusted-firmware/patches:
            patch-plat_allwinner_sun50i_h6_include_sunxi_mmap.h
Removed Files:
        pkgsrc/sysutils/arm-trusted-firmware-fiptool/patches:
            patch-fiptool_uuid_parse
        pkgsrc/sysutils/arm-trusted-firmware-rk3328: distinfo
        pkgsrc/sysutils/arm-trusted-firmware-rk3399: distinfo
        pkgsrc/sysutils/arm-trusted-firmware-rk3399/patches:
            patch-plat_rockchip_common_params_setup.c
            patch-plat_rockchip_rk3399_drivers_pmu_pmu.c
            patch-plat_rockchip_rk3399_drivers_pmu_pmu.h
            patch-plat_rockchip_rk3399_drivers_soc_soc.c
        pkgsrc/sysutils/arm-trusted-firmware-sun50i-h6: distinfo
        pkgsrc/sysutils/arm-trusted-firmware-sun50i-h6/patches:
            patch-plat_allwinner_sun50i_h6_include_sunxi_mmap.h
        pkgsrc/sysutils/arm-trusted-firmware-sun50i_a64: distinfo

Log Message:
- Re-factor the arm-trusted-firmware packages into common definitions and
  build infrastructure.
- Update arm-trusted-firmware to v2.3.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/arm-trusted-firmware/arm-trusted-firmware-dist.mk \
    pkgsrc/sysutils/arm-trusted-firmware/arm-trusted-firmware.mk \
    pkgsrc/sysutils/arm-trusted-firmware/distinfo
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/sysutils/arm-trusted-firmware-fiptool/Makefile
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/sysutils/arm-trusted-firmware-fiptool/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/sysutils/arm-trusted-firmware-fiptool/patches/patch-Makefile
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/sysutils/arm-trusted-firmware-fiptool/patches/patch-fiptool_uuid_parse
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/arm-trusted-firmware-rk3328/Makefile \
    pkgsrc/sysutils/arm-trusted-firmware-rk3328/buildlink3.mk
cvs rdiff -u -r1.1 -r0 pkgsrc/sysutils/arm-trusted-firmware-rk3328/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/arm-trusted-firmware-rk3399/Makefile
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/sysutils/arm-trusted-firmware-rk3399/buildlink3.mk
cvs rdiff -u -r1.3 -r0 pkgsrc/sysutils/arm-trusted-firmware-rk3399/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/sysutils/arm-trusted-firmware-rk3399/patches/patch-plat_rockchip_common_params_setup.c
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/sysutils/arm-trusted-firmware-rk3399/patches/patch-plat_rockchip_rk3399_drivers_pmu_pmu.c \
    pkgsrc/sysutils/arm-trusted-firmware-rk3399/patches/patch-plat_rockchip_rk3399_drivers_pmu_pmu.h \
    pkgsrc/sysutils/arm-trusted-firmware-rk3399/patches/patch-plat_rockchip_rk3399_drivers_soc_soc.c
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/sysutils/arm-trusted-firmware-sun50i-h6/Makefile
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/sysutils/arm-trusted-firmware-sun50i-h6/buildlink3.mk
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/sysutils/arm-trusted-firmware-sun50i-h6/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/sysutils/arm-trusted-firmware-sun50i-h6/patches/patch-plat_allwinner_sun50i_h6_include_sunxi_mmap.h
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/sysutils/arm-trusted-firmware-sun50i_a64/Makefile
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/sysutils/arm-trusted-firmware-sun50i_a64/buildlink3.mk
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/sysutils/arm-trusted-firmware-sun50i_a64/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/arm-trusted-firmware/patches/patch-plat_allwinner_sun50i_h6_include_sunxi_mmap.h

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

Modified files:

Index: pkgsrc/sysutils/arm-trusted-firmware-fiptool/Makefile
diff -u pkgsrc/sysutils/arm-trusted-firmware-fiptool/Makefile:1.4 pkgsrc/sysutils/arm-trusted-firmware-fiptool/Makefile:1.5
--- pkgsrc/sysutils/arm-trusted-firmware-fiptool/Makefile:1.4   Tue May 14 04:08:51 2019
+++ pkgsrc/sysutils/arm-trusted-firmware-fiptool/Makefile       Tue Jun 30 14:33:15 2020
@@ -1,20 +1,12 @@
-# $NetBSD: Makefile,v 1.4 2019/05/14 04:08:51 thorpej Exp $
+# $NetBSD: Makefile,v 1.5 2020/06/30 14:33:15 thorpej Exp $
 
-GITHUB_PROJECT=        arm-trusted-firmware
-GITHUB_TAG=    v${PKGVERSION_NOREV}
-DISTNAME=      arm-trusted-firmware-2.0
-PKGNAME=       ${DISTNAME:S/firmware/firmware-fiptool/}
-PKGREVISION=   2
-CATEGORIES=    sysutils
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=ARM-software/}
-EXTRACT_SUFX=  .zip
-
-MAINTAINER=    port-arm%NetBSD.org@localhost
-HOMEPAGE=      https://github.com/ARM-software/arm-trusted-firmware/
-COMMENT=       ARM Trusted Firmware fiptool
-LICENSE=       modified-bsd
+# We override WRKSRC, so we provide our own patches (and thus distinfo)
+DISTINFO_FILE= ${.CURDIR}/distinfo
+PATCHDIR=      ${.CURDIR}/patches
+
+.include "../../sysutils/arm-trusted-firmware/arm-trusted-firmware-dist.mk"
 
-USE_TOOLS+=    gmake
+PKGNAME=       ${DISTNAME:S/firmware/firmware-fiptool/}
 WRKSRC=                ${WRKDIR}/${DISTNAME}/tools/fiptool
 
 INSTALLATION_DIRS=     bin

Index: pkgsrc/sysutils/arm-trusted-firmware-fiptool/distinfo
diff -u pkgsrc/sysutils/arm-trusted-firmware-fiptool/distinfo:1.3 pkgsrc/sysutils/arm-trusted-firmware-fiptool/distinfo:1.4
--- pkgsrc/sysutils/arm-trusted-firmware-fiptool/distinfo:1.3   Tue May 14 04:08:51 2019
+++ pkgsrc/sysutils/arm-trusted-firmware-fiptool/distinfo       Tue Jun 30 14:33:15 2020
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.3 2019/05/14 04:08:51 thorpej Exp $
+$NetBSD: distinfo,v 1.4 2020/06/30 14:33:15 thorpej Exp $
 
-SHA1 (arm-trusted-firmware-2.0.zip) = d789e7aac0e987d8524a11587cc598bf5d894581
-RMD160 (arm-trusted-firmware-2.0.zip) = a7a49da9b0e27c45df867ea1de4809cb89d9b8cc
-SHA512 (arm-trusted-firmware-2.0.zip) = 39180d12be7532b742949f162759793e97c0a6ac835d66aaf857bd3c1d9c0ab10b7ccd5e6a47831ad909a92b4727e181c82a74c90b5d941e469f3a5cf66b0e7c
-Size (arm-trusted-firmware-2.0.zip) = 3949049 bytes
-SHA1 (patch-Makefile) = b5c27e44135e6a99c1a598daec91db58d6ff894d
-SHA1 (patch-fiptool_uuid_parse) = 6ef5785e2f696e0297239cb597b94dd3ac4a6c7d
+SHA1 (arm-trusted-firmware-2.3.zip) = 7fd1f1c896de819f3fa262de78ba4641cdd0e436
+RMD160 (arm-trusted-firmware-2.3.zip) = 6e17330effbc7524def684c3683bbdd3a48ad05d
+SHA512 (arm-trusted-firmware-2.3.zip) = 1ee358fef1a4cda68d01857d3c822034b3ab1cc68918c7a4087e95f3f2b9b41a12431a8091847f5897ae9a403826d8fcfde0a8a689c69808ff06e737a845db28
+Size (arm-trusted-firmware-2.3.zip) = 5797101 bytes
+SHA1 (patch-Makefile) = 90cedf2c6c04fbf00bd8b2782add95b46c2ebcc0

Index: pkgsrc/sysutils/arm-trusted-firmware-fiptool/patches/patch-Makefile
diff -u pkgsrc/sysutils/arm-trusted-firmware-fiptool/patches/patch-Makefile:1.1 pkgsrc/sysutils/arm-trusted-firmware-fiptool/patches/patch-Makefile:1.2
--- pkgsrc/sysutils/arm-trusted-firmware-fiptool/patches/patch-Makefile:1.1     Sun Jan 20 17:39:05 2019
+++ pkgsrc/sysutils/arm-trusted-firmware-fiptool/patches/patch-Makefile Tue Jun 30 14:33:15 2020
@@ -1,13 +1,13 @@
-$NetBSD: patch-Makefile,v 1.1 2019/01/20 17:39:05 wiz Exp $
+$NetBSD: patch-Makefile,v 1.2 2020/06/30 14:33:15 thorpej Exp $
 
 Honor LDFLAGS.
 
---- Makefile.orig      2018-10-02 13:13:37.000000000 +0000
-+++ Makefile
+--- 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 "  LD      $@"
+       @echo "  HOSTLD  $@"
 -      ${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDLIBS}
 +      ${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDFLAGS} ${LDLIBS}
        @${ECHO_BLANK_LINE}

Index: pkgsrc/sysutils/arm-trusted-firmware-rk3328/Makefile
diff -u pkgsrc/sysutils/arm-trusted-firmware-rk3328/Makefile:1.1 pkgsrc/sysutils/arm-trusted-firmware-rk3328/Makefile:1.2
--- pkgsrc/sysutils/arm-trusted-firmware-rk3328/Makefile:1.1    Sat Apr  4 06:21:54 2020
+++ pkgsrc/sysutils/arm-trusted-firmware-rk3328/Makefile        Tue Jun 30 14:33:15 2020
@@ -1,51 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2020/04/04 06:21:54 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2020/06/30 14:33:15 thorpej Exp $
 
-VERSION=       2.2
-GITHUB_PROJECT=        arm-trusted-firmware
-GITHUB_TAG=    v2.2
-#GITHUB_TAG=   ab3d22473df279c61ed4d4873d26b072dcf887e8
-
-DISTNAME=      ${GITHUB_PROJECT}-${VERSION}
 PLATFORM=      rk3328
-PKGNAME=       ${GITHUB_PROJECT}-${PLATFORM}-${VERSION}
-CATEGORIES=    sysutils
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=ARM-software/}
-EXTRACT_SUFX=  .zip
-
-MAINTAINER=    port-arm%NetBSD.org@localhost
-HOMEPAGE=      https://github.com/ARM-software/arm-trusted-firmware/
-COMMENT=       ARM Trusted Firmware
-LICENSE=       modified-bsd
-
-USE_TOOLS+=    gmake
-
-MAKE_FLAGS+=   CROSS_COMPILE=${PREFIX}/cross-aarch64-none-elf/bin/aarch64-none-elf-
-MAKE_FLAGS+=   M0_CROSS_COMPILE=${PREFIX}/cross-arm-none-eabi/bin/arm-none-eabi-
-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
-
-# This package builds for Cortex-M0 *and* Cortex-A53/A72.
-BUILD_DEPENDS+=        cross-aarch64-none-elf-gcc-[0-9]*:../../cross/aarch64-none-elf-gcc
-BUILD_DEPENDS+=        cross-arm-none-eabi-gcc-[0-9]*:../../cross/arm-none-eabi-gcc
-
-.if empty(MAKE_FLAGS:MDEBUG=1)
-BL31_DIR=release
-.else
-BL31_DIR=debug
-.endif
-
-do-install:
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/arm-trusted-firmware/${PLATFORM}
-       ${INSTALL_DATA} ${WRKSRC}/build/${PLATFORM}/${BL31_DIR}/bl31/bl31.elf \
-           ${DESTDIR}${PREFIX}/share/arm-trusted-firmware/${PLATFORM}/
+COMMENT=       ARM Trusted Firmware for Rockchip RK3328 SoCs
 
-# 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
+BL31_SUFFIX=   elf
 
-.include "../../mk/bsd.pkg.mk"
+.include "../../sysutils/arm-trusted-firmware/arm-trusted-firmware.mk"
Index: pkgsrc/sysutils/arm-trusted-firmware-rk3328/buildlink3.mk
diff -u pkgsrc/sysutils/arm-trusted-firmware-rk3328/buildlink3.mk:1.1 pkgsrc/sysutils/arm-trusted-firmware-rk3328/buildlink3.mk:1.2
--- pkgsrc/sysutils/arm-trusted-firmware-rk3328/buildlink3.mk:1.1       Sat Apr  4 06:21:54 2020
+++ pkgsrc/sysutils/arm-trusted-firmware-rk3328/buildlink3.mk   Tue Jun 30 14:33:15 2020
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2020/04/04 06:21:54 mrg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2020/06/30 14:33:15 thorpej Exp $
 
 BUILDLINK_DEPMETHOD.arm-trusted-firmware-rk3328?=      build
 
@@ -7,7 +7,7 @@ BUILDLINK_TREE+=        arm-trusted-firmware-rk
 .if !defined(ARM_TRUSTED_FIRMWARE_RK3328_BUILDLINK3_MK)
 ARM_TRUSTED_FIRMWARE_RK3328_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.arm-trusted-firmware-rk3328+=    arm-trusted-firmware-rk3328>2.0
+BUILDLINK_API_DEPENDS.arm-trusted-firmware-rk3328+=    arm-trusted-firmware-rk3328>=2.3
 BUILDLINK_PKGSRCDIR.arm-trusted-firmware-rk3328?=      ../../sysutils/arm-trusted-firmware-rk3328
 .endif # ARM_TRUSTED_FIRMWARE_RK3328_BUILDLINK3_MK
 

Index: pkgsrc/sysutils/arm-trusted-firmware-rk3399/Makefile
diff -u pkgsrc/sysutils/arm-trusted-firmware-rk3399/Makefile:1.3 pkgsrc/sysutils/arm-trusted-firmware-rk3399/Makefile:1.4
--- pkgsrc/sysutils/arm-trusted-firmware-rk3399/Makefile:1.3    Sun Feb 23 01:01:11 2020
+++ pkgsrc/sysutils/arm-trusted-firmware-rk3399/Makefile        Tue Jun 30 14:33:15 2020
@@ -1,52 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2020/02/23 01:01:11 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2020/06/30 14:33:15 thorpej Exp $
 
-VERSION=       2.2
-PKGREVISION=   2
-GITHUB_PROJECT=        arm-trusted-firmware
-GITHUB_TAG=    v2.2
-#GITHUB_TAG=   ab3d22473df279c61ed4d4873d26b072dcf887e8
-
-DISTNAME=      ${GITHUB_PROJECT}-${VERSION}
 PLATFORM=      rk3399
-PKGNAME=       ${GITHUB_PROJECT}-${PLATFORM}-${VERSION}
-CATEGORIES=    sysutils
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=ARM-software/}
-EXTRACT_SUFX=  .zip
-
-MAINTAINER=    port-arm%NetBSD.org@localhost
-HOMEPAGE=      https://github.com/ARM-software/arm-trusted-firmware/
-COMMENT=       ARM Trusted Firmware
-LICENSE=       modified-bsd
-
-USE_TOOLS+=    gmake
+COMMENT=       ARM Trusted Firmware for Rockchip RK3399 SoCs
 
-MAKE_FLAGS+=   CROSS_COMPILE=${PREFIX}/cross-aarch64-none-elf/bin/aarch64-none-elf-
-MAKE_FLAGS+=   M0_CROSS_COMPILE=${PREFIX}/cross-arm-none-eabi/bin/arm-none-eabi-
-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
+BL31_SUFFIX=   elf
 
 # This package builds for Cortex-M0 *and* Cortex-A53/A72.
-BUILD_DEPENDS+=        cross-aarch64-none-elf-gcc-[0-9]*:../../cross/aarch64-none-elf-gcc
-BUILD_DEPENDS+=        cross-arm-none-eabi-gcc-[0-9]*:../../cross/arm-none-eabi-gcc
-
-.if empty(MAKE_FLAGS:MDEBUG=1)
-BL31_DIR=release
-.else
-BL31_DIR=debug
-.endif
-
-do-install:
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/arm-trusted-firmware/${PLATFORM}
-       ${INSTALL_DATA} ${WRKSRC}/build/${PLATFORM}/${BL31_DIR}/bl31/bl31.elf \
-           ${DESTDIR}${PREFIX}/share/arm-trusted-firmware/${PLATFORM}/
-
-# 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
+ATF_CORTEX_M0= yes
 
-.include "../../mk/bsd.pkg.mk"
+.include "../../sysutils/arm-trusted-firmware/arm-trusted-firmware.mk"

Index: pkgsrc/sysutils/arm-trusted-firmware-rk3399/buildlink3.mk
diff -u pkgsrc/sysutils/arm-trusted-firmware-rk3399/buildlink3.mk:1.4 pkgsrc/sysutils/arm-trusted-firmware-rk3399/buildlink3.mk:1.5
--- pkgsrc/sysutils/arm-trusted-firmware-rk3399/buildlink3.mk:1.4       Sun Feb 23 01:01:11 2020
+++ pkgsrc/sysutils/arm-trusted-firmware-rk3399/buildlink3.mk   Tue Jun 30 14:33:15 2020
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2020/02/23 01:01:11 mrg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2020/06/30 14:33:15 thorpej Exp $
 
 BUILDLINK_DEPMETHOD.arm-trusted-firmware-rk3399?=      build
 
@@ -7,7 +7,7 @@ BUILDLINK_TREE+=        arm-trusted-firmware-rk
 .if !defined(ARM_TRUSTED_FIRMWARE_RK3399_BUILDLINK3_MK)
 ARM_TRUSTED_FIRMWARE_RK3399_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.arm-trusted-firmware-rk3399+=    arm-trusted-firmware-rk3399>=2.2nb2
+BUILDLINK_API_DEPENDS.arm-trusted-firmware-rk3399+=    arm-trusted-firmware-rk3399>=2.3
 BUILDLINK_PKGSRCDIR.arm-trusted-firmware-rk3399?=      ../../sysutils/arm-trusted-firmware-rk3399
 .endif # ARM_TRUSTED_FIRMWARE_RK3399_BUILDLINK3_MK
 

Index: pkgsrc/sysutils/arm-trusted-firmware-sun50i-h6/Makefile
diff -u pkgsrc/sysutils/arm-trusted-firmware-sun50i-h6/Makefile:1.3 pkgsrc/sysutils/arm-trusted-firmware-sun50i-h6/Makefile:1.4
--- pkgsrc/sysutils/arm-trusted-firmware-sun50i-h6/Makefile:1.3 Sat Apr  4 15:12:17 2020
+++ pkgsrc/sysutils/arm-trusted-firmware-sun50i-h6/Makefile     Tue Jun 30 14:33:16 2020
@@ -1,40 +1,12 @@
-# $NetBSD: Makefile,v 1.3 2020/04/04 15:12:17 thorpej Exp $
+# $NetBSD: Makefile,v 1.4 2020/06/30 14:33:16 thorpej Exp $
 
-VERSION=       20180207
-GITHUB_PROJECT=        arm-trusted-firmware
-GITHUB_TAG=    406a637162bee1f1b0c26525c3aae204aac241fa
-
-PKGNAME=       ${GITHUB_PROJECT}-sun50i-h6-${VERSION}
-DISTNAME=      ${PKGNAME}
-PKGREVISION=   1
-CATEGORIES=    sysutils
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=Icenowy/}
-EXTRACT_SUFX=  .zip
-
-MAINTAINER=    port-arm%NetBSD.org@localhost
-HOMEPAGE=      https://github.com/Icenowy/arm-trusted-firmware/
+PLATFORM=      sun50i_h6
+PKGNAME=       ${GITHUB_PROJECT}-sun50i-h6-${VERSION}  # XXX rename this pkg
 COMMENT=       ARM Trusted Firmware for Allwinner H6 SoCs
-LICENSE=       modified-bsd
-
-USE_TOOLS+=    gmake
-
-MAKE_FLAGS+=   CROSS_COMPILE=${PREFIX}/cross-aarch64-none-elf/bin/aarch64-none-elf-
-MAKE_FLAGS+=   PLAT=sun50i_h6
-MAKE_FLAGS+=   DEBUG=1
-MAKE_FLAGS+=   BUILD_STRING=${GITHUB_TAG}
-BUILD_TARGET=  bl31
-
-BUILD_DEPENDS+=        cross-aarch64-none-elf-gcc-[0-9]*:../../cross/aarch64-none-elf-gcc
 
-.include "../../mk/bsd.prefs.mk"
-# XXX kludge. pkgsrc passes down run path flags in LDFLAGS but the
-# cross ld(1) doesn't understand -R. If we pass down -L instead it
-# will be safely ignored.
-COMPILER_RPATH_FLAG=-L
-       
-do-install:
+do-install:    # XXX rename this pkg
        ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/arm-trusted-firmware/sun50i-h6
-       ${INSTALL_DATA} ${WRKSRC}/build/sun50i_h6/debug/bl31.bin \
+       ${INSTALL_DATA} ${WRKSRC}/build/sun50i_h6/${BL31_DIR}/bl31.bin \
            ${DESTDIR}${PREFIX}/share/arm-trusted-firmware/sun50i-h6
 
-.include "../../mk/bsd.pkg.mk"
+.include "../../sysutils/arm-trusted-firmware/arm-trusted-firmware.mk"

Index: pkgsrc/sysutils/arm-trusted-firmware-sun50i-h6/buildlink3.mk
diff -u pkgsrc/sysutils/arm-trusted-firmware-sun50i-h6/buildlink3.mk:1.2 pkgsrc/sysutils/arm-trusted-firmware-sun50i-h6/buildlink3.mk:1.3
--- pkgsrc/sysutils/arm-trusted-firmware-sun50i-h6/buildlink3.mk:1.2    Sat Apr  4 15:12:17 2020
+++ pkgsrc/sysutils/arm-trusted-firmware-sun50i-h6/buildlink3.mk        Tue Jun 30 14:33:16 2020
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2020/04/04 15:12:17 thorpej Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2020/06/30 14:33:16 thorpej Exp $
 
 BUILDLINK_DEPMETHOD.arm-trusted-firmware-sun50i-h6?=   build
 
@@ -7,7 +7,7 @@ BUILDLINK_TREE+=        arm-trusted-firmware-su
 .if !defined(ARM_TRUSTED_FIRMWARE_SUN50I_H6_BUILDLINK3_MK)
 ARM_TRUSTED_FIRMWARE_SUN50I_H6_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.arm-trusted-firmware-sun50i-h6+= arm-trusted-firmware-sun50i-h6>=20180207nb1
+BUILDLINK_API_DEPENDS.arm-trusted-firmware-sun50i-h6+= arm-trusted-firmware-sun50i-h6>=2.3
 BUILDLINK_PKGSRCDIR.arm-trusted-firmware-sun50i-h6?=   ../../sysutils/arm-trusted-firmware-sun50i-h6
 .endif # ARM_TRUSTED_FIRMWARE_SUN50I_H6_BUILDLINK3_MK
 

Index: pkgsrc/sysutils/arm-trusted-firmware-sun50i_a64/Makefile
diff -u pkgsrc/sysutils/arm-trusted-firmware-sun50i_a64/Makefile:1.4 pkgsrc/sysutils/arm-trusted-firmware-sun50i_a64/Makefile:1.5
--- pkgsrc/sysutils/arm-trusted-firmware-sun50i_a64/Makefile:1.4        Mon Nov  4 21:28:41 2019
+++ pkgsrc/sysutils/arm-trusted-firmware-sun50i_a64/Makefile    Tue Jun 30 14:33:16 2020
@@ -1,41 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2019/11/04 21:28:41 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2020/06/30 14:33:16 thorpej Exp $
 
-VERSION=       2.0.20190222    # v2.0 is too old
-GITHUB_PROJECT=        arm-trusted-firmware
-# GITHUB_TAG=  v${VERSION}     # only for real releases
-GITHUB_TAG=    ab3d22473df279c61ed4d4873d26b072dcf887e8
-
-DISTNAME=      ${GITHUB_PROJECT}-${VERSION}
 PLATFORM=      sun50i_a64
-PKGNAME=       ${GITHUB_PROJECT}-${PLATFORM}-${VERSION}
-CATEGORIES=    sysutils
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=ARM-software/}
-EXTRACT_SUFX=  .zip
-
-MAINTAINER=    port-arm%NetBSD.org@localhost
-HOMEPAGE=      https://github.com/ARM-software/arm-trusted-firmware/
-COMMENT=       ARM Trusted Firmware
-LICENSE=       modified-bsd
-
-USE_TOOLS+=    gmake
-
-MAKE_FLAGS+=   CROSS_COMPILE=${PREFIX}/cross-aarch64-none-elf/bin/aarch64-none-elf-
-MAKE_FLAGS+=   PLAT=${PLATFORM}
-MAKE_FLAGS+=   DEBUG=1
-# 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
-
-do-install:
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/arm-trusted-firmware/${PLATFORM}
-       ${INSTALL_DATA} ${WRKSRC}/build/${PLATFORM}/debug/bl31.bin \
-           ${DESTDIR}${PREFIX}/share/arm-trusted-firmware/${PLATFORM}/
-
-
-# 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
+COMMENT=       ARM Trusted Firmware for Allwinner H5 and A64 SoCs
 
-.include "../../mk/bsd.pkg.mk"
+.include "../../sysutils/arm-trusted-firmware/arm-trusted-firmware.mk"

Index: pkgsrc/sysutils/arm-trusted-firmware-sun50i_a64/buildlink3.mk
diff -u pkgsrc/sysutils/arm-trusted-firmware-sun50i_a64/buildlink3.mk:1.3 pkgsrc/sysutils/arm-trusted-firmware-sun50i_a64/buildlink3.mk:1.4
--- pkgsrc/sysutils/arm-trusted-firmware-sun50i_a64/buildlink3.mk:1.3   Wed Feb 27 06:23:39 2019
+++ pkgsrc/sysutils/arm-trusted-firmware-sun50i_a64/buildlink3.mk       Tue Jun 30 14:33:16 2020
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2019/02/27 06:23:39 martin Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2020/06/30 14:33:16 thorpej Exp $
 
 BUILDLINK_DEPMETHOD.arm-trusted-firmware-sun50i_a64?=  build
 
@@ -7,7 +7,7 @@ BUILDLINK_TREE+=        arm-trusted-firmware-su
 .if !defined(ARM_TRUSTED_FIRMWARE_SUN50I_A64_BUILDLINK3_MK)
 ARM_TRUSTED_FIRMWARE_SUN50I_A64_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.arm-trusted-firmware-sun50i_a64+=        arm-trusted-firmware-sun50i_a64>2.0
+BUILDLINK_API_DEPENDS.arm-trusted-firmware-sun50i_a64+=        arm-trusted-firmware-sun50i_a64>=2.3
 BUILDLINK_PKGSRCDIR.arm-trusted-firmware-sun50i_a64?=  ../../sysutils/arm-trusted-firmware-sun50i_a64
 .endif # ARM_TRUSTED_FIRMWARE_SUN50I_A64_BUILDLINK3_MK
 

Added files:

Index: pkgsrc/sysutils/arm-trusted-firmware/arm-trusted-firmware-dist.mk
diff -u /dev/null pkgsrc/sysutils/arm-trusted-firmware/arm-trusted-firmware-dist.mk:1.1
--- /dev/null   Tue Jun 30 14:33:16 2020
+++ pkgsrc/sysutils/arm-trusted-firmware/arm-trusted-firmware-dist.mk   Tue Jun 30 14:33:14 2020
@@ -0,0 +1,20 @@
+# $NetBSD: arm-trusted-firmware-dist.mk,v 1.1 2020/06/30 14:33:14 thorpej Exp $
+
+# When updating, don't forget to also update arm-trusted-firmware-fiptool.
+VERSION=       2.3
+
+GITHUB_PROJECT=        arm-trusted-firmware
+GITHUB_TAG=    v${VERSION}
+
+DISTNAME=      ${GITHUB_PROJECT}-${VERSION}
+DISTINFO_FILE?=        ${.CURDIR}/../../sysutils/arm-trusted-firmware/distinfo
+CATEGORIES=    sysutils
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=ARM-software/}
+EXTRACT_SUFX=  .zip
+PATCHDIR?=     ${.CURDIR}/../../sysutils/arm-trusted-firmware/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/arm-trusted-firmware/arm-trusted-firmware.mk
diff -u /dev/null pkgsrc/sysutils/arm-trusted-firmware/arm-trusted-firmware.mk:1.1
--- /dev/null   Tue Jun 30 14:33:16 2020
+++ pkgsrc/sysutils/arm-trusted-firmware/arm-trusted-firmware.mk        Tue Jun 30 14:33:14 2020
@@ -0,0 +1,51 @@
+# $NetBSD: arm-trusted-firmware.mk,v 1.1 2020/06/30 14:33:14 thorpej Exp $
+
+.include "../../sysutils/arm-trusted-firmware/arm-trusted-firmware-dist.mk"
+
+PKGNAME?=      ${GITHUB_PROJECT}-${PLATFORM}-${VERSION}
+
+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/arm-trusted-firmware/${PLATFORM}
+.if ${BL31_SUFFIX} == "bin"
+       ${INSTALL_DATA} \
+           ${WRKSRC}/build/${PLATFORM}/${BL31_DIR}/bl31.${BL31_SUFFIX} \
+           ${DESTDIR}${PREFIX}/share/arm-trusted-firmware/${PLATFORM}/
+.else
+       ${INSTALL_DATA} \
+           ${WRKSRC}/build/${PLATFORM}/${BL31_DIR}/bl31/bl31.${BL31_SUFFIX} \
+           ${DESTDIR}${PREFIX}/share/arm-trusted-firmware/${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/arm-trusted-firmware/distinfo
diff -u /dev/null pkgsrc/sysutils/arm-trusted-firmware/distinfo:1.1
--- /dev/null   Tue Jun 30 14:33:16 2020
+++ pkgsrc/sysutils/arm-trusted-firmware/distinfo       Tue Jun 30 14:33:14 2020
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1 2020/06/30 14:33:14 thorpej Exp $
+
+SHA1 (arm-trusted-firmware-2.3.zip) = 7fd1f1c896de819f3fa262de78ba4641cdd0e436
+RMD160 (arm-trusted-firmware-2.3.zip) = 6e17330effbc7524def684c3683bbdd3a48ad05d
+SHA512 (arm-trusted-firmware-2.3.zip) = 1ee358fef1a4cda68d01857d3c822034b3ab1cc68918c7a4087e95f3f2b9b41a12431a8091847f5897ae9a403826d8fcfde0a8a689c69808ff06e737a845db28
+Size (arm-trusted-firmware-2.3.zip) = 5797101 bytes
+SHA1 (patch-plat_allwinner_sun50i_h6_include_sunxi_mmap.h) = 214c137847cf93661be0f6179882b63aa4aed4fe

Index: pkgsrc/sysutils/arm-trusted-firmware/patches/patch-plat_allwinner_sun50i_h6_include_sunxi_mmap.h
diff -u /dev/null pkgsrc/sysutils/arm-trusted-firmware/patches/patch-plat_allwinner_sun50i_h6_include_sunxi_mmap.h:1.1
--- /dev/null   Tue Jun 30 14:33:16 2020
+++ pkgsrc/sysutils/arm-trusted-firmware/patches/patch-plat_allwinner_sun50i_h6_include_sunxi_mmap.h    Tue Jun 30 14:33:15 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-plat_allwinner_sun50i_h6_include_sunxi_mmap.h,v 1.1 2020/06/30 14:33:15 thorpej Exp $
+
+Work around broken H6 WDOG reset.
+
+--- plat/allwinner/sun50i_h6/include/sunxi_mmap.h.orig 2020-04-20 15:56:43.000000000 +0000
++++ plat/allwinner/sun50i_h6/include/sunxi_mmap.h      2020-06-22 02:24:08.336010712 +0000
+@@ -58,4 +58,8 @@
+ #define SUNXI_R_UART_BASE             0x07080000
+ #define SUNXI_R_PIO_BASE              0x07022000
+ 
++/* Work around broken H6 WDOG reset. */
++#undef SUNXI_WDOG_BASE
++#define SUNXI_WDOG_BASE                       SUNXI_R_WDOG_BASE
++
+ #endif /* SUNXI_MMAP_H */

Prev by Date: CVS commit: pkgsrc/multimedia/mpv
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/multimedia/mpv
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index