Sat Feb 12 07:44:56 2022 UTC ()
load pinebook pro SPI environment from the same location that
rockpro64 does and avoid "saveenv" saving over the top of the
u-boot installation itself.

now my pbp can boot from just SPI and NVMe.

bump pkg revision.


(mrg)
diff -r1.1 -r1.2 pkgsrc/sysutils/u-boot/distinfo-2022.01
diff -r1.15 -r1.16 pkgsrc/sysutils/u-boot-pinebook-pro/Makefile
diff -r1.1 -r1.2 pkgsrc/sysutils/u-boot/patches-2022.01/patch-configs_pinebook-pro-rk3399_defconfig
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/u-boot/distinfo-2022.01 (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot/distinfo-2022.01 2022/02/11 21:46:14 1.1
+++ pkgsrc/sysutils/u-boot/distinfo-2022.01 2022/02/12 07:44:55 1.2
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: distinfo-2022.01,v 1.1 2022/02/11 21:46:14 mrg Exp $ 1$NetBSD: distinfo-2022.01,v 1.2 2022/02/12 07:44:55 mrg Exp $
2 2
3BLAKE2s (u-boot-2022.01.tar.bz2) = 54855aa008e78886dd48a25042eebedb1aee301571e578325131ed93d248c329 3BLAKE2s (u-boot-2022.01.tar.bz2) = 54855aa008e78886dd48a25042eebedb1aee301571e578325131ed93d248c329
4SHA512 (u-boot-2022.01.tar.bz2) = d83c62bd8f0f51664d2aca329a3ce1379cfd1dfff439dccd6cfc2cb33cfef89a2b01855c97716f591b5550bfdf99e2f3aef7efa33f2e7834c820648f9eef3825 4SHA512 (u-boot-2022.01.tar.bz2) = d83c62bd8f0f51664d2aca329a3ce1379cfd1dfff439dccd6cfc2cb33cfef89a2b01855c97716f591b5550bfdf99e2f3aef7efa33f2e7834c820648f9eef3825
5Size (u-boot-2022.01.tar.bz2) = 17449627 bytes 5Size (u-boot-2022.01.tar.bz2) = 17449627 bytes
6SHA1 (patch-arch_arm_lib_interrupts__64.c) = 708be481a01b84c6c69d88465adf898b659dbeab 6SHA1 (patch-arch_arm_lib_interrupts__64.c) = 708be481a01b84c6c69d88465adf898b659dbeab
7SHA1 (patch-arch_arm_mach-rockchip_rk3399_rk3399.c) = caa4068c635eaef5997501e154ec5cb11dcbf490 7SHA1 (patch-arch_arm_mach-rockchip_rk3399_rk3399.c) = caa4068c635eaef5997501e154ec5cb11dcbf490
8SHA1 (patch-board_pine64_pinebook-pro-rk3399_pinebook-pro-rk3399.c) = 49954716240e93b33e13288f92b14f527ba15bdf 8SHA1 (patch-board_pine64_pinebook-pro-rk3399_pinebook-pro-rk3399.c) = 49954716240e93b33e13288f92b14f527ba15bdf
9SHA1 (patch-configs_pinebook-pro-rk3399_defconfig) = 6f9ddd87ef1486fa0785b2f00c6819ace1436853 9SHA1 (patch-configs_pinebook-pro-rk3399_defconfig) = dceca39a9574e3491f835232b398c739d35e5e95
10SHA1 (patch-configs_rock64-rk3328_defconfig) = 44c0131d36fbc0bad769104ce07bdab9ae605bbd 10SHA1 (patch-configs_rock64-rk3328_defconfig) = 44c0131d36fbc0bad769104ce07bdab9ae605bbd
11SHA1 (patch-configs_rockpro64-rk3399_defconfig) = d42aba165cb4aca635e514177f43bffacfa8ace5 11SHA1 (patch-configs_rockpro64-rk3399_defconfig) = d42aba165cb4aca635e514177f43bffacfa8ace5
12SHA1 (patch-drivers_pci_pcie__rockchip.c) = 5ead0933261b2cef81cd317df478e47ecc0382d4 12SHA1 (patch-drivers_pci_pcie__rockchip.c) = 5ead0933261b2cef81cd317df478e47ecc0382d4
13SHA1 (patch-drivers_usb_host_usb-uclass.c) = 754504a9dc08f888a4ef09f5ccc3cb56b5ce297a 13SHA1 (patch-drivers_usb_host_usb-uclass.c) = 754504a9dc08f888a4ef09f5ccc3cb56b5ce297a
14SHA1 (patch-include_config_distro_bootcmd.h) = d37da930903d9d80829ac3cd0da98334057b6188 14SHA1 (patch-include_config_distro_bootcmd.h) = d37da930903d9d80829ac3cd0da98334057b6188
15SHA1 (patch-include_configs_rockchip-common.h) = d9aa111ec38f2f8ad64c45d42d3bc5519e27382d 15SHA1 (patch-include_configs_rockchip-common.h) = d9aa111ec38f2f8ad64c45d42d3bc5519e27382d
16SHA1 (patch-include_configs_rockpro64_rk3399.h) = 7efd0b09cbf627dc59d2a23a76dd6506c9efc4c9 16SHA1 (patch-include_configs_rockpro64_rk3399.h) = 7efd0b09cbf627dc59d2a23a76dd6506c9efc4c9
cvs diff -r1.15 -r1.16 pkgsrc/sysutils/u-boot-pinebook-pro/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-pinebook-pro/Makefile 2022/02/11 23:03:50 1.15
+++ pkgsrc/sysutils/u-boot-pinebook-pro/Makefile 2022/02/12 07:44:55 1.16
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1# $NetBSD: Makefile,v 1.15 2022/02/11 23:03:50 mrg Exp $ 1# $NetBSD: Makefile,v 1.16 2022/02/12 07:44:55 mrg Exp $
2 2
3UBOOT_TARGET= pinebook-pro 3UBOOT_TARGET= pinebook-pro
4UBOOT_CONFIG= pinebook-pro-rk3399_defconfig 4UBOOT_CONFIG= pinebook-pro-rk3399_defconfig
5UBOOT_BIN= idbloader.img rksd_loader.img rkspi_loader.img u-boot.itb 5UBOOT_BIN= idbloader.img rksd_loader.img rkspi_loader.img u-boot.itb
6UBOOT_IMAGE_TYPE= rk3399 6UBOOT_IMAGE_TYPE= rk3399
7UBOOT_MKIMAGE_RKSPI= 1 7UBOOT_MKIMAGE_RKSPI= 1
8UBOOT_RK_SPI_OFF= 768 8UBOOT_RK_SPI_OFF= 768
9 9
 10PKGREVISION= 1
 11
10UBOOT_INSTALLBOOT_PLIST= installboot.plist 12UBOOT_INSTALLBOOT_PLIST= installboot.plist
11 13
12.include "../../sysutils/u-boot/u-boot-rockchip.mk" 14.include "../../sysutils/u-boot/u-boot-rockchip.mk"
13.include "../../mk/bsd.pkg.mk" 15.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/u-boot/patches-2022.01/patch-configs_pinebook-pro-rk3399_defconfig (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot/patches-2022.01/patch-configs_pinebook-pro-rk3399_defconfig 2022/02/11 21:46:14 1.1
+++ pkgsrc/sysutils/u-boot/patches-2022.01/patch-configs_pinebook-pro-rk3399_defconfig 2022/02/12 07:44:55 1.2
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
1$NetBSD: patch-configs_pinebook-pro-rk3399_defconfig,v 1.1 2022/02/11 21:46:14 mrg Exp $ 1$NetBSD: patch-configs_pinebook-pro-rk3399_defconfig,v 1.2 2022/02/12 07:44:55 mrg Exp $
2 2
3Load u-boot from 256KB. 3Load u-boot from 256KB, and environment from 4MB-32KB.
4 4
5--- configs/pinebook-pro-rk3399_defconfig.orig 2021-07-05 08:11:28.000000000 -0700 5--- configs/pinebook-pro-rk3399_defconfig.orig 2022-01-10 12:46:34.000000000 -0600
6+++ configs/pinebook-pro-rk3399_defconfig 2021-07-25 14:05:30.629973309 -0700 6+++ configs/pinebook-pro-rk3399_defconfig 2022-02-11 19:07:48.402914218 -0600
7@@ -3,6 +3,7 @@ 7@@ -4,6 +4,8 @@
8 CONFIG_SYS_TEXT_BASE=0x00200000 8 CONFIG_SYS_TEXT_BASE=0x00200000
9 CONFIG_NR_DRAM_BANKS=1 9 CONFIG_NR_DRAM_BANKS=1
10 CONFIG_ENV_SIZE=0x8000 10 CONFIG_ENV_SIZE=0x8000
 11+CONFIG_ENV_OFFSET=0x3F8000
11+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200 12+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200
12 CONFIG_DEFAULT_DEVICE_TREE="rk3399-pinebook-pro" 13 CONFIG_DEFAULT_DEVICE_TREE="rk3399-pinebook-pro"
13 CONFIG_ROCKCHIP_RK3399=y 14 CONFIG_ROCKCHIP_RK3399=y
14 CONFIG_TARGET_PINEBOOK_PRO_RK3399=y 15 CONFIG_TARGET_PINEBOOK_PRO_RK3399=y