[pkgsrc/trunk]: pkgsrc/sysutils/u-boot-rockpro64 u-boot-rockpro64: drop el1 o...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d04b13c9910e
branches:  trunk
changeset: 312308:d04b13c9910e
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sat Sep 01 12:04:56 2018 +0000

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

suggested by jmcneill@

diffstat:

 sysutils/u-boot-rockpro64/MESSAGE  |   7 +++----
 sysutils/u-boot-rockpro64/Makefile |  15 ++++++++-------
 sysutils/u-boot-rockpro64/PLIST    |   5 +++--
 3 files changed, 14 insertions(+), 13 deletions(-)

diffs (60 lines):

diff -r abda8d8493a6 -r d04b13c9910e sysutils/u-boot-rockpro64/MESSAGE
--- a/sysutils/u-boot-rockpro64/MESSAGE Sat Sep 01 11:19:25 2018 +0000
+++ b/sysutils/u-boot-rockpro64/MESSAGE Sat Sep 01 12:04:56 2018 +0000
@@ -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
 
diff -r abda8d8493a6 -r d04b13c9910e sysutils/u-boot-rockpro64/Makefile
--- a/sysutils/u-boot-rockpro64/Makefile        Sat Sep 01 11:19:25 2018 +0000
+++ b/sysutils/u-boot-rockpro64/Makefile        Sat Sep 01 12:04:56 2018 +0000
@@ -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
+UBOOT_BIN=             idbloader.img rksd_loader.img u-boot.itb
 
-# Switch to EL1 before booting kernel (required for 32-bit support)
-PKG_DEFAULT_OPTIONS+=  el1
-
+PKGREVISION=   1
 UBOOT_VERSION= ${GITHUB_TAG:C/-.*$//}
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=ayufan-rock64/}
 GITHUB_PROJECT=        linux-u-boot
@@ -41,8 +39,11 @@
 # 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"
diff -r abda8d8493a6 -r d04b13c9910e sysutils/u-boot-rockpro64/PLIST
--- a/sysutils/u-boot-rockpro64/PLIST   Sat Sep 01 11:19:25 2018 +0000
+++ b/sysutils/u-boot-rockpro64/PLIST   Sat Sep 01 12:04:56 2018 +0000
@@ -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