From 6296545b61c910dee03a5ce97caef6f34bb8f6ec Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Thu, 12 Aug 2021 07:30:21 +0000
Subject: u-boot*: fix more pkglint

---
 sysutils/u-boot-apple-m1/Makefile               | 3 ++-
 sysutils/u-boot-ci20/Makefile                   | 3 ++-
 sysutils/u-boot-jetson-nano/Makefile            | 3 ++-
 sysutils/u-boot-jetson-tx1/Makefile             | 3 ++-
 sysutils/u-boot-jetson-tx2/Makefile             | 3 ++-
 sysutils/u-boot-libretech-all-h3-cc-h5/Makefile | 3 ++-
 sysutils/u-boot-libretech-cc/Makefile           | 3 ++-
 sysutils/u-boot-nanopi-neo-plus2/Makefile       | 3 ++-
 sysutils/u-boot-nanopi-neo2/Makefile            | 3 ++-
 sysutils/u-boot-odroid-c2/Makefile              | 3 ++-
 sysutils/u-boot-orangepi-lite2/Makefile         | 3 ++-
 sysutils/u-boot-orangepi-zero-plus/Makefile     | 3 ++-
 sysutils/u-boot-pine-h64/Makefile               | 3 ++-
 sysutils/u-boot-pine64/Makefile                 | 3 ++-
 sysutils/u-boot-pinebook-pro/Makefile           | 3 ++-
 sysutils/u-boot-pinebook/Makefile               | 7 ++++---
 sysutils/u-boot-pinephone/Makefile              | 7 ++++---
 sysutils/u-boot-roc-rk3328-cc/Makefile          | 3 ++-
 sysutils/u-boot-rock64/Makefile                 | 3 ++-
 sysutils/u-boot-rockpro64-ayufan/Makefile       | 4 +++-
 sysutils/u-boot-rockpro64/Makefile              | 3 ++-
 sysutils/u-boot-sopine-baseboard/Makefile       | 3 ++-
 sysutils/u-boot/u-boot-arm64.mk                 | 4 +---
 sysutils/u-boot/u-boot-mipsel.mk                | 3 +--
 sysutils/u-boot/u-boot-powerpc.mk               | 3 +--
 25 files changed, 52 insertions(+), 33 deletions(-)

diff --git a/sysutils/u-boot-apple-m1/Makefile b/sysutils/u-boot-apple-m1/Makefile
index f59203f5c47..8aa8f6cadb0 100644
--- a/sysutils/u-boot-apple-m1/Makefile
+++ b/sysutils/u-boot-apple-m1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2021/03/06 20:17:39 jmcneill Exp $
+# $NetBSD: Makefile,v 1.2 2021/08/12 07:30:21 wiz Exp $
 
 UBOOT_TARGET=		apple-m1
 UBOOT_CONFIG=		apple_m1_defconfig
@@ -27,3 +27,4 @@ post-build:
 	    ${PREFIX}/share/dtb/arm64/apple/apple-m1-j274.dtb@0x803060000
 
 .include "../../sysutils/u-boot/u-boot-arm64.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-ci20/Makefile b/sysutils/u-boot-ci20/Makefile
index c3fe496ae64..7048f22b3a1 100644
--- a/sysutils/u-boot-ci20/Makefile
+++ b/sysutils/u-boot-ci20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/06/20 17:46:28 thorpej Exp $
+# $NetBSD: Makefile,v 1.2 2021/08/12 07:30:21 wiz Exp $
 
 UBOOT_TARGET=		ci20
 UBOOT_CONFIG=		ci20_mmc_defconfig
@@ -18,3 +18,4 @@ post-build:
 	cp ${WRKSRC}/spl/u-boot-spl.bin ${WRKSRC}/u-boot-spl.bin
 
 .include "../../sysutils/u-boot/u-boot-mipsel.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-jetson-nano/Makefile b/sysutils/u-boot-jetson-nano/Makefile
