minor u-boot rockchip package cleanup.

rename U_BOOT_IMAGE_TYPE to UBOOT_IMAGE_TYPE -- matching the rest of pkgsrc.
remove not used (or needed) DISTINFO_FILE and PATCHDIR.

NFC.

6 files changed, 15 insertions, 26 deletions

diff --git a/sysutils/u-boot-pinebook-pro/Makefile b/sysutils/u-boot-pinebook-pro/Makefile
index abaf2897c97..e35bce61b94 100644
--- a/sysutils/u-boot-pinebook-pro/Makefile
+++ b/sysutils/u-boot-pinebook-pro/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2021/04/18 08:54:56 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2021/06/25 08:28:57 mrg Exp $
 
 PKGREVISION=		5
 
@@ -8,10 +8,6 @@ UBOOT_BIN=		idbloader.img rksd_loader.img rkspi_loader.img u-boot.itb
 
 UBOOT_INSTALLBOOT_PLIST=	installboot.plist
 
-U_BOOT_IMAGE_TYPE=	rk3399
-
-# Patches kept in pinebook-pro; first worked there.
-#DISTINFO_FILE=		${.CURDIR}/../../sysutils/u-boot-pinebook-pro/distinfo
-#PATCHDIR=		${.CURDIR}/../../sysutils/u-boot-pinebook-pro/patches
+UBOOT_IMAGE_TYPE=	rk3399
 
 .include "../../sysutils/u-boot/u-boot-rockchip.mk"
diff --git a/sysutils/u-boot-rock64/Makefile b/sysutils/u-boot-rock64/Makefile
index 0b4d0a8e9d5..61c072a6bbc 100644
--- a/sysutils/u-boot-rock64/Makefile
+++ b/sysutils/u-boot-rock64/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2021/04/26 00:35:03 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2021/06/25 08:28:57 mrg Exp $
 
 PKGREVISION=		7
 UBOOT_TARGET=		rock64
@@ -9,7 +9,7 @@ UBOOT_INSTALLBOOT_PLIST=	installboot.plist
 
 DISTINFO_FILE=	${.CURDIR}/../../sysutils/u-boot-rock64/distinfo
 
-U_BOOT_IMAGE_TYPE=	rk3328
+UBOOT_IMAGE_TYPE=	rk3328
 .include "../../sysutils/u-boot-rock64/u-boot-rockchip.mk"
 
 # Boot Loader stage 3-1 (BL31) EL3 Runtime Firmware
diff --git a/sysutils/u-boot-rock64/u-boot-rockchip.mk b/sysutils/u-boot-rock64/u-boot-rockchip.mk
index 51e69f350d3..253331a822a 100644
--- a/sysutils/u-boot-rock64/u-boot-rockchip.mk
+++ b/sysutils/u-boot-rock64/u-boot-rockchip.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: u-boot-rockchip.mk,v 1.2 2020/04/06 15:06:17 tnn Exp $
+#	$NetBSD: u-boot-rockchip.mk,v 1.3 2021/06/25 08:28:57 mrg Exp $
 #
 # used by sysutils/u-boot-rock64/Makefile
 
@@ -6,7 +6,7 @@
 #
 # Set these variables:
 #
-#	U_BOOT_IMAGE_TYPE	("rk3399", "rk3328")
+#	UBOOT_IMAGE_TYPE	("rk3399", "rk3328")
 #
 
 UBOOT_VERSION=	${GITHUB_TAG:C/-.*$//}
@@ -31,7 +31,7 @@ post-build:
 # build stage 3 package
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} u-boot.itb
 # build stage 1 loader
-	${WRKSRC}/tools/mkimage -n ${U_BOOT_IMAGE_TYPE} -T rksd -d ${WRKDIR}/${DDR_BIN} ${WRKSRC}/idbloader.img
+	${WRKSRC}/tools/mkimage -n ${UBOOT_IMAGE_TYPE} -T rksd -d ${WRKDIR}/${DDR_BIN} ${WRKSRC}/idbloader.img
 # append stage2 loader
 	cat ${WRKSRC}/spl/u-boot-spl.bin >> ${WRKSRC}/idbloader.img
 # wrap everything up into a single file that can be written to an SD card
