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

[ci:skip-build]: already built successfully in CI
---
 device/testing/device-purism-librem5dev/APKBUILD       | 10 +++++-----
 device/testing/device-purism-librem5dev/deviceinfo     |  2 +-
 .../testing/device-purism-librem5dev/flash_script.lst  |  8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/device/testing/device-purism-librem5dev/APKBUILD b/device/testing/device-purism-librem5dev/APKBUILD
index 947b382fa..391d20c01 100644
--- a/device/testing/device-purism-librem5dev/APKBUILD
+++ b/device/testing/device-purism-librem5dev/APKBUILD
@@ -2,8 +2,8 @@
 # Maintainer:  Clayton Craft <clayton@craftyguy.net>
 pkgname=device-purism-librem5dev
 pkgdesc="Purism Librem 5 Devkit"
-pkgver=1.2
-pkgrel=3
+pkgver=1.3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -11,7 +11,7 @@ options="!check !archcheck"
 depends="postmarketos-base
 	linux-purism-librem5
 	uboot-tools
-	u-boot-librem5
+	u-boot-librem5-devkit
 	gpsd
 	mesa-dri-gallium
 "
@@ -72,8 +72,8 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 sha512sums="d93aded121b830b5b7006166d3f8cd2efadc2fa454540d653e3f1cb8f009ffb7973a4037a62a47062f6f95f8bbbe546d8e72600a5dcded4eb7be78a7e6d35d02  librem5-base-v16.tar.gz
-3ba54adb8b63f404c5da299a952641e37d3021025b1b4937b25314d3b6ae8738e5efd058d83280749c922c70df4d07907a73cdfc5578913dad76c3d9496d8395  deviceinfo
+d3a8a08a07c19c7f5b5bc82359c8da838913160d99939c9b9b2daec926029a259a69872f17ba97a4eb90b3dc2cbf9f41e0802f5fcb2058bbfdca6fdd2b31c1cb  deviceinfo
 e4bb06e337d3f23abb0328a8e564e905ef571cdbeeefe442cbbd7e715f5a5b656d00679c48161736b3254bcba1ab39a6c99402f67bbde9838c881b1adeb360ed  uboot-script.cmd
 9dc018f0de523cbfe5a49cbe831aa30e975a8dd34635197bb52582f072ac356ef2c02223fc794d970380091a69a83a74c3fbe34520190c8536e77f9ea98c7659  modprobe.d_rsi.conf
 5e0536a53ba5a33af6ddff3a5f5d866c09ae54dd6754e6b17e61fde0b141b3165379a598de562c89568a1de9ae9ae03a4f876c53002b87f09d7b56013345ab27  00-mesa.sh
-e1acf19ac91f012f000ab19165327043ffc4e80575dcc05d6aeb457f6343db7ba962fe658839faeb63b453340ddf6a314ccfab57e55d5b9d763bdb621cf5fd63  flash_script.lst"
+8e61cdcf1645d23912bbefef2063b8c3cd60bd86a55317bf07e72d49b1b42a36f9aea63dc9fe082d612dff1457083463da0cf69b82a83fc116be1f41addceeef  flash_script.lst"
diff --git a/device/testing/device-purism-librem5dev/deviceinfo b/device/testing/device-purism-librem5dev/deviceinfo
index a193d142c..5d0c46969 100644
--- a/device/testing/device-purism-librem5dev/deviceinfo
+++ b/device/testing/device-purism-librem5dev/deviceinfo
@@ -25,5 +25,5 @@ deviceinfo_getty="ttymxc0;115200"
 # Bootloader related
 deviceinfo_flash_method="uuu"
 deviceinfo_generate_legacy_uboot_initfs="true"
-deviceinfo_sd_embed_firmware="firmware/librem5/devkit-boot.img:2"
+deviceinfo_sd_embed_firmware="u-boot/librem5/devkit-boot.img:2"
 deviceinfo_boot_part_start="4096"
diff --git a/device/testing/device-purism-librem5dev/flash_script.lst b/device/testing/device-purism-librem5dev/flash_script.lst
index 0722149d6..79a2cf3d3 100644
--- a/device/testing/device-purism-librem5dev/flash_script.lst
+++ b/device/testing/device-purism-librem5dev/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-librem5dev/usr/share/firmware/librem5/devkit-boot.img
+SDP: boot -f /mnt/rootfs_purism-librem5dev/usr/share/u-boot/librem5/devkit-boot.img
 
 SDPU: delay 1000
-SDPU: write -f  /mnt/rootfs_purism-librem5dev/usr/share/firmware/librem5/devkit-boot.img -offset 0x57c00
+SDPU: write -f  /mnt/rootfs_purism-librem5dev/usr/share/u-boot/librem5/devkit-boot.img -offset 0x57c00
 SDPU: jump
 
 SDPV: delay 1000
-SDPV: write -f /mnt/rootfs_purism-librem5dev/usr/share/firmware/librem5/devkit-boot.img -skipspl
+SDPV: write -f /mnt/rootfs_purism-librem5dev/usr/share/u-boot/librem5/devkit-boot.img -skipspl
 SDPV: jump
 
-SDPS: boot -f /mnt/rootfs_purism-librem5dev/usr/share/firmware/librem5/devkit-boot.img
+SDPS: boot -f /mnt/rootfs_purism-librem5dev/usr/share/u-boot/librem5/devkit-boot.img
 
 FB: ucmd mmc dev 0
 FB: ucmd setenv fastboot_dev mmc