index 53fc056d95d..07c5f9009aa 100644
--- a/sysutils/u-boot-jetson-nano/Makefile
+++ b/sysutils/u-boot-jetson-nano/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/06/20 22:29:12 thorpej Exp $
+# $NetBSD: Makefile,v 1.2 2021/08/12 07:30:21 wiz Exp $
 
 UBOOT_TARGET=		jetson-nano
 UBOOT_CONFIG=		p3450-0000_defconfig
@@ -18,3 +18,4 @@ CHECK_PORTABILITY_SKIP+=	tools/imx8m_image.sh
 PKG_DEFAULT_OPTIONS+=	el1
 
 .include "../../sysutils/u-boot/u-boot-arm64.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-jetson-tx1/Makefile b/sysutils/u-boot-jetson-tx1/Makefile
index 83547c22de2..9c736f1d389 100644
--- a/sysutils/u-boot-jetson-tx1/Makefile
+++ b/sysutils/u-boot-jetson-tx1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/04/26 08:32:29 skrll Exp $
+# $NetBSD: Makefile,v 1.9 2021/08/12 07:30:21 wiz Exp $
 
 UBOOT_TARGET=		jetson-tx1
 UBOOT_CONFIG=		p2371-2180_defconfig
@@ -10,3 +10,4 @@ PKGREVISION=		3
 PKG_DEFAULT_OPTIONS+=	el1
 
 .include "../../sysutils/u-boot/u-boot-arm64.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-jetson-tx2/Makefile b/sysutils/u-boot-jetson-tx2/Makefile
index 8fc4d76baab..fda054a5bbe 100644
--- a/sysutils/u-boot-jetson-tx2/Makefile
+++ b/sysutils/u-boot-jetson-tx2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2021/02/18 14:55:32 martin Exp $
+# $NetBSD: Makefile,v 1.8 2021/08/12 07:30:21 wiz Exp $
 
 UBOOT_TARGET=		jetson-tx2
 UBOOT_CONFIG=		p2771-0000-500_defconfig
@@ -10,3 +10,4 @@ PKGREVISION=		3
 # PKG_DEFAULT_OPTIONS+=	el1
 
 .include "../../sysutils/u-boot/u-boot-arm64.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-libretech-all-h3-cc-h5/Makefile b/sysutils/u-boot-libretech-all-h3-cc-h5/Makefile
index efc78182c8c..d84f98da367 100644
--- a/sysutils/u-boot-libretech-all-h3-cc-h5/Makefile
+++ b/sysutils/u-boot-libretech-all-h3-cc-h5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/06/21 19:43:48 thorpej Exp $
+# $NetBSD: Makefile,v 1.2 2021/08/12 07:30:21 wiz Exp $
 
 UBOOT_TARGET=		libretech-all-h3-cc-h5
 UBOOT_CONFIG=		libretech_all_h3_cc_h5_defconfig
@@ -17,3 +17,4 @@ post-build:
 
 .include "../../sysutils/arm-trusted-firmware-sun50i_a64/buildlink3.mk"
 .include "../../sysutils/u-boot/u-boot-arm64.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-libretech-cc/Makefile b/sysutils/u-boot-libretech-cc/Makefile
index fd1b0a9a853..cdf479d88fc 100644
--- a/sysutils/u-boot-libretech-cc/Makefile
+++ b/sysutils/u-boot-libretech-cc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/04/26 08:32:29 skrll Exp $
+# $NetBSD: Makefile,v 1.3 2021/08/12 07:30:22 wiz Exp $
 
 UBOOT_TARGET=		libretech-cc
 UBOOT_CONFIG=		${UBOOT_TARGET}_defconfig
@@ -7,3 +7,4 @@ UBOOT_BIN=		u-boot u-boot-dtb.bin
 PKGREVISION=		1
 
 .include "../../sysutils/u-boot/u-boot-arm64.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-nanopi-neo-plus2/Makefile b/sysutils/u-boot-nanopi-neo-plus2/Makefile
