I have none of the platforms involved but this builds at least. RK3399 BL31_BASE is now 0x40000 upstream.
Index: Makefile =================================================================== RCS file: /cvs/ports/sysutils/arm-trusted-firmware/Makefile,v retrieving revision 1.12 diff -u -p -r1.12 Makefile --- Makefile 27 Sep 2019 15:43:29 -0000 1.12 +++ Makefile 9 Nov 2019 13:24:17 -0000 @@ -6,10 +6,9 @@ COMMENT= ARM Trusted Firmware GH_ACCOUNT= ARM-software GH_PROJECT= arm-trusted-firmware -GH_TAGNAME= v2.1 +GH_TAGNAME= v2.2 EPOCH= 0 -REVISION= 0 CATEGORIES= sysutils Index: distinfo =================================================================== RCS file: /cvs/ports/sysutils/arm-trusted-firmware/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- distinfo 3 Apr 2019 00:19:56 -0000 1.6 +++ distinfo 9 Nov 2019 13:15:24 -0000 @@ -1,2 +1,2 @@ -SHA256 (arm-trusted-firmware-2.1.tar.gz) = fEwApPKNPPuyNf0aH7KMTS/B1lfJMBaG59iCTvV10Fk= -SIZE (arm-trusted-firmware-2.1.tar.gz) = 3670018 +SHA256 (arm-trusted-firmware-2.2.tar.gz) = B+PAWK4tlcfVFqRvyTVlt5fpEsMnHdvynfUjsase6RE= +SIZE (arm-trusted-firmware-2.2.tar.gz) = 3885995 Index: patches/patch-plat_rockchip_rk3328_rk3328_def_h =================================================================== RCS file: /cvs/ports/sysutils/arm-trusted-firmware/patches/patch-plat_rockchip_rk3328_rk3328_def_h,v retrieving revision 1.1 diff -u -p -r1.1 patch-plat_rockchip_rk3328_rk3328_def_h --- patches/patch-plat_rockchip_rk3328_rk3328_def_h 27 Sep 2019 15:43:29 -0000 1.1 +++ patches/patch-plat_rockchip_rk3328_rk3328_def_h 9 Nov 2019 13:22:57 -0000 @@ -3,10 +3,10 @@ $OpenBSD: patch-plat_rockchip_rk3328_rk3 Index: plat/rockchip/rk3328/rk3328_def.h --- plat/rockchip/rk3328/rk3328_def.h.orig +++ plat/rockchip/rk3328/rk3328_def.h -@@ -98,7 +98,7 @@ +@@ -103,7 +103,7 @@ + /************************************************************************** * UART related constants **************************************************************************/ - #define RK3328_UART2_BASE UART2_BASE -#define RK3328_BAUDRATE 1500000 +#define RK3328_BAUDRATE 115200 #define RK3328_UART_CLOCK 24000000 Index: patches/patch-plat_rockchip_rk3399_include_shared_bl31_param_h =================================================================== RCS file: patches/patch-plat_rockchip_rk3399_include_shared_bl31_param_h diff -N patches/patch-plat_rockchip_rk3399_include_shared_bl31_param_h --- patches/patch-plat_rockchip_rk3399_include_shared_bl31_param_h 7 Feb 2019 07:23:50 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-plat_rockchip_rk3399_include_shared_bl31_param_h,v 1.2 2019/02/07 07:23:50 patrick Exp $ - -Index: plat/rockchip/rk3399/include/shared/bl31_param.h ---- plat/rockchip/rk3399/include/shared/bl31_param.h.orig -+++ plat/rockchip/rk3399/include/shared/bl31_param.h -@@ -20,7 +20,7 @@ - /* - * Put BL31 at the top of the Trusted RAM - */ --#define BL31_BASE (TZRAM_BASE + 0x1000) -+#define BL31_BASE (TZRAM_BASE + 0x10000) - #define BL31_LIMIT (TZRAM_BASE + TZRAM_SIZE) - - #endif /* BL31_PARAM_H */
