From 78ff5e897fc399b63f03b833953bba62b8c6f512 Mon Sep 17 00:00:00 2001 From: Federico Amedeo Izzo Date: Sat, 19 Feb 2022 12:24:28 +0100 Subject: [PATCH] pine64-pinephone: Fix u-boot user script load address (MR 2952) The package `device-pine64-pinephone-vccq-mod` installs a u-boot user script. The user script was loaded at address 0x50100000 partially overwriting the initramfs (0x4FF00000-0x5015facd), and causing a boot loop. The user script load address was increased to 0x50700000, leaving 8MB of free space for the initramfs, the current initramfs size is 2.37MB. --- device/main/device-pine64-pinephone/APKBUILD | 6 +++--- device/main/device-pine64-pinephone/uboot-script.cmd | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/device/main/device-pine64-pinephone/APKBUILD b/device/main/device-pine64-pinephone/APKBUILD index 2f36531b8..ff51f253f 100644 --- a/device/main/device-pine64-pinephone/APKBUILD +++ b/device/main/device-pine64-pinephone/APKBUILD @@ -5,8 +5,8 @@ # Co-Maintainer: Clayton Craft # Co-Maintainer: Dylan Van Assche pkgname=device-pine64-pinephone -pkgver=0.36 -pkgrel=3 +pkgver=0.37 +pkgrel=0 pkgdesc="PINE64 PinePhone" url="https://postmarketos.org" license="MIT" @@ -218,7 +218,7 @@ d66ecef1fa5481ff138fe4e12b194903ceacab9d0649e716049f32e56ec6d9be09b97e2ff769ebc5 967e3a43c7e91ed37fc932a7c580cd168ca11d8ec7f60ff60ece7f286e5144f27faead95162fa7d571a2317ed0da970fd86f5bc9ed0235a25c0be9182d42d64d 90-pinephone.conf 8e362f48fc5db58dc37d035f80f5ab0b09a20c82e6859e9662affdc192e2aa0bc7a259a9b0c63db330b3873d8b1f22af3f9193a0b7d79068354d1a788391376c primaryuse.conf 420ee1d7522d4d56c2909580fd6ba7580483ca5455b13eb6d22e700063ce0c1a5c6d2f5b161dfce0d777636fe9a712aa82f38a0585f2feabea3785b02bae7515 setup-modem.sh -c085a92af68fa3b1e1cd0c407a3782e66e7eeb3321a95ca3decedf46a68e012e272d1aac9aa690812529d6c35c558b198d94775fc6dfafc8b09eef0c56a50e28 uboot-script.cmd +24b241b6a30ecde8ec66b45f08d09d17d8ab0753cc5e8c75142b850af21d829d1f45e83e6b892f5cbad40f4fa3550de23e2b4d21f7727ada0e79751b0b0a1010 uboot-script.cmd f28902517bebe16f7ddbdbf9f4c52d5c97319e3b5ba7326ba96ed0e094d3d2a39c87061326893cdc34336bbfd56de084b2f217918ebba7ca6a080088cd0bd409 uboot-user.cmd f963898fa2ce66bc830e56feeec6ffc9888834e14cc1591d72908ef45ad82532bc3ef5fb32413e07b6722749c9d03e7cf92f06f1fcb859c38b9297cf58e5cedd HiFi.conf 4b0c51ab169aebe8177c5c43eba41afa90370098a5a54e710d17e97ec1651869a20cb5d780a6132028c864916609e3b4f4a13158835310d0441bdb4915872372 PinePhone.conf diff --git a/device/main/device-pine64-pinephone/uboot-script.cmd b/device/main/device-pine64-pinephone/uboot-script.cmd index 388451fcb..fbb6de5a7 100644 --- a/device/main/device-pine64-pinephone/uboot-script.cmd +++ b/device/main/device-pine64-pinephone/uboot-script.cmd @@ -35,7 +35,7 @@ fdt set /memory ram_freq ${ram_freq} fdt list /memory echo Loading user script -setenv user_scriptaddr 0x50100000 +setenv user_scriptaddr 0x50700000 load mmc ${mmc_bootdev}:1 ${user_scriptaddr} user.scr if test $? -eq 0; then source ${user_scriptaddr}; else echo No user script found; fi