index 79d95b5ec27..f603a3a6258 100644
--- a/sysutils/u-boot-nanopi-neo-plus2/Makefile
+++ b/sysutils/u-boot-nanopi-neo-plus2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2019/11/04 21:28:56 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2021/08/12 07:30:22 wiz Exp $
 
 UBOOT_TARGET=		nanopi-neo-plus2
 UBOOT_CONFIG=		nanopi_neo_plus2_defconfig
@@ -19,3 +19,4 @@ post-build:
 
 .include "../../sysutils/arm-trusted-firmware-sun50i_a64/buildlink3.mk"
 .include "../../sysutils/u-boot/u-boot-arm64.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-nanopi-neo2/Makefile b/sysutils/u-boot-nanopi-neo2/Makefile
index ebd037e8dd0..d1fc5f47b5e 100644
--- a/sysutils/u-boot-nanopi-neo2/Makefile
+++ b/sysutils/u-boot-nanopi-neo2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/11/04 21:28:56 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2021/08/12 07:30:22 wiz Exp $
 
 UBOOT_TARGET=		nanopi-neo2
 UBOOT_CONFIG=		nanopi_neo2_defconfig
@@ -19,3 +19,4 @@ post-build:
 
 .include "../../sysutils/arm-trusted-firmware-sun50i_a64/buildlink3.mk"
 .include "../../sysutils/u-boot/u-boot-arm64.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-odroid-c2/Makefile b/sysutils/u-boot-odroid-c2/Makefile
index dafe147eb3f..771daddc921 100644
--- a/sysutils/u-boot-odroid-c2/Makefile
+++ b/sysutils/u-boot-odroid-c2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/11/04 21:28:56 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2021/08/12 07:30:22 wiz Exp $
 
 UBOOT_TARGET=		odroid-c2
 UBOOT_CONFIG=		odroid-c2_defconfig
@@ -98,3 +98,4 @@ post-build:
 #		bs=512 skip=96
 
 .include "../../sysutils/u-boot/u-boot-arm64.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-orangepi-lite2/Makefile b/sysutils/u-boot-orangepi-lite2/Makefile
index 039fedf0ae4..0e207428933 100644
--- a/sysutils/u-boot-orangepi-lite2/Makefile
+++ b/sysutils/u-boot-orangepi-lite2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/04/04 15:20:35 thorpej Exp $
+# $NetBSD: Makefile,v 1.2 2021/08/12 07:30:22 wiz Exp $
 
 UBOOT_TARGET=		orangepi-lite2
 UBOOT_CONFIG=		orangepi_lite2_defconfig
@@ -14,3 +14,4 @@ post-build:
 
 .include "../../sysutils/arm-trusted-firmware-sun50i-h6/buildlink3.mk"
 .include "../../sysutils/u-boot/u-boot-arm64.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-orangepi-zero-plus/Makefile b/sysutils/u-boot-orangepi-zero-plus/Makefile
index 741147ee7ad..613a218bd53 100644
--- a/sysutils/u-boot-orangepi-zero-plus/Makefile
+++ b/sysutils/u-boot-orangepi-zero-plus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/11/04 21:28:57 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2021/08/12 07:30:22 wiz Exp $
 
 UBOOT_TARGET=		orangepi-zero-plus
 UBOOT_CONFIG=		orangepi_zero_plus_defconfig
@@ -19,3 +19,4 @@ post-build:
 
 .include "../../sysutils/arm-trusted-firmware-sun50i_a64/buildlink3.mk"
 .include "../../sysutils/u-boot/u-boot-arm64.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-pine-h64/Makefile b/sysutils/u-boot-pine-h64/Makefile
