pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/sysutils
Module Name: pkgsrc
Committed By: gutteridge
Date: Sat Dec 13 01:10:24 UTC 2025
Modified Files:
pkgsrc/sysutils: Makefile
pkgsrc/sysutils/u-boot: Makefile distinfo-2022.01 u-boot-rockchip.mk
Added Files:
pkgsrc/sysutils/u-boot-nanopi-r4s: DESCR Makefile PLIST
pkgsrc/sysutils/u-boot-nanopi-r4s/files: installboot.plist
pkgsrc/sysutils/u-boot/patches-2022.01:
patch-arch_arm_dts_rk3399-nanopi-r4s-u-boot.dtsi
patch-configs_nanopi-r4s-rk3399_defconfig
Log Message:
u-boot-nanopi-r4s: add new package
To generate a diff of this commit:
cvs rdiff -u -r1.1172 -r1.1173 pkgsrc/sysutils/Makefile
cvs rdiff -u -r1.44 -r1.45 pkgsrc/sysutils/u-boot/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/u-boot/distinfo-2022.01
cvs rdiff -u -r1.19 -r1.20 pkgsrc/sysutils/u-boot/u-boot-rockchip.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/u-boot-nanopi-r4s/DESCR \
pkgsrc/sysutils/u-boot-nanopi-r4s/Makefile \
pkgsrc/sysutils/u-boot-nanopi-r4s/PLIST
cvs rdiff -u -r0 -r1.1 \
pkgsrc/sysutils/u-boot-nanopi-r4s/files/installboot.plist
cvs rdiff -u -r0 -r1.1 \
pkgsrc/sysutils/u-boot/patches-2022.01/patch-arch_arm_dts_rk3399-nanopi-r4s-u-boot.dtsi \
pkgsrc/sysutils/u-boot/patches-2022.01/patch-configs_nanopi-r4s-rk3399_defconfig
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/sysutils/Makefile
diff -u pkgsrc/sysutils/Makefile:1.1172 pkgsrc/sysutils/Makefile:1.1173
--- pkgsrc/sysutils/Makefile:1.1172 Thu Dec 4 13:00:40 2025
+++ pkgsrc/sysutils/Makefile Sat Dec 13 01:10:23 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1172 2025/12/04 13:00:40 wiz Exp $
+# $NetBSD: Makefile,v 1.1173 2025/12/13 01:10:23 gutteridge Exp $
#
COMMENT= System utilities
@@ -846,6 +846,7 @@ SUBDIR+= u-boot-nanopi-neo-plus2
SUBDIR+= u-boot-nanopi-neo2
SUBDIR+= u-boot-nanopi-r1
SUBDIR+= u-boot-nanopi-r2s
+SUBDIR+= u-boot-nanopi-r4s
SUBDIR+= u-boot-odroid-c2
SUBDIR+= u-boot-odroid-xu3
SUBDIR+= u-boot-orangepi-2
Index: pkgsrc/sysutils/u-boot/Makefile
diff -u pkgsrc/sysutils/u-boot/Makefile:1.44 pkgsrc/sysutils/u-boot/Makefile:1.45
--- pkgsrc/sysutils/u-boot/Makefile:1.44 Mon Apr 7 18:40:02 2025
+++ pkgsrc/sysutils/u-boot/Makefile Sat Dec 13 01:10:23 2025
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.44 2025/04/07 18:40:02 gutteridge Exp $
+# $NetBSD: Makefile,v 1.45 2025/12/13 01:10:23 gutteridge Exp $
#
.include "../../sysutils/u-boot/u-boot-version.mk"
DISTNAME= u-boot-${UBOOT_VERSION}
-PKGREVISION= 19
+PKGREVISION= 20
CATEGORIES= sysutils meta-pkgs
MASTER_SITES= # empty
@@ -59,6 +59,7 @@ DEPENDS+= u-boot-nanopi-neo-[0-9]*:../..
DEPENDS+= u-boot-nanopi-neo2-[0-9]*:../../sysutils/u-boot-nanopi-neo2
DEPENDS+= u-boot-nanopi-r1-[0-9]*:../../sysutils/u-boot-nanopi-r1
DEPENDS+= u-boot-nanopi-r2s-[0-9]*:../../sysutils/u-boot-nanopi-r2s
+DEPENDS+= u-boot-nanopi-r4s-[0-9]*:../../sysutils/u-boot-nanopi-r4s
.if !empty(PKG_OPTIONS:Mamlogic-meson)
DEPENDS+= u-boot-odroid-c2-[0-9]*:../../sysutils/u-boot-odroid-c2
.endif
Index: pkgsrc/sysutils/u-boot/distinfo-2022.01
diff -u pkgsrc/sysutils/u-boot/distinfo-2022.01:1.6 pkgsrc/sysutils/u-boot/distinfo-2022.01:1.7
--- pkgsrc/sysutils/u-boot/distinfo-2022.01:1.6 Tue Apr 1 00:06:34 2025
+++ pkgsrc/sysutils/u-boot/distinfo-2022.01 Sat Dec 13 01:10:23 2025
@@ -1,12 +1,14 @@
-$NetBSD: distinfo-2022.01,v 1.6 2025/04/01 00:06:34 gutteridge Exp $
+$NetBSD: distinfo-2022.01,v 1.7 2025/12/13 01:10:23 gutteridge Exp $
BLAKE2s (u-boot-2022.01.tar.bz2) = 54855aa008e78886dd48a25042eebedb1aee301571e578325131ed93d248c329
SHA512 (u-boot-2022.01.tar.bz2) = d83c62bd8f0f51664d2aca329a3ce1379cfd1dfff439dccd6cfc2cb33cfef89a2b01855c97716f591b5550bfdf99e2f3aef7efa33f2e7834c820648f9eef3825
Size (u-boot-2022.01.tar.bz2) = 17449627 bytes
+SHA1 (patch-arch_arm_dts_rk3399-nanopi-r4s-u-boot.dtsi) = b7897443ab3800c1dfd2eeb32d6f155a87bd8776
SHA1 (patch-arch_arm_lib_interrupts__64.c) = 09100688f4ba5848de5c3ed301a36d9e66a1fab7
SHA1 (patch-arch_arm_mach-rockchip_rk3399_rk3399.c) = caa4068c635eaef5997501e154ec5cb11dcbf490
SHA1 (patch-board_pine64_pinebook-pro-rk3399_pinebook-pro-rk3399.c) = 49954716240e93b33e13288f92b14f527ba15bdf
SHA1 (patch-configs_nanopi-r2s-rk3328_defconfig) = 1f75f77420919e834bbf32fc8ef2ac20f0757f2b
+SHA1 (patch-configs_nanopi-r4s-rk3399_defconfig) = 7bdf8aea46970029799cf093f49fdda684fc66e9
SHA1 (patch-configs_pinebook-pro-rk3399_defconfig) = dceca39a9574e3491f835232b398c739d35e5e95
SHA1 (patch-configs_rock64-rk3328_defconfig) = 44c0131d36fbc0bad769104ce07bdab9ae605bbd
SHA1 (patch-configs_rockpro64-rk3399_defconfig) = d42aba165cb4aca635e514177f43bffacfa8ace5
Index: pkgsrc/sysutils/u-boot/u-boot-rockchip.mk
diff -u pkgsrc/sysutils/u-boot/u-boot-rockchip.mk:1.19 pkgsrc/sysutils/u-boot/u-boot-rockchip.mk:1.20
--- pkgsrc/sysutils/u-boot/u-boot-rockchip.mk:1.19 Tue Apr 22 23:30:38 2025
+++ pkgsrc/sysutils/u-boot/u-boot-rockchip.mk Sat Dec 13 01:10:23 2025
@@ -1,6 +1,7 @@
-# $NetBSD: u-boot-rockchip.mk,v 1.19 2025/04/22 23:30:38 gutteridge Exp $
+# $NetBSD: u-boot-rockchip.mk,v 1.20 2025/12/13 01:10:23 gutteridge Exp $
#
# used by sysutils/u-boot-nanopi-r2s/Makefile
+# used by sysutils/u-boot-nanopi-r4s/Makefile
# used by sysutils/u-boot-rock64/Makefile
# used by sysutils/u-boot-rockpro64/Makefile
# used by sysutils/u-boot-pinebook-pro/Makefile
@@ -45,7 +46,7 @@ post-build:
.endif
dd if=${WRKSRC}/u-boot.itb seek=${UBOOT_RK_SPI_OFF} conv=notrunc of=${WRKSRC}/rkspi_loader.img
-BUILD_TARGET+= V=1
+BUILD_TARGET+= V=1
.include "../../sysutils/${TFA}-${UBOOT_IMAGE_TYPE}/buildlink3.mk"
.include "../../sysutils/u-boot/u-boot-arm64.mk"
Added files:
Index: pkgsrc/sysutils/u-boot-nanopi-r4s/DESCR
diff -u /dev/null pkgsrc/sysutils/u-boot-nanopi-r4s/DESCR:1.1
--- /dev/null Sat Dec 13 01:10:24 2025
+++ pkgsrc/sysutils/u-boot-nanopi-r4s/DESCR Sat Dec 13 01:10:23 2025
@@ -0,0 +1,5 @@
+U-Boot is a bootloader for embedded boards based on PowerPC, ARM, MIPS and
+several other processors, which can be installed in a boot ROM and used to
+initialize and test the hardware or to download and run application code.
+
+This package provides U-Boot for the FriendlyElec NanoPi R4S.
Index: pkgsrc/sysutils/u-boot-nanopi-r4s/Makefile
diff -u /dev/null pkgsrc/sysutils/u-boot-nanopi-r4s/Makefile:1.1
--- /dev/null Sat Dec 13 01:10:24 2025
+++ pkgsrc/sysutils/u-boot-nanopi-r4s/Makefile Sat Dec 13 01:10:23 2025
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2025/12/13 01:10:23 gutteridge Exp $
+
+UBOOT_TARGET= nanopi-r4s
+UBOOT_CONFIG= nanopi-r4s-rk3399_defconfig
+UBOOT_BIN= idbloader.img rksd_loader.img rkspi_loader.img u-boot.itb
+UBOOT_IMAGE_TYPE= rk3399
+UBOOT_MKIMAGE_RKSPI= 1
+UBOOT_RK_SPI_OFF= 768
+
+UBOOT_INSTALLBOOT_PLIST= installboot.plist
+
+.include "../../sysutils/u-boot/u-boot-rockchip.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/u-boot-nanopi-r4s/PLIST
diff -u /dev/null pkgsrc/sysutils/u-boot-nanopi-r4s/PLIST:1.1
--- /dev/null Sat Dec 13 01:10:24 2025
+++ pkgsrc/sysutils/u-boot-nanopi-r4s/PLIST Sat Dec 13 01:10:23 2025
@@ -0,0 +1,6 @@
+@comment $NetBSD: PLIST,v 1.1 2025/12/13 01:10:23 gutteridge Exp $
+share/u-boot/nanopi-r4s/idbloader.img
+share/u-boot/nanopi-r4s/installboot.plist
+share/u-boot/nanopi-r4s/rksd_loader.img
+share/u-boot/nanopi-r4s/rkspi_loader.img
+share/u-boot/nanopi-r4s/u-boot.itb
Index: pkgsrc/sysutils/u-boot-nanopi-r4s/files/installboot.plist
diff -u /dev/null pkgsrc/sysutils/u-boot-nanopi-r4s/files/installboot.plist:1.1
--- /dev/null Sat Dec 13 01:10:24 2025
+++ pkgsrc/sysutils/u-boot-nanopi-r4s/files/installboot.plist Sat Dec 13 01:10:23 2025
@@ -0,0 +1,47 @@
+<!-- $NetBSD: installboot.plist,v 1.1 2025/12/13 01:10:23 gutteridge Exp $ -->
+<!--
+ Copyright (c) 2020 The NetBSD Foundation, Inc.
+ All rights reserved.
+
+ This code is derived from software contributed to The NetBSD Foundation
+ by Jason R. Thorpe.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+-->
+<plist>
+<dict>
+ <key>friendlyarm,nanopi-r4s</key>
+ <dict>
+ <key>description</key>
+ <string>FriendlyElec NanoPi R4S</string>
+ <key>u-boot-install</key>
+ <array>
+ <dict>
+ <key>file-name</key>
+ <string>rksd_loader.img</string>
+ <key>image-offset</key>
+ <integer>32768</integer>
+ </dict>
+ </array>
+ </dict>
+</dict>
+</plist>
Index: pkgsrc/sysutils/u-boot/patches-2022.01/patch-arch_arm_dts_rk3399-nanopi-r4s-u-boot.dtsi
diff -u /dev/null pkgsrc/sysutils/u-boot/patches-2022.01/patch-arch_arm_dts_rk3399-nanopi-r4s-u-boot.dtsi:1.1
--- /dev/null Sat Dec 13 01:10:24 2025
+++ pkgsrc/sysutils/u-boot/patches-2022.01/patch-arch_arm_dts_rk3399-nanopi-r4s-u-boot.dtsi Sat Dec 13 01:10:23 2025
@@ -0,0 +1,32 @@
+$NetBSD: patch-arch_arm_dts_rk3399-nanopi-r4s-u-boot.dtsi,v 1.1 2025/12/13 01:10:23 gutteridge Exp $
+
+Enable second USB port and fix crash.
+
+From ed073246e80a494fd4323da51dc70110c0b8b422 Mon Sep 17 00:00:00 2001
+From: Justin Klaassen <justin%tidylabs.net@localhost>
+Date: Fri, 31 Jan 2025 17:06:13 +0000
+Subject: [PATCH] rockchip: nanopi-r4s: Enable second usb port and fix crash
+
+The patch enables the second USB3.0 Type-A USB port on the NanoPi R4S
+board, which prevents a crash when initializing the usb system in U-Boot
+and allows both Type-A USB ports to be used for booting.
+
+=> usb start
+starting USB...
+Bus usb@fe380000: USB EHCI 1.00
+Bus usb@fe3c0000: "Synchronous Abort" handler, esr 0x96000010, far 0x0
+
+Signed-off-by: Justin Klaassen <justin%tidylabs.net@localhost>
+Reviewed-by: Kever Yang <kever.yang%rock-chips.com@localhost>
+
+--- arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi.orig 2022-01-10 13:46:34.000000000 -0500
++++ arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi
+@@ -14,3 +14,8 @@
+
+ #include "rk3399-nanopi4-u-boot.dtsi"
+ #include "rk3399-sdram-lpddr4-100.dtsi"
++
++&u2phy1_host {
++ phy-supply = <&vdd_5v>;
++ status = "okay";
++};
Index: pkgsrc/sysutils/u-boot/patches-2022.01/patch-configs_nanopi-r4s-rk3399_defconfig
diff -u /dev/null pkgsrc/sysutils/u-boot/patches-2022.01/patch-configs_nanopi-r4s-rk3399_defconfig:1.1
--- /dev/null Sat Dec 13 01:10:24 2025
+++ pkgsrc/sysutils/u-boot/patches-2022.01/patch-configs_nanopi-r4s-rk3399_defconfig Sat Dec 13 01:10:23 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-configs_nanopi-r4s-rk3399_defconfig,v 1.1 2025/12/13 01:10:23 gutteridge Exp $
+
+Load u-boot from 256KB.
+
+--- configs/nanopi-r4s-rk3399_defconfig.orig 2022-01-10 13:46:34.000000000 -0500
++++ configs/nanopi-r4s-rk3399_defconfig
+@@ -1,6 +1,7 @@
+ CONFIG_ARM=y
+ CONFIG_SKIP_LOWLEVEL_INIT=y
+ CONFIG_ARCH_ROCKCHIP=y
++CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200
+ CONFIG_SYS_TEXT_BASE=0x00200000
+ CONFIG_NR_DRAM_BANKS=1
+ CONFIG_ENV_OFFSET=0x3F8000
Home |
Main Index |
Thread Index |
Old Index