[pkgsrc/trunk]: pkgsrc/sysutils minor u-boot rockchip package cleanup.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a8ba64faf477
branches:  trunk
changeset: 454981:a8ba64faf477
user:      mrg <mrg%pkgsrc.org@localhost>
date:      Fri Jun 25 08:28:57 2021 +0000

description:
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.

diffstat:

 sysutils/u-boot-pinebook-pro/Makefile     |  8 ++------
 sysutils/u-boot-rock64/Makefile           |  4 ++--
 sysutils/u-boot-rock64/u-boot-rockchip.mk |  6 +++---
 sysutils/u-boot-rockpro64-ayufan/Makefile |  7 ++-----
 sysutils/u-boot-rockpro64/Makefile        |  8 ++------
 sysutils/u-boot/u-boot-rockchip.mk        |  8 ++++----
 6 files changed, 15 insertions(+), 26 deletions(-)

diffs (139 lines):

diff -r 595535e72a76 -r a8ba64faf477 sysutils/u-boot-pinebook-pro/Makefile
--- a/sysutils/u-boot-pinebook-pro/Makefile     Fri Jun 25 07:26:10 2021 +0000
+++ b/sysutils/u-boot-pinebook-pro/Makefile     Fri Jun 25 08:28:57 2021 +0000
@@ -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_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 -r 595535e72a76 -r a8ba64faf477 sysutils/u-boot-rock64/Makefile
--- a/sysutils/u-boot-rock64/Makefile   Fri Jun 25 07:26:10 2021 +0000
+++ b/sysutils/u-boot-rock64/Makefile   Fri Jun 25 08:28:57 2021 +0000
@@ -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 @@
 
 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 -r 595535e72a76 -r a8ba64faf477 sysutils/u-boot-rock64/u-boot-rockchip.mk
--- a/sysutils/u-boot-rock64/u-boot-rockchip.mk Fri Jun 25 07:26:10 2021 +0000
+++ b/sysutils/u-boot-rock64/u-boot-rockchip.mk Fri Jun 25 08:28:57 2021 +0000
@@ -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 @@
 # 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 -r 595535e72a76 -r a8ba64faf477 sysutils/u-boot-rockpro64-ayufan/Makefile
--- a/sysutils/u-boot-rockpro64-ayufan/Makefile Fri Jun 25 07:26:10 2021 +0000
+++ b/sysutils/u-boot-rockpro64-ayufan/Makefile Fri Jun 25 08:28:57 2021 +0000
@@ -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_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 -r 595535e72a76 -r a8ba64faf477 sysutils/u-boot-rockpro64/Makefile
--- a/sysutils/u-boot-rockpro64/Makefile        Fri Jun 25 07:26:10 2021 +0000
+++ b/sysutils/u-boot-rockpro64/Makefile        Fri Jun 25 08:28:57 2021 +0000
@@ -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_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 -r 595535e72a76 -r a8ba64faf477 sysutils/u-boot/u-boot-rockchip.mk
--- a/sysutils/u-boot/u-boot-rockchip.mk        Fri Jun 25 07:26:10 2021 +0000
+++ b/sysutils/u-boot/u-boot-rockchip.mk        Fri Jun 25 08:28:57 2021 +0000
@@ -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 @@
        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"