[pkgsrc/trunk]: pkgsrc/sysutils update u-boot-rock64 to 2022.01 and tf-a 2.6.

[mrg <mrg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cdc5d3ee133a
branches:  trunk
changeset: 373532:cdc5d3ee133a
user:      mrg <mrg%pkgsrc.org@localhost>
date:      Fri Feb 11 23:03:50 2022 +0000

description:
update u-boot-rock64 to 2022.01 and tf-a 2.6.

change the u-boot-rockchip.mk to default to 2022.01 as only the
(probably) obsolete ayufan package uses anything else.

diffstat:

 sysutils/u-boot-pinebook-pro/Makefile |   3 +--
 sysutils/u-boot-rock64/Makefile       |  30 ++++--------------------------
 sysutils/u-boot-rockpro64/Makefile    |   3 +--
 sysutils/u-boot/u-boot-rockchip.mk    |   8 ++------
 4 files changed, 8 insertions(+), 36 deletions(-)

diffs (96 lines):

diff -r ce2e306ac2db -r cdc5d3ee133a sysutils/u-boot-pinebook-pro/Makefile
--- a/sysutils/u-boot-pinebook-pro/Makefile     Fri Feb 11 22:06:22 2022 +0000
+++ b/sysutils/u-boot-pinebook-pro/Makefile     Fri Feb 11 23:03:50 2022 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2022/02/11 22:06:22 mrg Exp $
+# $NetBSD: Makefile,v 1.15 2022/02/11 23:03:50 mrg Exp $
 
 UBOOT_TARGET=          pinebook-pro
 UBOOT_CONFIG=          pinebook-pro-rk3399_defconfig
 UBOOT_BIN=             idbloader.img rksd_loader.img rkspi_loader.img u-boot.itb
 UBOOT_IMAGE_TYPE=      rk3399
-UBOOT_VERSION?=                2022.01
 UBOOT_MKIMAGE_RKSPI=   1
 UBOOT_RK_SPI_OFF=      768
 
diff -r ce2e306ac2db -r cdc5d3ee133a sysutils/u-boot-rock64/Makefile
--- a/sysutils/u-boot-rock64/Makefile   Fri Feb 11 22:06:22 2022 +0000
+++ b/sysutils/u-boot-rock64/Makefile   Fri Feb 11 23:03:50 2022 +0000
@@ -1,34 +1,12 @@
-# $NetBSD: Makefile,v 1.11 2021/08/12 07:30:23 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2022/02/11 23:03:50 mrg Exp $
 
-PKGREVISION=           7
 UBOOT_TARGET=          rock64
 UBOOT_CONFIG=          rock64-rk3328_defconfig
 UBOOT_BIN=             idbloader.img rksd_loader.img rkspi_loader.img u-boot.itb
+UBOOT_IMAGE_TYPE=      rk3328
+UBOOT_RK_SPI_OFF=      768
 
 UBOOT_INSTALLBOOT_PLIST=       installboot.plist
 
-DISTINFO_FILE= ${.CURDIR}/../../sysutils/u-boot-rock64/distinfo
-
-UBOOT_IMAGE_TYPE=      rk3328
-.include "../../sysutils/u-boot-rock64/u-boot-rockchip.mk"
-
-# Boot Loader stage 3-1 (BL31) EL3 Runtime Firmware
-# XXX LICENSE?
-BL31=          rk322xh_bl31_v1.41.elf
-DISTFILES+=    ${BL31}
-SITES.${BL31}= ${MASTER_SITE_GITHUB:=rockchip-linux/rkbin/raw/fc322b129b4438307ac18cbdc73c38400c7b33d9/bin/rk33/}
-
-# DDR init binary
-DDR_BIN=               rk3328_ddr_333MHz_v1.16.bin
-SITES.${DDR_BIN}=      ${MASTER_SITE_GITHUB:=rockchip-linux/rkbin/raw/6ee03f14441f4f2812c713e1027b88e3a24c546b/bin/rk33/}
-DISTFILES+=            ${DDR_BIN}
-
-REPLACE_PYTHON+=       tools/dtoc/dtoc.py
-PYTHON_FOR_BUILD_ONLY= yes
-
-# SyntaxError: Missing parentheses in call to 'print'. Did you mean print(result)?
-PYTHON_VERSIONS_ACCEPTED=      27
-
-.include "../../lang/python/application.mk"
-.include "../../sysutils/u-boot/u-boot-arm64.mk"
+.include "../../sysutils/u-boot/u-boot-rockchip.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r ce2e306ac2db -r cdc5d3ee133a sysutils/u-boot-rockpro64/Makefile
--- a/sysutils/u-boot-rockpro64/Makefile        Fri Feb 11 22:06:22 2022 +0000
+++ b/sysutils/u-boot-rockpro64/Makefile        Fri Feb 11 23:03:50 2022 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2022/02/11 22:06:23 mrg Exp $
+# $NetBSD: Makefile,v 1.17 2022/02/11 23:03:50 mrg Exp $
 
 UBOOT_TARGET=          rockpro64
 UBOOT_CONFIG=          rockpro64-rk3399_defconfig
 UBOOT_BIN=             idbloader.img rksd_loader.img rkspi_loader.img u-boot.itb
 UBOOT_IMAGE_TYPE=      rk3399
-UBOOT_VERSION?=                2022.01
 UBOOT_MKIMAGE_RKSPI=   1
 UBOOT_RK_SPI_OFF=      768
 
diff -r ce2e306ac2db -r cdc5d3ee133a sysutils/u-boot/u-boot-rockchip.mk
--- a/sysutils/u-boot/u-boot-rockchip.mk        Fri Feb 11 22:06:22 2022 +0000
+++ b/sysutils/u-boot/u-boot-rockchip.mk        Fri Feb 11 23:03:50 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: u-boot-rockchip.mk,v 1.12 2022/02/11 22:06:22 mrg Exp $
+# $NetBSD: u-boot-rockchip.mk,v 1.13 2022/02/11 23:03:50 mrg Exp $
 #
 # should be used by sysutils/u-boot-rock64/Makefile
 # used by sysutils/u-boot-rockpro64/Makefile
@@ -12,13 +12,9 @@
 #      UBOOT_IMAGE_TYPE        ("rk3399", "rk3328")
 #
 
-UBOOT_VERSION?=                2020.01-rc5
+UBOOT_VERSION?=                2022.01
 
-.if ${UBOOT_IMAGE_TYPE} == "rk3399"
 TFA=                   trusted-firmware-a
-.else
-TFA=                   arm-trusted-firmware
-.endif
 
 # Earlier SPIs were at sector 1024, but newer u-boot has a DT that
 # loads them from 768.  Until all are converted, leave the default