diff --git a/sysutils/u-boot-rockpro64-ayufan/Makefile b/sysutils/u-boot-rockpro64-ayufan/Makefile
index e8f1bd87651..798c9a88092 100644
--- a/sysutils/u-boot-rockpro64-ayufan/Makefile
+++ b/sysutils/u-boot-rockpro64-ayufan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2021/04/18 07:30:28 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2021/06/25 08:28:57 mrg Exp $
 
 UBOOT_TARGET=		rockpro64
 UBOOT_CONFIG=		rockpro64-rk3399_defconfig
@@ -6,10 +6,7 @@ UBOOT_BIN=		idbloader.img rksd_loader.img rkspi_loader.img u-boot.itb
 
 UBOOT_INSTALLBOOT_PLIST=	installboot.plist
 
-U_BOOT_IMAGE_TYPE=	rk3399
-
-DISTINFO_FILE=         ${.CURDIR}/../../sysutils/u-boot-rockpro64-ayufan/distinfo
-PATCHDIR=              ${.CURDIR}/../../sysutils/u-boot-rockpro64-ayufan/patches
+UBOOT_IMAGE_TYPE=	rk3399
 
 UBOOT_VERSION=  2020.01.2014
 MASTER_SITES=   ${MASTER_SITE_GITHUB:=ayufan-rock64/}
diff --git a/sysutils/u-boot-rockpro64/Makefile b/sysutils/u-boot-rockpro64/Makefile
index 73403f78b77..60b78e8539b 100644
--- a/sysutils/u-boot-rockpro64/Makefile
+++ b/sysutils/u-boot-rockpro64/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2021/04/18 07:30:28 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2021/06/25 08:28:57 mrg Exp $
 
 UBOOT_TARGET=		rockpro64
 UBOOT_CONFIG=		rockpro64-rk3399_defconfig
@@ -6,10 +6,6 @@ UBOOT_BIN=		idbloader.img rksd_loader.img rkspi_loader.img u-boot.itb
 
 UBOOT_INSTALLBOOT_PLIST=	installboot.plist
 
-U_BOOT_IMAGE_TYPE=	rk3399
-
-# Patches kept in pinebook-pro; first worked there.
-DISTINFO_FILE=		${.CURDIR}/../../sysutils/u-boot-pinebook-pro/distinfo
-PATCHDIR=		${.CURDIR}/../../sysutils/u-boot-pinebook-pro/patches
+UBOOT_IMAGE_TYPE=	rk3399
 
 .include "../../sysutils/u-boot/u-boot-rockchip.mk"
diff --git a/sysutils/u-boot/u-boot-rockchip.mk b/sysutils/u-boot/u-boot-rockchip.mk
index 339ec0a73f8..5a5b2655a6f 100644
--- a/sysutils/u-boot/u-boot-rockchip.mk
+++ b/sysutils/u-boot/u-boot-rockchip.mk
@@ -1,4 +1,4 @@
-# $NetBSD: u-boot-rockchip.mk,v 1.10 2021/04/18 07:30:28 mrg Exp $
+# $NetBSD: u-boot-rockchip.mk,v 1.11 2021/06/25 08:28:57 mrg Exp $
 #
 # should be used by sysutils/u-boot-rock64/Makefile
 # used by sysutils/u-boot-rockpro64/Makefile
@@ -8,12 +8,12 @@
 #
 # Set these variables:
 #
-#	U_BOOT_IMAGE_TYPE	("rk3399", "rk3328")
+#	UBOOT_IMAGE_TYPE	("rk3399", "rk3328")
 #
 
 UBOOT_VERSION?=		2020.01-rc5
 
-MAKE_ENV+=		BL31=${PREFIX}/share/arm-trusted-firmware/${U_BOOT_IMAGE_TYPE}/bl31.elf
+MAKE_ENV+=		BL31=${PREFIX}/share/arm-trusted-firmware/${UBOOT_IMAGE_TYPE}/bl31.elf
 
 post-build:
 # wrap everything up into a single file that can be written to an SD card
@@ -27,5 +27,5 @@ post-build:
 	done < ${WRKSRC}/idbloader.img > ${WRKSRC}/rkspi_loader.img 2> /dev/null
 	dd if=${WRKSRC}/u-boot.itb seek=1024 conv=notrunc of=${WRKSRC}/rkspi_loader.img
 
-.include "../../sysutils/arm-trusted-firmware-${U_BOOT_IMAGE_TYPE}/buildlink3.mk"
+.include "../../sysutils/arm-trusted-firmware-${UBOOT_IMAGE_TYPE}/buildlink3.mk"
 .include "../../sysutils/u-boot/u-boot-arm64.mk"