- Re-factor the arm-trusted-firmware packages into common definitions and

  build infrastructure.
- Update arm-trusted-firmware to v2.3.

24 files changed, 125 insertions, 398 deletions

diff --git a/sysutils/arm-trusted-firmware-fiptool/Makefile b/sysutils/arm-trusted-firmware-fiptool/Makefile
index 20db2a7a9be..445a88a7b75 100644
--- a/sysutils/arm-trusted-firmware-fiptool/Makefile
+++ b/sysutils/arm-trusted-firmware-fiptool/Makefile
@@ -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
+# We override WRKSRC, so we provide our own patches (and thus distinfo)
+DISTINFO_FILE=	${.CURDIR}/distinfo
+PATCHDIR=	${.CURDIR}/patches
 
-MAINTAINER=	port-arm@NetBSD.org
-HOMEPAGE=	https://github.com/ARM-software/arm-trusted-firmware/
-COMMENT=	ARM Trusted Firmware fiptool
-LICENSE=	modified-bsd
+.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
diff --git a/sysutils/arm-trusted-firmware-fiptool/distinfo b/sysutils/arm-trusted-firmware-fiptool/distinfo
index 835ed12bcde..16405263391 100644
--- a/sysutils/arm-trusted-firmware-fiptool/distinfo
+++ b/sysutils/arm-trusted-firmware-fiptool/distinfo
@@ -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 --git a/sysutils/arm-trusted-firmware-fiptool/patches/patch-Makefile b/sysutils/arm-trusted-firmware-fiptool/patches/patch-Makefile
index 271f3b4dddc..b05af947e96 100644
--- a/sysutils/arm-trusted-firmware-fiptool/patches/patch-Makefile
+++ b/sysutils/arm-trusted-firmware-fiptool/patches/patch-Makefile
@@ -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 --git a/sysutils/arm-trusted-firmware-fiptool/patches/patch-fiptool_uuid_parse b/sysutils/arm-trusted-firmware-fiptool/patches/patch-fiptool_uuid_parse
deleted file mode 100644
index 3cdff328f27..00000000000
--- a/sysutils/arm-trusted-firmware-fiptool/patches/patch-fiptool_uuid_parse
+++ /dev/null
@@ -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 --git a/sysutils/arm-trusted-firmware-rk3328/Makefile b/sysutils/arm-trusted-firmware-rk3328/Makefile
index 6bc1f150fc1..782d32969cc 100644
--- a/sysutils/arm-trusted-firmware-rk3328/Makefile
+++ b/sysutils/arm-trusted-firmware-rk3328/Makefile
@@ -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
-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"
diff --git a/sysutils/arm-trusted-firmware-rk3328/buildlink3.mk b/sysutils/arm-trusted-firmware-rk3328/buildlink3.mk
index d371930b151..a70cb195e87 100644
--- a/sysutils/arm-trusted-firmware-rk3328/buildlink3.mk
+++ b/sysutils/arm-trusted-firmware-rk3328/buildlink3.mk
@@ -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-rk3328
 .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 --git a/sysutils/arm-trusted-firmware-rk3328/distinfo b/sysutils/arm-trusted-firmware-rk3328/distinfo
deleted file mode 100644
index f1933addce3..00000000000
--- a/sysutils/arm-trusted-firmware-rk3328/distinfo
+++ /dev/null
@@ -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 --git a/sysutils/arm-trusted-firmware-rk3399/Makefile b/sysutils/arm-trusted-firmware-rk3399/Makefile
index d413ab908f5..9fd230718ac 100644
--- a/sysutils/arm-trusted-firmware-rk3399/Makefile
+++ b/sysutils/arm-trusted-firmware-rk3399/Makefile
@@ -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
-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"
diff --git a/sysutils/arm-trusted-firmware-rk3399/buildlink3.mk b/sysutils/arm-trusted-firmware-rk3399/buildlink3.mk
index 4ca89f165bc..f3fde672c7d 100644
--- a/sysutils/arm-trusted-firmware-rk3399/buildlink3.mk
+++ b/sysutils/arm-trusted-firmware-rk3399/buildlink3.mk
@@ -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-rk3399
 .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 --git a/sysutils/arm-trusted-firmware-rk3399/distinfo b/sysutils/arm-trusted-firmware-rk3399/distinfo
