Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils - Re-factor the arm-trusted-firmware packages...
details: https://anonhg.NetBSD.org/pkgsrc/rev/163ab044e686
branches: trunk
changeset: 435084:163ab044e686
user: thorpej <thorpej%pkgsrc.org@localhost>
date: Tue Jun 30 14:33:14 2020 +0000
description:
- Re-factor the arm-trusted-firmware packages into common definitions and
build infrastructure.
- Update arm-trusted-firmware to v2.3.
diffstat:
sysutils/arm-trusted-firmware-fiptool/Makefile | 22 +--
sysutils/arm-trusted-firmware-fiptool/distinfo | 13 +-
sysutils/arm-trusted-firmware-fiptool/patches/patch-Makefile | 8 +-
sysutils/arm-trusted-firmware-fiptool/patches/patch-fiptool_uuid_parse | 19 ---
sysutils/arm-trusted-firmware-rk3328/Makefile | 53 +---------
sysutils/arm-trusted-firmware-rk3328/buildlink3.mk | 4 +-
sysutils/arm-trusted-firmware-rk3328/distinfo | 10 -
sysutils/arm-trusted-firmware-rk3399/Makefile | 53 +--------
sysutils/arm-trusted-firmware-rk3399/buildlink3.mk | 4 +-
sysutils/arm-trusted-firmware-rk3399/distinfo | 10 -
sysutils/arm-trusted-firmware-rk3399/patches/patch-plat_rockchip_common_params_setup.c | 52 ---------
sysutils/arm-trusted-firmware-rk3399/patches/patch-plat_rockchip_rk3399_drivers_pmu_pmu.c | 40 -------
sysutils/arm-trusted-firmware-rk3399/patches/patch-plat_rockchip_rk3399_drivers_pmu_pmu.h | 21 ---
sysutils/arm-trusted-firmware-rk3399/patches/patch-plat_rockchip_rk3399_drivers_soc_soc.c | 30 -----
sysutils/arm-trusted-firmware-sun50i-h6/Makefile | 42 +------
sysutils/arm-trusted-firmware-sun50i-h6/buildlink3.mk | 4 +-
sysutils/arm-trusted-firmware-sun50i-h6/distinfo | 7 -
sysutils/arm-trusted-firmware-sun50i-h6/patches/patch-plat_allwinner_sun50i_h6_include_sunxi_mmap.h | 15 --
sysutils/arm-trusted-firmware-sun50i_a64/Makefile | 43 +-------
sysutils/arm-trusted-firmware-sun50i_a64/buildlink3.mk | 4 +-
sysutils/arm-trusted-firmware-sun50i_a64/distinfo | 6 -
sysutils/arm-trusted-firmware/arm-trusted-firmware-dist.mk | 20 +++
sysutils/arm-trusted-firmware/arm-trusted-firmware.mk | 51 +++++++++
sysutils/arm-trusted-firmware/distinfo | 7 +
sysutils/arm-trusted-firmware/patches/patch-plat_allwinner_sun50i_h6_include_sunxi_mmap.h | 15 ++
25 files changed, 140 insertions(+), 413 deletions(-)
diffs (truncated from 723 to 300 lines):
diff -r 8402191d2571 -r 163ab044e686 sysutils/arm-trusted-firmware-fiptool/Makefile
--- a/sysutils/arm-trusted-firmware-fiptool/Makefile Tue Jun 30 14:30:38 2020 +0000
+++ b/sysutils/arm-trusted-firmware-fiptool/Makefile Tue Jun 30 14:33:14 2020 +0000
@@ -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
+# 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"
+
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
-
-USE_TOOLS+= gmake
WRKSRC= ${WRKDIR}/${DISTNAME}/tools/fiptool
INSTALLATION_DIRS= bin
diff -r 8402191d2571 -r 163ab044e686 sysutils/arm-trusted-firmware-fiptool/distinfo
--- a/sysutils/arm-trusted-firmware-fiptool/distinfo Tue Jun 30 14:30:38 2020 +0000
+++ b/sysutils/arm-trusted-firmware-fiptool/distinfo Tue Jun 30 14:33:14 2020 +0000
@@ -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
diff -r 8402191d2571 -r 163ab044e686 sysutils/arm-trusted-firmware-fiptool/patches/patch-Makefile
--- a/sysutils/arm-trusted-firmware-fiptool/patches/patch-Makefile Tue Jun 30 14:30:38 2020 +0000
+++ b/sysutils/arm-trusted-firmware-fiptool/patches/patch-Makefile Tue Jun 30 14:33:14 2020 +0000
@@ -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}
diff -r 8402191d2571 -r 163ab044e686 sysutils/arm-trusted-firmware-fiptool/patches/patch-fiptool_uuid_parse
--- a/sysutils/arm-trusted-firmware-fiptool/patches/patch-fiptool_uuid_parse Tue Jun 30 14:30:38 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-$NetBSD: patch-fiptool_uuid_parse,v 1.1 2019/05/14 04:08:51 thorpej Exp $
-
-Patch from upstream to fix UUID parsing bug in --blob handling.
-
---- fiptool.c.orig 2019-05-14 04:51:36.000000000 +0000
-+++ fiptool.c
-@@ -271,10 +271,10 @@ static void uuid_from_str(uuid_t *u, con
- &u->node[2], &u->node[3],
- &u->node[4], &u->node[5]);
- /*
-- * Given the format specifier above, we expect 11 items to be scanned
-+ * Given the format specifier above, we expect 16 items to be scanned
- * for a properly formatted UUID.
- */
-- if (n != 11)
-+ if (n != 16)
- log_errx("Invalid UUID: %s", s);
- }
-
diff -r 8402191d2571 -r 163ab044e686 sysutils/arm-trusted-firmware-rk3328/Makefile
--- a/sysutils/arm-trusted-firmware-rk3328/Makefile Tue Jun 30 14:30:38 2020 +0000
+++ b/sysutils/arm-trusted-firmware-rk3328/Makefile Tue Jun 30 14:33:14 2020 +0000
@@ -1,51 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2020/04/04 06:21:54 mrg 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
+# $NetBSD: Makefile,v 1.2 2020/06/30 14:33:15 thorpej Exp $
-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
+PLATFORM= rk3328
+COMMENT= ARM Trusted Firmware for Rockchip RK3328 SoCs
-.if empty(MAKE_FLAGS:MDEBUG=1)
-BL31_DIR=release
-.else
-BL31_DIR=debug
-.endif
+BL31_SUFFIX= elf
-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
-
-.include "../../mk/bsd.pkg.mk"
+.include "../../sysutils/arm-trusted-firmware/arm-trusted-firmware.mk"
diff -r 8402191d2571 -r 163ab044e686 sysutils/arm-trusted-firmware-rk3328/buildlink3.mk
--- a/sysutils/arm-trusted-firmware-rk3328/buildlink3.mk Tue Jun 30 14:30:38 2020 +0000
+++ b/sysutils/arm-trusted-firmware-rk3328/buildlink3.mk Tue Jun 30 14:33:14 2020 +0000
@@ -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 @@
.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
diff -r 8402191d2571 -r 163ab044e686 sysutils/arm-trusted-firmware-rk3328/distinfo
--- a/sysutils/arm-trusted-firmware-rk3328/distinfo Tue Jun 30 14:30:38 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.1 2020/04/04 06:21:54 mrg Exp $
-
-SHA1 (arm-trusted-firmware-2.2.zip) = 95bd4fc50b233ffffef87fe209756811a813f284
-RMD160 (arm-trusted-firmware-2.2.zip) = 615b7a60e3293dee8686cfca8bca3a83fea5ff88
-SHA512 (arm-trusted-firmware-2.2.zip) = 84fd95b14b5363b1a98482b71bde6915e8e36e832260371343fd576245124abfeb017ee5898996c373efcc46d03210b86ab665446aa1f7a3c9e4f290d2137f37
-Size (arm-trusted-firmware-2.2.zip) = 5205813 bytes
-SHA1 (patch-plat_rockchip_common_params_setup.c) = 4a53e20d8ff0500aee691f415801c574a07d2d7f
-SHA1 (patch-plat_rockchip_rk3399_drivers_pmu_pmu.c) = 64d3db54b8b3a9d25b955636a4338969dae05f5e
-SHA1 (patch-plat_rockchip_rk3399_drivers_pmu_pmu.h) = f3cc7c2ec114cb08d38e5e08e54eb4b34080da70
-SHA1 (patch-plat_rockchip_rk3399_drivers_soc_soc.c) = 3813ad5f37eeb5ae431fdb1eb779a0a74b9598a9
diff -r 8402191d2571 -r 163ab044e686 sysutils/arm-trusted-firmware-rk3399/Makefile
--- a/sysutils/arm-trusted-firmware-rk3399/Makefile Tue Jun 30 14:30:38 2020 +0000
+++ b/sysutils/arm-trusted-firmware-rk3399/Makefile Tue Jun 30 14:33:14 2020 +0000
@@ -1,52 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2020/02/23 01:01:11 mrg 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
+# $NetBSD: Makefile,v 1.4 2020/06/30 14:33:15 thorpej Exp $
-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
+PLATFORM= rk3399
+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
+ATF_CORTEX_M0= yes
-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
-
-.include "../../mk/bsd.pkg.mk"
+.include "../../sysutils/arm-trusted-firmware/arm-trusted-firmware.mk"
diff -r 8402191d2571 -r 163ab044e686 sysutils/arm-trusted-firmware-rk3399/buildlink3.mk
--- a/sysutils/arm-trusted-firmware-rk3399/buildlink3.mk Tue Jun 30 14:30:38 2020 +0000
+++ b/sysutils/arm-trusted-firmware-rk3399/buildlink3.mk Tue Jun 30 14:33:14 2020 +0000
@@ -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 @@
.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
diff -r 8402191d2571 -r 163ab044e686 sysutils/arm-trusted-firmware-rk3399/distinfo
--- a/sysutils/arm-trusted-firmware-rk3399/distinfo Tue Jun 30 14:30:38 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.3 2020/02/23 01:01:11 mrg Exp $
-
-SHA1 (arm-trusted-firmware-2.2.zip) = 95bd4fc50b233ffffef87fe209756811a813f284
-RMD160 (arm-trusted-firmware-2.2.zip) = 615b7a60e3293dee8686cfca8bca3a83fea5ff88
-SHA512 (arm-trusted-firmware-2.2.zip) = 84fd95b14b5363b1a98482b71bde6915e8e36e832260371343fd576245124abfeb017ee5898996c373efcc46d03210b86ab665446aa1f7a3c9e4f290d2137f37
-Size (arm-trusted-firmware-2.2.zip) = 5205813 bytes
-SHA1 (patch-plat_rockchip_common_params_setup.c) = 4a53e20d8ff0500aee691f415801c574a07d2d7f
-SHA1 (patch-plat_rockchip_rk3399_drivers_pmu_pmu.c) = 64d3db54b8b3a9d25b955636a4338969dae05f5e
-SHA1 (patch-plat_rockchip_rk3399_drivers_pmu_pmu.h) = f3cc7c2ec114cb08d38e5e08e54eb4b34080da70
-SHA1 (patch-plat_rockchip_rk3399_drivers_soc_soc.c) = 3813ad5f37eeb5ae431fdb1eb779a0a74b9598a9
diff -r 8402191d2571 -r 163ab044e686 sysutils/arm-trusted-firmware-rk3399/patches/patch-plat_rockchip_common_params_setup.c
--- a/sysutils/arm-trusted-firmware-rk3399/patches/patch-plat_rockchip_common_params_setup.c Tue Jun 30 14:30:38 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-$NetBSD: patch-plat_rockchip_common_params_setup.c,v 1.1 2020/02/23 01:01:11 mrg Exp $
-
-https://github.com/ARM-software/arm-trusted-firmware/commit/d52331d01e0efae36e837af90887a8aed33ff604#diff-94a9f1c135591eedd6addbcc729f46fb
-
- plat/rockchip: initialize reset and poweroff GPIOs with known invalid value
-
- And return NULL if we didn't get them in bl aux params otherwise reset and poweroff
- will be broken on platforms that do not have reset and poweroff GPIOs.
-
- Fixes: c1185ff ("plat/rockchip: Switch to use new common BL aux parameter library")
- Signed-off-by: Vasily Khoruzhick <anarsoul%gmail.com@localhost>
- Change-Id: Ic6cf6383d8f05d745e2c5d5e1b1df38514ea8429
-
---- plat/rockchip/common/params_setup.c.orig 2019-10-22 06:36:23.000000000 -0700
-+++ plat/rockchip/common/params_setup.c 2020-02-22 16:35:59.372670386 -0800
-@@ -6,6 +6,7 @@
-
Home |
Main Index |
Thread Index |
Old Index