CVS commit: pkgsrc/sysutils

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Tue Aug 13 21:28:47 UTC 2019

Modified Files:
        pkgsrc/sysutils/u-boot: u-boot-rockchip.mk
        pkgsrc/sysutils/u-boot-rock64: PLIST
        pkgsrc/sysutils/u-boot-rockpro64: MESSAGE Makefile PLIST

Log Message:
u-boot-rock{,pro}64: install the SPI boot loader. Bump.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/u-boot/u-boot-rockchip.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/u-boot-rock64/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/u-boot-rockpro64/MESSAGE \
    pkgsrc/sysutils/u-boot-rockpro64/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/u-boot-rockpro64/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/u-boot/u-boot-rockchip.mk
diff -u pkgsrc/sysutils/u-boot/u-boot-rockchip.mk:1.3 pkgsrc/sysutils/u-boot/u-boot-rockchip.mk:1.4
--- pkgsrc/sysutils/u-boot/u-boot-rockchip.mk:1.3       Sun Jul 21 15:17:12 2019
+++ pkgsrc/sysutils/u-boot/u-boot-rockchip.mk   Tue Aug 13 21:28:47 2019
@@ -1,4 +1,4 @@
-#      $NetBSD: u-boot-rockchip.mk,v 1.3 2019/07/21 15:17:12 tnn Exp $
+#      $NetBSD: u-boot-rockchip.mk,v 1.4 2019/08/13 21:28:47 tnn Exp $
 
 #
 # Common makefile fragment for rockchip based u-boot targets.
@@ -8,7 +8,7 @@
 #      U_BOOT_IMAGE_TYPE       ("rk3399", "rk3328")
 #
 
-PKGREVISION=   4
+PKGREVISION=   5
 UBOOT_VERSION= ${GITHUB_TAG:C/-.*$//}
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=ayufan-rock64/}
 GITHUB_PROJECT=        linux-u-boot
@@ -37,3 +37,6 @@ post-build:
 # wrap everything up into a single file that can be written to an SD card
        cp ${WRKSRC}/idbloader.img ${WRKSRC}/rksd_loader.img
        dd if=${WRKSRC}/u-boot.itb seek=448 conv=notrunc of=${WRKSRC}/rksd_loader.img
+# build SPI NOR flash image. See dev-ayufan/build.mk.
+       set -e; b=0; while [ "$$b" != 128 ]; do dd bs=2k count=1; dd if=/dev/zero bs=2k count=1; b=$$(expr $$b + 1); 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

Index: pkgsrc/sysutils/u-boot-rock64/PLIST
diff -u pkgsrc/sysutils/u-boot-rock64/PLIST:1.1 pkgsrc/sysutils/u-boot-rock64/PLIST:1.2
--- pkgsrc/sysutils/u-boot-rock64/PLIST:1.1     Sat Jun  8 12:25:05 2019
+++ pkgsrc/sysutils/u-boot-rock64/PLIST Tue Aug 13 21:28:46 2019
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2019/06/08 12:25:05 mrg Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/08/13 21:28:46 tnn Exp $
 share/u-boot/rock64/idbloader.img
 share/u-boot/rock64/rksd_loader.img
+share/u-boot/rock64/rkspi_loader.img
 share/u-boot/rock64/u-boot.itb

Index: pkgsrc/sysutils/u-boot-rockpro64/MESSAGE
diff -u pkgsrc/sysutils/u-boot-rockpro64/MESSAGE:1.2 pkgsrc/sysutils/u-boot-rockpro64/MESSAGE:1.3
--- pkgsrc/sysutils/u-boot-rockpro64/MESSAGE:1.2        Sat Sep  1 12:04:56 2018
+++ pkgsrc/sysutils/u-boot-rockpro64/MESSAGE    Tue Aug 13 21:28:47 2019
@@ -1,10 +1,14 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2018/09/01 12:04:56 tnn Exp $
+$NetBSD: MESSAGE,v 1.3 2019/08/13 21:28:47 tnn Exp $
 
 Example command to install U-Boot to an empty SD card:
 
 # dd if=${LOCALBASE}/share/u-boot/rockpro64/rksd_loader.img seek=64 of=/dev/rld0d
 
+Alternatively, to install to SPI flash:
+
+dd if=${LOCALBASE}/share/u-boot/rockpro64/rkspi_loader.img bs=64k of=/dev/spiflash0
+
 See also http://opensource.rock-chips.com/wiki_Boot_option
 
 ===========================================================================
Index: pkgsrc/sysutils/u-boot-rockpro64/PLIST
diff -u pkgsrc/sysutils/u-boot-rockpro64/PLIST:1.2 pkgsrc/sysutils/u-boot-rockpro64/PLIST:1.3
--- pkgsrc/sysutils/u-boot-rockpro64/PLIST:1.2  Sat Sep  1 12:04:56 2018
+++ pkgsrc/sysutils/u-boot-rockpro64/PLIST      Tue Aug 13 21:28:47 2019
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2018/09/01 12:04:56 tnn Exp $
+@comment $NetBSD: PLIST,v 1.3 2019/08/13 21:28:47 tnn Exp $
 share/u-boot/rockpro64/idbloader.img
 share/u-boot/rockpro64/rksd_loader.img
+share/u-boot/rockpro64/rkspi_loader.img
 share/u-boot/rockpro64/u-boot.itb

Index: pkgsrc/sysutils/u-boot-rockpro64/Makefile
diff -u pkgsrc/sysutils/u-boot-rockpro64/Makefile:1.4 pkgsrc/sysutils/u-boot-rockpro64/Makefile:1.5
--- pkgsrc/sysutils/u-boot-rockpro64/Makefile:1.4       Sun Jul 21 15:17:13 2019
+++ pkgsrc/sysutils/u-boot-rockpro64/Makefile   Tue Aug 13 21:28:47 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2019/07/21 15:17:13 tnn Exp $
+# $NetBSD: Makefile,v 1.5 2019/08/13 21:28:47 tnn Exp $
 
 UBOOT_TARGET=          rockpro64
 UBOOT_CONFIG=          rockpro64-rk3399_defconfig
-UBOOT_BIN=             idbloader.img rksd_loader.img u-boot.itb
+UBOOT_BIN=             idbloader.img rksd_loader.img rkspi_loader.img u-boot.itb
 
 DISTINFO_FILE= ${.CURDIR}/../../sysutils/u-boot-rockpro64/distinfo