index b83637829a1..0be10136d13 100644
--- a/sysutils/u-boot-pine-h64/Makefile
+++ b/sysutils/u-boot-pine-h64/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2021/06/21 14:05:12 nia Exp $
+# $NetBSD: Makefile,v 1.11 2021/08/12 07:30:22 wiz Exp $
 
 UBOOT_TARGET=		pine-h64
 UBOOT_CONFIG=		pine_h64_defconfig
@@ -16,3 +16,4 @@ post-extract:
 
 .include "../../sysutils/arm-trusted-firmware-sun50i-h6/buildlink3.mk"
 .include "../../sysutils/u-boot/u-boot-arm64.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-pine64/Makefile b/sysutils/u-boot-pine64/Makefile
index 4a8e25d72d9..a386f8ac019 100644
--- a/sysutils/u-boot-pine64/Makefile
+++ b/sysutils/u-boot-pine64/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2019/11/04 21:28:57 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2021/08/12 07:30:22 wiz Exp $
 
 UBOOT_TARGET=		pine64
 UBOOT_CONFIG=		pine64_plus_defconfig
@@ -19,3 +19,4 @@ post-build:
 
 .include "../../sysutils/arm-trusted-firmware-sun50i_a64/buildlink3.mk"
 .include "../../sysutils/u-boot/u-boot-arm64.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-pinebook-pro/Makefile b/sysutils/u-boot-pinebook-pro/Makefile
index 17b6b7d28c8..e7a17524dc0 100644
--- a/sysutils/u-boot-pinebook-pro/Makefile
+++ b/sysutils/u-boot-pinebook-pro/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2021/07/26 06:36:41 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2021/08/12 07:30:23 wiz Exp $
 
 UBOOT_TARGET=		pinebook-pro
 UBOOT_CONFIG=		pinebook-pro-rk3399_defconfig
@@ -9,3 +9,4 @@ UBOOT_VERSION?=		2021.07
 UBOOT_INSTALLBOOT_PLIST=	installboot.plist
 
 .include "../../sysutils/u-boot/u-boot-rockchip.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-pinebook/Makefile b/sysutils/u-boot-pinebook/Makefile
index 845363d1962..694aeb8d2d7 100644
--- a/sysutils/u-boot-pinebook/Makefile
+++ b/sysutils/u-boot-pinebook/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/11/04 21:28:57 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2021/08/12 07:30:22 wiz Exp $
 
 UBOOT_VERSION=		2018.11rc3
 UBOOT_TARGET=		pinebook
@@ -18,6 +18,8 @@ PKGREVISION=		3
 DISTINFO_FILE=		${.CURDIR}/../../sysutils/u-boot-pinebook/distinfo
 PATCHDIR=		${.CURDIR}/../../sysutils/u-boot-pinebook/patches
 
+CHECK_PORTABILITY_SKIP+=	tools/imx_cntr_image.sh
+
 post-extract:
 	${CP} ${PREFIX}/share/arm-trusted-firmware/sun50i_a64/bl31.bin ${WRKSRC}
 
@@ -26,5 +28,4 @@ post-build:
 
 .include "../../sysutils/arm-trusted-firmware-sun50i_a64/buildlink3.mk"
 .include "../../sysutils/u-boot/u-boot-arm64.mk"
-
-CHECK_PORTABILITY_SKIP+=	tools/imx_cntr_image.sh
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-pinephone/Makefile b/sysutils/u-boot-pinephone/Makefile
index f91842a7992..a0b86d4398e 100644
--- a/sysutils/u-boot-pinephone/Makefile
+++ b/sysutils/u-boot-pinephone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/12/01 06:52:30 riastradh Exp $
+# $NetBSD: Makefile,v 1.2 2021/08/12 07:30:23 wiz Exp $
 
 UBOOT_VERSION=		2021.01-rc3
 UBOOT_TARGET=		pinephone
@@ -24,10 +24,11 @@ REPLACE.python3.old+=	/usr/bin/env python3
 REPLACE.python3.new+=	${PYTHONBIN}
 REPLACE_FILES.python3+=	scripts/dtc/pylibfdt/setup.py
 
