From 07193614cbd10224f9c35d8abc4906771542d2c0 Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Fri, 12 Mar 2021 11:55:48 -0800
Subject: [PATCH] device-purism-librem5: use new u-boot location (MR 2023)

---
 device/community/device-purism-librem5/APKBUILD         | 6 +++---
 device/community/device-purism-librem5/deviceinfo       | 2 +-
 device/community/device-purism-librem5/flash_script.lst | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/device/community/device-purism-librem5/APKBUILD b/device/community/device-purism-librem5/APKBUILD
index a25ea1d3f..0dbfc589a 100644
--- a/device/community/device-purism-librem5/APKBUILD
+++ b/device/community/device-purism-librem5/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer:  Clayton Craft <clayton@craftyguy.net>
 pkgname=device-purism-librem5
 pkgdesc="Purism Librem 5 Phone"
-pkgver=1.15
+pkgver=1.16
 pkgrel=0
 _confver=36
 _purismrel=1
@@ -124,8 +124,8 @@ sha512sums="ef2cce6de4e85b14b4a7dee7fe8175d6ca455db38bfe4453b390ac15ad51240dec58
 5e0536a53ba5a33af6ddff3a5f5d866c09ae54dd6754e6b17e61fde0b141b3165379a598de562c89568a1de9ae9ae03a4f876c53002b87f09d7b56013345ab27  00-mesa.sh
 8b6fa7b12c15f439c561901f3ffe24a1ef2a0c343401c0a79281060854ab29e08a1fb5e7adae8684b12aa9f535ed99e2dad993dce9724822cb0fbf2497dd86e5  70-wifi-pm.rules
 00355d9ad085a77e157f3c62eb4f1bcac2823d3b341e34d1128edbfb1444fba83e8eacd263ea61da9f6d853f1328ab7fbe5ea63bd08c8a1bc9b8eaf44ae1f1c6  77-mm-broadmobi-port-types.rules
-73bc79b6ed1db6a8f581d18ae529f3ebfa2bd86f6b24ec1a9e12f8ddd657480eabfe554996636ef68a31477b8bfdfb2378bf8c03f1293196496683c195f78598  deviceinfo
-d033df2b9125622c946af67dad83070473c86937b5825f57ad272c9145b594071dd6913949127803c45af4ea3226526551718d40739f9f1ee4bfe6446e62c856  flash_script.lst
+647cd95872bfa3e533ce2a825f9215315f629c0f2835becd77e3acb07b748a2c662090197de59155ff6e8137165dea877a0b179db4bd8bee3dd3d205f390a656  deviceinfo
+2703c7a4e7f32cf102dfed644a8213497828ae1fe9f3bd789663157f79c8c8ddb05672e5c9a0c6883e9dee42afcfe9578e611dd1d9fe6cd8129d8d7738d28ad2  flash_script.lst
 76b06cc1ac82c3fc0e298c9d7d5c9139624b1269bf846fe3bc07b9af877d882362b60ba90028ad3182cb1d6426aacdb560fe060b026778a56e7f038d495eadd4  librem5-shipmode.initd
 9dc018f0de523cbfe5a49cbe831aa30e975a8dd34635197bb52582f072ac356ef2c02223fc794d970380091a69a83a74c3fbe34520190c8536e77f9ea98c7659  modprobe.d_rsi.conf
 a0740e405781ec6ef765fdc9f5700c95adbb241c45c97b9384ba68cdece662cb216ca5918640042f6e65a5d1b1a9099936382c99b49a44303f7b6d77a075a471  modules-load.d_librem5.conf
diff --git a/device/community/device-purism-librem5/deviceinfo b/device/community/device-purism-librem5/deviceinfo
index f211f78d3..be5b0d078 100644
--- a/device/community/device-purism-librem5/deviceinfo
+++ b/device/community/device-purism-librem5/deviceinfo
@@ -22,5 +22,5 @@ deviceinfo_screen_height="1440"
 # Bootloader related
 deviceinfo_flash_method="uuu"
 deviceinfo_generate_legacy_uboot_initfs="true"
-deviceinfo_sd_embed_firmware="firmware/librem5/phone-boot.img:2"
+deviceinfo_sd_embed_firmware="u-boot/librem5/phone-boot.img:2"
 deviceinfo_boot_part_start="4096"
diff --git a/device/community/device-purism-librem5/flash_script.lst b/device/community/device-purism-librem5/flash_script.lst
index 169a25d58..40ba7bad8 100644
--- a/device/community/device-purism-librem5/flash_script.lst
+++ b/device/community/device-purism-librem5/flash_script.lst
@@ -4,17 +4,17 @@ uuu_version 1.0.1
 # all paths are relative to the native chroot and not to the device rootfs
 # chroot.
 
-SDP: boot -f /mnt/rootfs_purism-librem5/usr/share/firmware/librem5/phone-boot.img
+SDP: boot -f /mnt/rootfs_purism-librem5/usr/share/u-boot/librem5/phone-boot.img
 
 SDPU: delay 1000
-SDPU: write -f  /mnt/rootfs_purism-librem5/usr/share/firmware/librem5/phone-boot.img -offset 0x57c00
+SDPU: write -f  /mnt/rootfs_purism-librem5/usr/share/u-boot/librem5/phone-boot.img -offset 0x57c00
 SDPU: jump
 
 SDPV: delay 1000
-SDPV: write -f /mnt/rootfs_purism-librem5/usr/share/firmware/librem5/phone-boot.img -skipspl
+SDPV: write -f /mnt/rootfs_purism-librem5/usr/share/u-boot/librem5/phone-boot.img -skipspl
 SDPV: jump
 
-SDPS: boot -f /mnt/rootfs_purism-librem5/usr/share/firmware/librem5/phone-boot.img
+SDPS: boot -f /mnt/rootfs_purism-librem5/usr/share/u-boot/librem5/phone-boot.img
 
 FB: ucmd mmc dev 0
 FB: ucmd setenv fastboot_dev mmc