CVS commit: pkgsrc/sysutils/u-boot-pinebook-pro

["matthew green" <mrg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mrg
Date:           Mon Jan  6 09:43:16 UTC 2020

Modified Files:
        pkgsrc/sysutils/u-boot-pinebook-pro: MESSAGE Makefile PLIST distinfo
        pkgsrc/sysutils/u-boot-pinebook-pro/patches:
            patch-configs-pinebook_pro-rk3399_defconfig

Log Message:
build rksd_loader.img again, now that i found the option to make
uboot itself live at 256k from the start of the image, not 8MB
(CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200.)

adjust MESSAGE etc to reference just this.  bump pkg revision.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/u-boot-pinebook-pro/MESSAGE \
    pkgsrc/sysutils/u-boot-pinebook-pro/Makefile \
    pkgsrc/sysutils/u-boot-pinebook-pro/PLIST \
    pkgsrc/sysutils/u-boot-pinebook-pro/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/sysutils/u-boot-pinebook-pro/patches/patch-configs-pinebook_pro-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/u-boot-pinebook-pro/MESSAGE
diff -u pkgsrc/sysutils/u-boot-pinebook-pro/MESSAGE:1.1 pkgsrc/sysutils/u-boot-pinebook-pro/MESSAGE:1.2
--- pkgsrc/sysutils/u-boot-pinebook-pro/MESSAGE:1.1     Mon Jan  6 08:41:44 2020
+++ pkgsrc/sysutils/u-boot-pinebook-pro/MESSAGE Mon Jan  6 09:43:16 2020
@@ -1,10 +1,9 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2020/01/06 08:41:44 mrg Exp $
+$NetBSD: MESSAGE,v 1.2 2020/01/06 09:43:16 mrg Exp $
 
 Examples command to install U-Boot to an empty SD card:
 
-# dd if=${LOCALBASE}/share/u-boot/pinebook-pro/idbloader.img seek=64 of=/dev/rld0d
-# dd if=${LOCALBASE}/share/u-boot/pinebook-pro/boot.itb seek=16384 of=/dev/rld0d
+# dd if=${LOCALBASE}/share/u-boot/pinebook-pro/rksd_loader.img seek=64 of=/dev/rld0d
 
 You should make sure that the space is otherwise cleared of data, as old
 images may fool the boot loader paths.
Index: pkgsrc/sysutils/u-boot-pinebook-pro/Makefile
diff -u pkgsrc/sysutils/u-boot-pinebook-pro/Makefile:1.1 pkgsrc/sysutils/u-boot-pinebook-pro/Makefile:1.2
--- pkgsrc/sysutils/u-boot-pinebook-pro/Makefile:1.1    Mon Jan  6 08:41:44 2020
+++ pkgsrc/sysutils/u-boot-pinebook-pro/Makefile        Mon Jan  6 09:43:16 2020
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2020/01/06 08:41:44 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2020/01/06 09:43:16 mrg Exp $
 
+PKGREVISION=            1
 UBOOT_TARGET=          pinebook-pro
 UBOOT_CONFIG=          pinebook_pro-rk3399_defconfig
-UBOOT_BIN=             idbloader.img u-boot.itb
+UBOOT_BIN=             idbloader.img u-boot.itb rksd_loader.img
 
 UBOOT_VERSION=         2020.01-rc5
 
@@ -13,5 +14,10 @@ USE_TOOLS+=  gawk
 
 MAKE_ENV+=     BL31=${PREFIX}/share/arm-trusted-firmware/rk3399/bl31.elf
 
+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
+
 .include "../../sysutils/arm-trusted-firmware-rk3399/buildlink3.mk"
 .include "../../sysutils/u-boot/u-boot-arm64.mk"
Index: pkgsrc/sysutils/u-boot-pinebook-pro/PLIST
diff -u pkgsrc/sysutils/u-boot-pinebook-pro/PLIST:1.1 pkgsrc/sysutils/u-boot-pinebook-pro/PLIST:1.2
--- pkgsrc/sysutils/u-boot-pinebook-pro/PLIST:1.1       Mon Jan  6 08:41:44 2020
+++ pkgsrc/sysutils/u-boot-pinebook-pro/PLIST   Mon Jan  6 09:43:16 2020
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2020/01/06 08:41:44 mrg Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/01/06 09:43:16 mrg Exp $
 share/u-boot/pinebook-pro/idbloader.img
+share/u-boot/pinebook-pro/rksd_loader.img
 share/u-boot/pinebook-pro/u-boot.itb
Index: pkgsrc/sysutils/u-boot-pinebook-pro/distinfo
diff -u pkgsrc/sysutils/u-boot-pinebook-pro/distinfo:1.1 pkgsrc/sysutils/u-boot-pinebook-pro/distinfo:1.2
--- pkgsrc/sysutils/u-boot-pinebook-pro/distinfo:1.1    Mon Jan  6 08:41:44 2020
+++ pkgsrc/sysutils/u-boot-pinebook-pro/distinfo        Mon Jan  6 09:43:16 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2020/01/06 08:41:44 mrg Exp $
+$NetBSD: distinfo,v 1.2 2020/01/06 09:43:16 mrg Exp $
 
 SHA1 (u-boot-2020.01-rc5.tar.bz2) = 464dec492bd12bf561468b5560d5465bee708de1
 RMD160 (u-boot-2020.01-rc5.tar.bz2) = 2fd9b608a182a783e7e1e07003d2303376de7b4f
@@ -12,5 +12,5 @@ SHA1 (patch-board_pine64_pinebook_pro_rk
 SHA1 (patch-board_pine64_pinebook_pro_rk3399_MAINTAINERS) = 81933bcfb75ec0a28f92d7c9823982dae075b699
 SHA1 (patch-board_pine64_pinebook_pro_rk3399_Makefile) = 9dca0a93221ae2a7fa6a6a1794e22750ab105e07
 SHA1 (patch-board_pine64_pinebook_pro_rk3399_pinebook-pro-rk3399.c) = f06846db31ce5f07f9aa77019efb5b6ca6dc8966
-SHA1 (patch-configs-pinebook_pro-rk3399_defconfig) = 794b7c59d9c21be77bc88f4eac2987778e8679d0
+SHA1 (patch-configs-pinebook_pro-rk3399_defconfig) = 33232c1b62e6ce5974251b2e477f28413ef99d0d
 SHA1 (patch-include-configs-pinebook_pro_rk3399.h) = a8edaa170fb6403a912d6ddda11e3e37c8b2442c

Index: pkgsrc/sysutils/u-boot-pinebook-pro/patches/patch-configs-pinebook_pro-rk3399_defconfig
diff -u pkgsrc/sysutils/u-boot-pinebook-pro/patches/patch-configs-pinebook_pro-rk3399_defconfig:1.1 pkgsrc/sysutils/u-boot-pinebook-pro/patches/patch-configs-pinebook_pro-rk3399_defconfig:1.2
--- pkgsrc/sysutils/u-boot-pinebook-pro/patches/patch-configs-pinebook_pro-rk3399_defconfig:1.1 Mon Jan  6 08:41:44 2020
+++ pkgsrc/sysutils/u-boot-pinebook-pro/patches/patch-configs-pinebook_pro-rk3399_defconfig     Mon Jan  6 09:43:16 2020
@@ -1,4 +1,4 @@
-$NetBSD: patch-configs-pinebook_pro-rk3399_defconfig,v 1.1 2020/01/06 08:41:44 mrg Exp $
+$NetBSD: patch-configs-pinebook_pro-rk3399_defconfig,v 1.2 2020/01/06 09:43:16 mrg Exp $
 
 Pinebook Pro support from https://patchwork.ozlabs.org/patch/1194525/
 
@@ -7,10 +7,11 @@ new file mode 100644
 index 0000000000..28577256e7
 --- /dev/null
 +++ configs/pinebook_pro-rk3399_defconfig
-@@ -0,0 +1,76 @@
+@@ -0,0 +1,77 @@
 +CONFIG_ARM=y
 +CONFIG_ARCH_ROCKCHIP=y
 +CONFIG_SYS_TEXT_BASE=0x00200000
++CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200
 +CONFIG_ROCKCHIP_RK3399=y
 +CONFIG_TARGET_PINEBOOK_PRO_RK3399=y
 +CONFIG_SPL_SPI_FLASH_SUPPORT=y