+CHECK_PORTABILITY_SKIP+=	tools/imx_cntr_image.sh
+
 post-extract:
 	${CP} ${PREFIX}/share/arm-trusted-firmware/sun50i_a64/bl31.bin ${WRKSRC}
 
 .include "../../sysutils/arm-trusted-firmware-sun50i_a64/buildlink3.mk"
 .include "../../sysutils/u-boot/u-boot-arm64.mk"
-
-CHECK_PORTABILITY_SKIP+=	tools/imx_cntr_image.sh
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-roc-rk3328-cc/Makefile b/sysutils/u-boot-roc-rk3328-cc/Makefile
index 2c4be37cecd..36c08df67a2 100644
--- a/sysutils/u-boot-roc-rk3328-cc/Makefile
+++ b/sysutils/u-boot-roc-rk3328-cc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2021/06/25 08:40:54 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2021/08/12 07:30:23 wiz Exp $
 
 UBOOT_TARGET=		roc-rk3328-cc
 UBOOT_CONFIG=		roc-cc-rk3328_defconfig
@@ -20,3 +20,4 @@ post-extract:
 
 .include "../../sysutils/arm-trusted-firmware-rk3328/buildlink3.mk"
 .include "../../sysutils/u-boot/u-boot-arm64.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-rock64/Makefile b/sysutils/u-boot-rock64/Makefile
index 61c072a6bbc..a2ab1a09424 100644
--- a/sysutils/u-boot-rock64/Makefile
+++ b/sysutils/u-boot-rock64/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2021/06/25 08:28:57 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2021/08/12 07:30:23 wiz Exp $
 
 PKGREVISION=		7
 UBOOT_TARGET=		rock64
@@ -31,3 +31,4 @@ PYTHON_VERSIONS_ACCEPTED=	27
 
 .include "../../lang/python/application.mk"
 .include "../../sysutils/u-boot/u-boot-arm64.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-rockpro64-ayufan/Makefile b/sysutils/u-boot-rockpro64-ayufan/Makefile
index 214cd141552..b713985f8d1 100644
--- a/sysutils/u-boot-rockpro64-ayufan/Makefile
+++ b/sysutils/u-boot-rockpro64-ayufan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2021/07/27 20:47:35 tnn Exp $
+# $NetBSD: Makefile,v 1.7 2021/08/12 07:30:23 wiz Exp $
 
 PKGREVISION=		1
 UBOOT_TARGET=		rockpro64
@@ -21,3 +21,5 @@ EXTRACT_SUFX=	.tar.gz	# keep this
 PKGNAME=	u-boot-rockpro64-ayufan-${UBOOT_VERSION}
 
 .include "../../sysutils/u-boot/u-boot-rockchip.mk"
+.include "../../mk/bsd.pkg.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-rockpro64/Makefile b/sysutils/u-boot-rockpro64/Makefile
index 6c185d71f77..5f899e7c599 100644
--- a/sysutils/u-boot-rockpro64/Makefile
+++ b/sysutils/u-boot-rockpro64/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2021/07/27 19:23:43 tnn Exp $
+# $NetBSD: Makefile,v 1.15 2021/08/12 07:30:23 wiz Exp $
 
 UBOOT_TARGET=		rockpro64
 UBOOT_CONFIG=		rockpro64-rk3399_defconfig
@@ -10,3 +10,4 @@ PKGREVISION=		1
 UBOOT_INSTALLBOOT_PLIST=	installboot.plist
 
 .include "../../sysutils/u-boot/u-boot-rockchip.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot-sopine-baseboard/Makefile b/sysutils/u-boot-sopine-baseboard/Makefile
