CVS commit: pkgsrc/sysutils

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/sysutils
From: "David H. Gutteridge" <gutteridge%netbsd.org@localhost>
Date: Sun, 27 Aug 2023 23:12:53 +0000

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Sun Aug 27 23:12:52 UTC 2023

Modified Files:
        pkgsrc/sysutils: Makefile
        pkgsrc/sysutils/u-boot: Makefile distinfo-2022.01 u-boot-rockchip.mk
Added Files:
        pkgsrc/sysutils/u-boot-nanopi-r2s: DESCR Makefile PLIST
        pkgsrc/sysutils/u-boot-nanopi-r2s/files: installboot.plist
        pkgsrc/sysutils/u-boot/patches-2022.01:
            patch-configs_nanopi-r2s-rk3328_defconfig

Log Message:
u-boot-nanopi-r2s: add new package

This has been tested by myself and found to work seemingly stably,
including the RTL8153 USB-based Ethernet port (which was reported to
have issues on port-arm@ back in 2022).

This package is not based on the one in wip, as it was very out of date
and was reported to support less of the hardware correctly. Instead,
the more current framework for Rockchip boards in pkgsrc is used.


To generate a diff of this commit:
cvs rdiff -u -r1.1067 -r1.1068 pkgsrc/sysutils/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/sysutils/u-boot/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/u-boot/distinfo-2022.01
cvs rdiff -u -r1.17 -r1.18 pkgsrc/sysutils/u-boot/u-boot-rockchip.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/u-boot-nanopi-r2s/DESCR \
    pkgsrc/sysutils/u-boot-nanopi-r2s/Makefile \
    pkgsrc/sysutils/u-boot-nanopi-r2s/PLIST
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/u-boot-nanopi-r2s/files/installboot.plist
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/u-boot/patches-2022.01/patch-configs_nanopi-r2s-rk3328_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.1067 pkgsrc/sysutils/Makefile:1.1068
--- pkgsrc/sysutils/Makefile:1.1067     Sun Aug 20 04:05:59 2023
+++ pkgsrc/sysutils/Makefile    Sun Aug 27 23:12:52 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1067 2023/08/20 04:05:59 markd Exp $
+# $NetBSD: Makefile,v 1.1068 2023/08/27 23:12:52 gutteridge Exp $
 #
 
 COMMENT=       System utilities
@@ -791,6 +791,7 @@ SUBDIR+=    u-boot-nanopi-neo
 SUBDIR+=       u-boot-nanopi-neo-plus2
 SUBDIR+=       u-boot-nanopi-neo2
 SUBDIR+=       u-boot-nanopi-r1
+SUBDIR+=       u-boot-nanopi-r2s
 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.37 pkgsrc/sysutils/u-boot/Makefile:1.38
--- pkgsrc/sysutils/u-boot/Makefile:1.37        Mon Aug 14 05:25:19 2023
+++ pkgsrc/sysutils/u-boot/Makefile     Sun Aug 27 23:12:52 2023
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.37 2023/08/14 05:25:19 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2023/08/27 23:12:52 gutteridge Exp $
 #
 
 .include "../../sysutils/u-boot/u-boot-version.mk"
 
 DISTNAME=      u-boot-${UBOOT_VERSION}
-PKGREVISION=   12
+PKGREVISION=   13
 CATEGORIES=    sysutils meta-pkgs
 MASTER_SITES=  # empty
 
@@ -54,6 +54,7 @@ DEPENDS+=     u-boot-nanopi-neo-plus2-[0-9]*
 DEPENDS+=      u-boot-nanopi-neo-[0-9]*:../../sysutils/u-boot-nanopi-neo
 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
 .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.2 pkgsrc/sysutils/u-boot/distinfo-2022.01:1.3
--- pkgsrc/sysutils/u-boot/distinfo-2022.01:1.2 Sat Feb 12 07:44:55 2022
+++ pkgsrc/sysutils/u-boot/distinfo-2022.01     Sun Aug 27 23:12:52 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo-2022.01,v 1.2 2022/02/12 07:44:55 mrg Exp $
+$NetBSD: distinfo-2022.01,v 1.3 2023/08/27 23:12:52 gutteridge Exp $
 
 BLAKE2s (u-boot-2022.01.tar.bz2) = 54855aa008e78886dd48a25042eebedb1aee301571e578325131ed93d248c329
 SHA512 (u-boot-2022.01.tar.bz2) = d83c62bd8f0f51664d2aca329a3ce1379cfd1dfff439dccd6cfc2cb33cfef89a2b01855c97716f591b5550bfdf99e2f3aef7efa33f2e7834c820648f9eef3825
