CVS commit: pkgsrc/sysutils/u-boot-rockpro64

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

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat Sep  1 12:04:56 UTC 2018

Modified Files:
        pkgsrc/sysutils/u-boot-rockpro64: MESSAGE Makefile PLIST

Log Message:
u-boot-rockpro64: drop el1 option and create single bundle for SD card

suggested by jmcneill@


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

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-rockpro64/MESSAGE
diff -u pkgsrc/sysutils/u-boot-rockpro64/MESSAGE:1.1 pkgsrc/sysutils/u-boot-rockpro64/MESSAGE:1.2
--- pkgsrc/sysutils/u-boot-rockpro64/MESSAGE:1.1        Sat Sep  1 10:38:19 2018
+++ pkgsrc/sysutils/u-boot-rockpro64/MESSAGE    Sat Sep  1 12:04:56 2018
@@ -1,10 +1,9 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2018/09/01 10:38:19 tnn Exp $
+$NetBSD: MESSAGE,v 1.2 2018/09/01 12:04:56 tnn Exp $
 
-Example commands to install U-Boot to an empty SD card:
+Example command to install U-Boot to an empty SD card:
 
-# dd if=${LOCALBASE}/share/u-boot/rockpro64/sdloader.img seek=64 of=/dev/ld0d
-# dd if=${LOCALBASE}/share/u-boot/rockpro64/u-boot.itb seek=512 of=/dev/ld0d
+# dd if=${LOCALBASE}/share/u-boot/rockpro64/rksd_loader.img seek=64 of=/dev/rld0d
 
 See also http://opensource.rock-chips.com/wiki_Boot_option
 
Index: pkgsrc/sysutils/u-boot-rockpro64/Makefile
diff -u pkgsrc/sysutils/u-boot-rockpro64/Makefile:1.1 pkgsrc/sysutils/u-boot-rockpro64/Makefile:1.2
--- pkgsrc/sysutils/u-boot-rockpro64/Makefile:1.1       Sat Sep  1 10:38:19 2018
+++ pkgsrc/sysutils/u-boot-rockpro64/Makefile   Sat Sep  1 12:04:56 2018
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2018/09/01 10:38:19 tnn Exp $
+# $NetBSD: Makefile,v 1.2 2018/09/01 12:04:56 tnn Exp $
 
 UBOOT_TARGET=          rockpro64
 UBOOT_CONFIG=          rockpro64-rk3399_defconfig
-UBOOT_BIN=             sdloader.img u-boot.itb
-
-# Switch to EL1 before booting kernel (required for 32-bit support)
-PKG_DEFAULT_OPTIONS+=  el1
+UBOOT_BIN=             idbloader.img rksd_loader.img u-boot.itb
 
+PKGREVISION=   1
 UBOOT_VERSION= ${GITHUB_TAG:C/-.*$//}
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=ayufan-rock64/}
 GITHUB_PROJECT=        linux-u-boot
@@ -41,8 +39,11 @@ post-build:
 # build stage 3 package
        cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} u-boot.itb
 # build stage 1 loader
-       cd ${WRKSRC} && tools/mkimage -n rk3399 -T rksd -d ${WRKDIR}/${DDR_BIN} sdloader.img
+       ${WRKSRC}/tools/mkimage -n rk3399 -T rksd -d ${WRKDIR}/${DDR_BIN} ${WRKSRC}/idbloader.img
 # append stage2 loader
-       cd ${WRKSRC} && cat spl/u-boot-spl.bin >> sdloader.img
+       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
+       cp ${WRKSRC}/idbloader.img ${WRKSRC}/rksd_loader.img
+       dd if=${WRKSRC}/u-boot.itb seek=448 conv=notrunc of=${WRKSRC}/rksd_loader.img
 
 .include "../../sysutils/u-boot/u-boot-arm64.mk"
Index: pkgsrc/sysutils/u-boot-rockpro64/PLIST
diff -u pkgsrc/sysutils/u-boot-rockpro64/PLIST:1.1 pkgsrc/sysutils/u-boot-rockpro64/PLIST:1.2
--- pkgsrc/sysutils/u-boot-rockpro64/PLIST:1.1  Sat Sep  1 10:38:19 2018
+++ pkgsrc/sysutils/u-boot-rockpro64/PLIST      Sat Sep  1 12:04:56 2018
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2018/09/01 10:38:19 tnn Exp $
-share/u-boot/rockpro64/sdloader.img
+@comment $NetBSD: PLIST,v 1.2 2018/09/01 12:04:56 tnn Exp $
+share/u-boot/rockpro64/idbloader.img
+share/u-boot/rockpro64/rksd_loader.img
 share/u-boot/rockpro64/u-boot.itb