index d124aa86db0..3b8e79bc8f1 100644
--- a/sysutils/u-boot-sopine-baseboard/Makefile
+++ b/sysutils/u-boot-sopine-baseboard/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/11/04 21:28:57 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2021/08/12 07:30:23 wiz Exp $
 
 UBOOT_TARGET=		sopine-baseboard
 UBOOT_CONFIG=		sopine_baseboard_defconfig
@@ -26,3 +26,4 @@ post-build:
 
 .include "../../sysutils/arm-trusted-firmware-sun50i_a64/buildlink3.mk"
 .include "../../sysutils/u-boot/u-boot-arm64.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot/u-boot-arm64.mk b/sysutils/u-boot/u-boot-arm64.mk
index ca917bc142b..e2ca2dc0218 100644
--- a/sysutils/u-boot/u-boot-arm64.mk
+++ b/sysutils/u-boot/u-boot-arm64.mk
@@ -1,4 +1,4 @@
-# $NetBSD: u-boot-arm64.mk,v 1.3 2018/06/06 21:58:28 wiz Exp $
+# $NetBSD: u-boot-arm64.mk,v 1.4 2021/08/12 07:30:21 wiz Exp $
 
 MAINTAINER=	port-arm@NetBSD.org
 BUILD_DEPENDS+=	cross-aarch64-none-elf-gcc-[0-9]*:../../cross/aarch64-none-elf-gcc
@@ -15,5 +15,3 @@ PKG_SUPPORTED_OPTIONS=	el1
 .if !empty(PKG_OPTIONS:Mel1)
 UBOOT_OPTIONS+=	CONFIG_ARMV8_SWITCH_TO_EL1=y
 .endif
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot/u-boot-mipsel.mk b/sysutils/u-boot/u-boot-mipsel.mk
index df2b68b2483..a7c1db649a9 100644
--- a/sysutils/u-boot/u-boot-mipsel.mk
+++ b/sysutils/u-boot/u-boot-mipsel.mk
@@ -1,4 +1,4 @@
-# $NetBSD: u-boot-mipsel.mk,v 1.1 2020/06/20 14:38:13 thorpej Exp $
+# $NetBSD: u-boot-mipsel.mk,v 1.2 2021/08/12 07:30:21 wiz Exp $
 
 MAINTAINER=	port-mips@NetBSD.org
 TOOL_DEPENDS+=	cross-mipsel-none-elf-gcc-[0-9]*:../../cross/mipsel-none-elf-gcc
@@ -6,4 +6,3 @@ TOOL_DEPENDS+=	cross-mipsel-none-elf-gcc-[0-9]*:../../cross/mipsel-none-elf-gcc
 UBOOT_ENV+=	CROSS_COMPILE=${PREFIX}/cross-mipsel-none-elf/bin/mipsel-none-elf-
 
 .include "u-boot.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/u-boot/u-boot-powerpc.mk b/sysutils/u-boot/u-boot-powerpc.mk
index 4feeb7d5ee6..78a3687980e 100644
--- a/sysutils/u-boot/u-boot-powerpc.mk
+++ b/sysutils/u-boot/u-boot-powerpc.mk
@@ -1,4 +1,4 @@
-# $NetBSD: u-boot-powerpc.mk,v 1.1 2020/03/30 16:30:54 riastradh Exp $
+# $NetBSD: u-boot-powerpc.mk,v 1.2 2021/08/12 07:30:21 wiz Exp $
 
 MAINTAINER=	port-powerpc@NetBSD.org
 TOOL_DEPENDS+=	cross-powerpc-none-elf-gcc-[0-9]*:../../cross/powerpc-none-elf-gcc
@@ -6,4 +6,3 @@ TOOL_DEPENDS+=	cross-powerpc-none-elf-gcc-[0-9]*:../../cross/powerpc-none-elf-gc
 UBOOT_ENV+=	CROSS_COMPILE=${PREFIX}/cross-powerpc-none-elf/bin/powerpc-none-elf-
 
 .include "u-boot.mk"
-.include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3