@@ -6,6 +6,7 @@ Size (u-boot-2022.01.tar.bz2) = 17449627
 SHA1 (patch-arch_arm_lib_interrupts__64.c) = 708be481a01b84c6c69d88465adf898b659dbeab
 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) = 928b198eaa983d36e46e26baec442b88f25a1359
 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.17 pkgsrc/sysutils/u-boot/u-boot-rockchip.mk:1.18
--- pkgsrc/sysutils/u-boot/u-boot-rockchip.mk:1.17      Sun Aug 27 21:04:18 2023
+++ pkgsrc/sysutils/u-boot/u-boot-rockchip.mk   Sun Aug 27 23:12:52 2023
@@ -1,5 +1,6 @@
-# $NetBSD: u-boot-rockchip.mk,v 1.17 2023/08/27 21:04:18 gutteridge Exp $
+# $NetBSD: u-boot-rockchip.mk,v 1.18 2023/08/27 23:12:52 gutteridge Exp $
 #
+# used by sysutils/u-boot-nanopi-r2s/Makefile
 # used by sysutils/u-boot-rock64/Makefile
 # used by sysutils/u-boot-rockpro64/Makefile
 # used by sysutils/u-boot-pinebook-pro/Makefile

Added files:

Index: pkgsrc/sysutils/u-boot-nanopi-r2s/DESCR
diff -u /dev/null pkgsrc/sysutils/u-boot-nanopi-r2s/DESCR:1.1
--- /dev/null   Sun Aug 27 23:12:52 2023
+++ pkgsrc/sysutils/u-boot-nanopi-r2s/DESCR     Sun Aug 27 23:12:52 2023
@@ -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 R2S.
Index: pkgsrc/sysutils/u-boot-nanopi-r2s/Makefile
diff -u /dev/null pkgsrc/sysutils/u-boot-nanopi-r2s/Makefile:1.1
--- /dev/null   Sun Aug 27 23:12:52 2023
+++ pkgsrc/sysutils/u-boot-nanopi-r2s/Makefile  Sun Aug 27 23:12:52 2023
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2023/08/27 23:12:52 gutteridge Exp $
+
+UBOOT_TARGET=          nanopi-r2s
+UBOOT_CONFIG=          nanopi-r2s-rk3328_defconfig
+UBOOT_BIN=             idbloader.img rksd_loader.img rkspi_loader.img u-boot.itb
+UBOOT_IMAGE_TYPE=      rk3328
+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-r2s/PLIST
diff -u /dev/null pkgsrc/sysutils/u-boot-nanopi-r2s/PLIST:1.1
--- /dev/null   Sun Aug 27 23:12:52 2023
+++ pkgsrc/sysutils/u-boot-nanopi-r2s/PLIST     Sun Aug 27 23:12:52 2023
@@ -0,0 +1,6 @@
+@comment $NetBSD: PLIST,v 1.1 2023/08/27 23:12:52 gutteridge Exp $
+share/u-boot/nanopi-r2s/idbloader.img
+share/u-boot/nanopi-r2s/installboot.plist
+share/u-boot/nanopi-r2s/rksd_loader.img
+share/u-boot/nanopi-r2s/rkspi_loader.img
+share/u-boot/nanopi-r2s/u-boot.itb

Index: pkgsrc/sysutils/u-boot-nanopi-r2s/files/installboot.plist
diff -u /dev/null pkgsrc/sysutils/u-boot-nanopi-r2s/files/installboot.plist:1.1
--- /dev/null   Sun Aug 27 23:12:52 2023
+++ pkgsrc/sysutils/u-boot-nanopi-r2s/files/installboot.plist   Sun Aug 27 23:12:52 2023
@@ -0,0 +1,47 @@
+<!-- $NetBSD: installboot.plist,v 1.1 2023/08/27 23:12:52 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-r2s</key>
+       <dict>
+               <key>description</key>
+               <string>FriendlyElec NanoPi R2S</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-configs_nanopi-r2s-rk3328_defconfig
diff -u /dev/null pkgsrc/sysutils/u-boot/patches-2022.01/patch-configs_nanopi-r2s-rk3328_defconfig:1.1
--- /dev/null   Sun Aug 27 23:12:52 2023
+++ pkgsrc/sysutils/u-boot/patches-2022.01/patch-configs_nanopi-r2s-rk3328_defconfig    Sun Aug 27 23:12:52 2023
@@ -0,0 +1,14 @@
+$NetBSD: patch-configs_nanopi-r2s-rk3328_defconfig,v 1.1 2023/08/27 23:12:52 gutteridge Exp $
+
+Load u-boot from 256KB.
+
+--- nanopi-r2s-rk3328_defconfig.orig   2022-01-10 13:46:34.000000000 -0500
++++ nanopi-r2s-rk3328_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_SPL_GPIO=y
+ CONFIG_NR_DRAM_BANKS=1

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index