deleted file mode 100644
index ea61b2db701..00000000000
--- a/sysutils/arm-trusted-firmware-rk3399/distinfo
+++ /dev/null
@@ -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 --git a/sysutils/arm-trusted-firmware-rk3399/patches/patch-plat_rockchip_common_params_setup.c b/sysutils/arm-trusted-firmware-rk3399/patches/patch-plat_rockchip_common_params_setup.c
deleted file mode 100644
index 4ddc940abda..00000000000
--- a/sysutils/arm-trusted-firmware-rk3399/patches/patch-plat_rockchip_common_params_setup.c
+++ /dev/null
@@ -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>
- 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 @@
- 
- #include <assert.h>
- #include <errno.h>
-+#include <limits.h>
- #include <string.h>
- 
- #include <lib/bl_aux_params/bl_aux_params.h>
-@@ -21,8 +22,8 @@
- #include <plat_params.h>
- #include <plat_private.h>
- 
--static struct bl_aux_gpio_info rst_gpio;
--static struct bl_aux_gpio_info poweroff_gpio;
-+static struct bl_aux_gpio_info rst_gpio = { .index = UINT_MAX };
-+static struct bl_aux_gpio_info poweroff_gpio = { .index = UINT_MAX };
- static struct bl_aux_gpio_info suspend_gpio[10];
- uint32_t suspend_gpio_cnt;
- static struct bl_aux_rk_apio_info suspend_apio;
-@@ -174,11 +175,17 @@
- 
- struct bl_aux_gpio_info *plat_get_rockchip_gpio_reset(void)
- {
-+	if (rst_gpio.index == UINT_MAX)
-+		return NULL;
-+
- 	return &rst_gpio;
- }
- 
- struct bl_aux_gpio_info *plat_get_rockchip_gpio_poweroff(void)
- {
-+	if (poweroff_gpio.index == UINT_MAX)
-+		return NULL;
-+
- 	return &poweroff_gpio;
- }
- 
diff --git a/sysutils/arm-trusted-firmware-rk3399/patches/patch-plat_rockchip_rk3399_drivers_pmu_pmu.c b/sysutils/arm-trusted-firmware-rk3399/patches/patch-plat_rockchip_rk3399_drivers_pmu_pmu.c
deleted file mode 100644
index 82b13cb3b58..00000000000
--- a/sysutils/arm-trusted-firmware-rk3399/patches/patch-plat_rockchip_rk3399_drivers_pmu_pmu.c
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-plat_rockchip_rk3399_drivers_pmu_pmu.c,v 1.2 2020/02/23 01:01:11 mrg Exp $
-
-pull in https://github.com/ARM-software/arm-trusted-firmware/commit/b4899041e5f0b8e8b388c6511b5233516b8785ec
-
- plat/rockchip: enable power domains of rk3399 before reset
-
- This patch fixes hangs that happen after soft resetting of rk3399.
-
- Signed-off-by: Piotr Szczepanik <piter75@gmail.com>
- Change-Id: If41b12ba1dfcb2ba937361b58eafd50bf5c483d4
-
-
---- plat/rockchip/rk3399/drivers/pmu/pmu.c.orig	2019-10-22 06:36:23.000000000 -0700
-+++ plat/rockchip/rk3399/drivers/pmu/pmu.c	2020-02-22 03:31:50.759523535 -0800
-@@ -400,6 +400,25 @@
- 	clk_gate_con_restore();
- }
- 
-+void pmu_power_domains_on(void)
-+{
-+	clk_gate_con_disable();
-+	pmu_set_power_domain(PD_VDU, pmu_pd_on);
-+	pmu_set_power_domain(PD_VCODEC, pmu_pd_on);
-+	pmu_set_power_domain(PD_RGA, pmu_pd_on);
-+	pmu_set_power_domain(PD_IEP, pmu_pd_on);
-+	pmu_set_power_domain(PD_EDP, pmu_pd_on);
-+	pmu_set_power_domain(PD_GMAC, pmu_pd_on);
-+	pmu_set_power_domain(PD_SDIOAUDIO, pmu_pd_on);
-+	pmu_set_power_domain(PD_HDCP, pmu_pd_on);
-+	pmu_set_power_domain(PD_ISP1, pmu_pd_on);
-+	pmu_set_power_domain(PD_ISP0, pmu_pd_on);
-+	pmu_set_power_domain(PD_VO, pmu_pd_on);
-+	pmu_set_power_domain(PD_TCPD1, pmu_pd_on);
-+	pmu_set_power_domain(PD_TCPD0, pmu_pd_on);
-+	pmu_set_power_domain(PD_GPU, pmu_pd_on);
-+}
-+
- void rk3399_flush_l2_b(void)
- {
- 	uint32_t wait_cnt = 0;
diff --git a/sysutils/arm-trusted-firmware-rk3399/patches/patch-plat_rockchip_rk3399_drivers_pmu_pmu.h b/sysutils/arm-trusted-firmware-rk3399/patches/patch-plat_rockchip_rk3399_drivers_pmu_pmu.h
deleted file mode 100644
index d53d55fdbb9..00000000000
--- a/sysutils/arm-trusted-firmware-rk3399/patches/patch-plat_rockchip_rk3399_drivers_pmu_pmu.h
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-plat_rockchip_rk3399_drivers_pmu_pmu.h,v 1.2 2020/02/23 01:01:11 mrg Exp $
-
-pull in https://github.com/ARM-software/arm-trusted-firmware/commit/b4899041e5f0b8e8b388c6511b5233516b8785ec
-
- plat/rockchip: enable power domains of rk3399 before reset
-
- This patch fixes hangs that happen after soft resetting of rk3399.
-
- Signed-off-by: Piotr Szczepanik <piter75@gmail.com>
- Change-Id: If41b12ba1dfcb2ba937361b58eafd50bf5c483d4
-
-
---- plat/rockchip/rk3399/drivers/pmu/pmu.h.orig	2019-10-22 06:36:23.000000000 -0700
-+++ plat/rockchip/rk3399/drivers/pmu/pmu.h	2020-02-22 02:32:31.695012124 -0800
-@@ -136,5 +136,6 @@
- extern uint32_t clst_warmboot_data[PLATFORM_CLUSTER_COUNT];
- 
- extern void sram_func_set_ddrctl_pll(uint32_t pll_src);
-+void pmu_power_domains_on(void);
- 
- #endif /* PMU_H */
diff --git a/sysutils/arm-trusted-firmware-rk3399/patches/patch-plat_rockchip_rk3399_drivers_soc_soc.c b/sysutils/arm-trusted-firmware-rk3399/patches/patch-plat_rockchip_rk3399_drivers_soc_soc.c
deleted file mode 100644
index bbd03b192d5..00000000000
--- a/sysutils/arm-trusted-firmware-rk3399/patches/patch-plat_rockchip_rk3399_drivers_soc_soc.c
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-plat_rockchip_rk3399_drivers_soc_soc.c,v 1.2 2020/02/23 01:01:11 mrg Exp $
-
-pull in https://github.com/ARM-software/arm-trusted-firmware/commit/b4899041e5f0b8e8b388c6511b5233516b8785ec
-
- plat/rockchip: enable power domains of rk3399 before reset
-
- This patch fixes hangs that happen after soft resetting of rk3399.
-
- Signed-off-by: Piotr Szczepanik <piter75@gmail.com>
- Change-Id: If41b12ba1dfcb2ba937361b58eafd50bf5c483d4
-
-
---- plat/rockchip/rk3399/drivers/soc/soc.c.orig	2020-02-22 02:30:58.094221102 -0800
-+++ plat/rockchip/rk3399/drivers/soc/soc.c	2020-02-22 02:31:04.989130511 -0800
-@@ -17,6 +17,7 @@
- #include <dram.h>
- #include <m0_ctl.h>
- #include <plat_private.h>
-+#include <pmu.h>
- #include <rk3399_def.h>
- #include <secure.h>
- #include <soc.h>
-@@ -327,6 +328,7 @@
- 
- void __dead2 soc_global_soft_reset(void)
- {
-+	pmu_power_domains_on();
- 	set_pll_slow_mode(VPLL_ID);
- 	set_pll_slow_mode(NPLL_ID);
- 	set_pll_slow_mode(GPLL_ID);
diff --git a/sysutils/arm-trusted-firmware-sun50i-h6/Makefile b/sysutils/arm-trusted-firmware-sun50i-h6/Makefile
index db51bdde7c3..6b639a64f0f 100644
--- a/sysutils/arm-trusted-firmware-sun50i-h6/Makefile
+++ b/sysutils/arm-trusted-firmware-sun50i-h6/Makefile
@@ -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
-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"
diff --git a/sysutils/arm-trusted-firmware-sun50i-h6/buildlink3.mk b/sysutils/arm-trusted-firmware-sun50i-h6/buildlink3.mk
index 313f5b37b50..c761b28d260 100644
--- a/sysutils/arm-trusted-firmware-sun50i-h6/buildlink3.mk
+++ b/sysutils/arm-trusted-firmware-sun50i-h6/buildlink3.mk
@@ -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-sun50i-h6
 .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
 
diff --git a/sysutils/arm-trusted-firmware-sun50i-h6/distinfo b/sysutils/arm-trusted-firmware-sun50i-h6/distinfo
deleted file mode 100644
index 1b04b5c7782..00000000000
--- a/sysutils/arm-trusted-firmware-sun50i-h6/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.2 2020/04/04 15:12:17 thorpej Exp $
-
-SHA1 (arm-trusted-firmware-sun50i-h6-20180207nb1-406a637162bee1f1b0c26525c3aae204aac241fa.zip) = 57cb3ee8bbcd225e3b643bc57676a85fd413e77a
-RMD160 (arm-trusted-firmware-sun50i-h6-20180207nb1-406a637162bee1f1b0c26525c3aae204aac241fa.zip) = 60a903dfbb523ef09c9c052cbc77bcf21efe7a67
-SHA512 (arm-trusted-firmware-sun50i-h6-20180207nb1-406a637162bee1f1b0c26525c3aae204aac241fa.zip) = 6f9b7b27b1d449a313b7b04b400f463356018b446e6e7c3cf20f6ee9625231d39d2e1bbe35049eb2c992a7b9c1e902e69e2ffb8b207a8c7bec577eae2fe1e472
-Size (arm-trusted-firmware-sun50i-h6-20180207nb1-406a637162bee1f1b0c26525c3aae204aac241fa.zip) = 3330975 bytes
-SHA1 (patch-plat_allwinner_sun50i_h6_include_sunxi_mmap.h) = 08a603aa0fdb2c352ce50ee5644d24af71040062
diff --git a/sysutils/arm-trusted-firmware-sun50i_a64/Makefile b/sysutils/arm-trusted-firmware-sun50i_a64/Makefile
index 45bc09a68c7..5ec1f40bcd8 100644
--- a/sysutils/arm-trusted-firmware-sun50i_a64/Makefile
+++ b/sysutils/arm-trusted-firmware-sun50i_a64/Makefile
@@ -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
-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"
diff --git a/sysutils/arm-trusted-firmware-sun50i_a64/buildlink3.mk b/sysutils/arm-trusted-firmware-sun50i_a64/buildlink3.mk
index 6a920c594cf..ab69948c8d1 100644
--- a/sysutils/arm-trusted-firmware-sun50i_a64/buildlink3.mk
+++ b/sysutils/arm-trusted-firmware-sun50i_a64/buildlink3.mk
@@ -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-sun50i_a64
 .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
 
diff --git a/sysutils/arm-trusted-firmware-sun50i_a64/distinfo b/sysutils/arm-trusted-firmware-sun50i_a64/distinfo
deleted file mode 100644
index f90ba2ec86c..00000000000
--- a/sysutils/arm-trusted-firmware-sun50i_a64/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2019/02/27 06:23:39 martin Exp $
-
-SHA1 (arm-trusted-firmware-2.0.20190222-ab3d22473df279c61ed4d4873d26b072dcf887e8.zip) = 1f69ac8f78d69d90b8058aab57e8ac353cf511c4
-RMD160 (arm-trusted-firmware-2.0.20190222-ab3d22473df279c61ed4d4873d26b072dcf887e8.zip) = 6bd065014ddbd12a17b3ab261f81a3fa3710ea96
-SHA512 (arm-trusted-firmware-2.0.20190222-ab3d22473df279c61ed4d4873d26b072dcf887e8.zip) = 6f0a9ed7d1eb694015507dc3b618dcc017192f1963dfdd4fb00ba1a18b42539be29b10513bfb7a8535e77b631ccdaa10944900bd984617f19bef0845a61e6d5d
-Size (arm-trusted-firmware-2.0.20190222-ab3d22473df279c61ed4d4873d26b072dcf887e8.zip) = 4924422 bytes
diff --git a/sysutils/arm-trusted-firmware/arm-trusted-firmware-dist.mk b/sysutils/arm-trusted-firmware/arm-trusted-firmware-dist.mk
new file mode 100644
index 00000000000..6198c35ac9e
--- /dev/null
+++ b/sysutils/arm-trusted-firmware/arm-trusted-firmware-dist.mk
@@ -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
+HOMEPAGE=	https://github.com/ARM-software/arm-trusted-firmware/
+LICENSE=	modified-bsd
+
+USE_TOOLS+=	gmake
diff --git a/sysutils/arm-trusted-firmware/arm-trusted-firmware.mk b/sysutils/arm-trusted-firmware/arm-trusted-firmware.mk
new file mode 100644
index 00000000000..21c2eeb8778
--- /dev/null
+++ b/sysutils/arm-trusted-firmware/arm-trusted-firmware.mk
@@ -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"
diff --git a/sysutils/arm-trusted-firmware/distinfo b/sysutils/arm-trusted-firmware/distinfo
new file mode 100644
index 00000000000..44da9b83bda
--- /dev/null
+++ b/sysutils/arm-trusted-firmware/distinfo
@@ -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
diff --git a/sysutils/arm-trusted-firmware-sun50i-h6/patches/patch-plat_allwinner_sun50i_h6_include_sunxi_mmap.h b/sysutils/arm-trusted-firmware/patches/patch-plat_allwinner_sun50i_h6_include_sunxi_mmap.h
index 47d97f84d12..38db592db3d 100644
--- a/sysutils/arm-trusted-firmware-sun50i-h6/patches/patch-plat_allwinner_sun50i_h6_include_sunxi_mmap.h
+++ b/sysutils/arm-trusted-firmware/patches/patch-plat_allwinner_sun50i_h6_include_sunxi_mmap.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-plat_allwinner_sun50i_h6_include_sunxi_mmap.h,v 1.1 2020/04/04 15:12:17 thorpej Exp $
+$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-03-26 22:13:21.000000000 +0000
-+++ plat/allwinner/sun50i_h6/include/sunxi_mmap.h
-@@ -65,4 +65,8 @@
+--- 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
  
@@ -12,4 +12,4 @@ Work around broken H6 WDOG reset.
 +#undef SUNXI_WDOG_BASE
 +#define SUNXI_WDOG_BASE			SUNXI_R_WDOG_BASE
 +
- #endif /* __SUNXI_MMAP_H__ */
+ #endif /* SUNXI_MMAP_H */