diff options
| author | mrg <mrg@pkgsrc.org> | 2022-02-12 07:44:55 +0000 |
|---|---|---|
| committer | mrg <mrg@pkgsrc.org> | 2022-02-12 07:44:55 +0000 |
| commit | c674f6dd9ee55699b6fd552c6943227946c0ed26 (patch) | |
| tree | 93bee4d7a0814368c4b013520e1c402be0d0135e | |
| parent | aa3f154387e1d9a6d16a932c540d5a9bb5fc947f (diff) | |
| download | pkgsrc-c674f6dd9ee55699b6fd552c6943227946c0ed26.tar.gz | |
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.
| -rw-r--r-- | sysutils/u-boot-pinebook-pro/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/u-boot/distinfo-2022.01 | 4 | ||||
| -rw-r--r-- | sysutils/u-boot/patches-2022.01/patch-configs_pinebook-pro-rk3399_defconfig | 11 |
3 files changed, 11 insertions, 8 deletions
diff --git a/sysutils/u-boot-pinebook-pro/Makefile b/sysutils/u-boot-pinebook-pro/Makefile index f120b16e956..eef8043c082 100644 --- a/sysutils/u-boot-pinebook-pro/Makefile +++ b/sysutils/u-boot-pinebook-pro/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2022/02/11 23:03:50 mrg Exp $ +# $NetBSD: Makefile,v 1.16 2022/02/12 07:44:55 mrg Exp $ UBOOT_TARGET= pinebook-pro UBOOT_CONFIG= pinebook-pro-rk3399_defconfig @@ -7,6 +7,8 @@ UBOOT_IMAGE_TYPE= rk3399 UBOOT_MKIMAGE_RKSPI= 1 UBOOT_RK_SPI_OFF= 768 +PKGREVISION= 1 + UBOOT_INSTALLBOOT_PLIST= installboot.plist .include "../../sysutils/u-boot/u-boot-rockchip.mk" diff --git a/sysutils/u-boot/distinfo-2022.01 b/sysutils/u-boot/distinfo-2022.01 index ae1cb85fe0c..e624dee9f59 100644 --- a/sysutils/u-boot/distinfo-2022.01 +++ b/sysutils/u-boot/distinfo-2022.01 @@ -1,4 +1,4 @@ -$NetBSD: distinfo-2022.01,v 1.1 2022/02/11 21:46:14 mrg Exp $ +$NetBSD: distinfo-2022.01,v 1.2 2022/02/12 07:44:55 mrg Exp $ BLAKE2s (u-boot-2022.01.tar.bz2) = 54855aa008e78886dd48a25042eebedb1aee301571e578325131ed93d248c329 SHA512 (u-boot-2022.01.tar.bz2) = d83c62bd8f0f51664d2aca329a3ce1379cfd1dfff439dccd6cfc2cb33cfef89a2b01855c97716f591b5550bfdf99e2f3aef7efa33f2e7834c820648f9eef3825 @@ -6,7 +6,7 @@ Size (u-boot-2022.01.tar.bz2) = 17449627 bytes SHA1 (patch-arch_arm_lib_interrupts__64.c) = 708be481a01b84c6c69d88465adf898b659dbeab SHA1 (patch-arch_arm_mach-rockchip_rk3399_rk3399.c) = caa4068c635eaef5997501e154ec5cb11dcbf490 SHA1 (patch-board_pine64_pinebook-pro-rk3399_pinebook-pro-rk3399.c) = 49954716240e93b33e13288f92b14f527ba15bdf -SHA1 (patch-configs_pinebook-pro-rk3399_defconfig) = 6f9ddd87ef1486fa0785b2f00c6819ace1436853 +SHA1 (patch-configs_pinebook-pro-rk3399_defconfig) = dceca39a9574e3491f835232b398c739d35e5e95 SHA1 (patch-configs_rock64-rk3328_defconfig) = 44c0131d36fbc0bad769104ce07bdab9ae605bbd SHA1 (patch-configs_rockpro64-rk3399_defconfig) = d42aba165cb4aca635e514177f43bffacfa8ace5 SHA1 (patch-drivers_pci_pcie__rockchip.c) = 5ead0933261b2cef81cd317df478e47ecc0382d4 diff --git a/sysutils/u-boot/patches-2022.01/patch-configs_pinebook-pro-rk3399_defconfig b/sysutils/u-boot/patches-2022.01/patch-configs_pinebook-pro-rk3399_defconfig index 9bd083fbfd1..5300b33f3a7 100644 --- a/sysutils/u-boot/patches-2022.01/patch-configs_pinebook-pro-rk3399_defconfig +++ b/sysutils/u-boot/patches-2022.01/patch-configs_pinebook-pro-rk3399_defconfig @@ -1,13 +1,14 @@ -$NetBSD: patch-configs_pinebook-pro-rk3399_defconfig,v 1.1 2022/02/11 21:46:14 mrg Exp $ +$NetBSD: patch-configs_pinebook-pro-rk3399_defconfig,v 1.2 2022/02/12 07:44:55 mrg Exp $ -Load u-boot from 256KB. +Load u-boot from 256KB, and environment from 4MB-32KB. ---- configs/pinebook-pro-rk3399_defconfig.orig 2021-07-05 08:11:28.000000000 -0700 -+++ configs/pinebook-pro-rk3399_defconfig 2021-07-25 14:05:30.629973309 -0700 -@@ -3,6 +3,7 @@ +--- configs/pinebook-pro-rk3399_defconfig.orig 2022-01-10 12:46:34.000000000 -0600 ++++ configs/pinebook-pro-rk3399_defconfig 2022-02-11 19:07:48.402914218 -0600 +@@ -4,6 +4,8 @@ CONFIG_SYS_TEXT_BASE=0x00200000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x8000 ++CONFIG_ENV_OFFSET=0x3F8000 +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200 CONFIG_DEFAULT_DEVICE_TREE="rk3399-pinebook-pro" CONFIG_ROCKCHIP_RK3399=y |