From 0308b77c47365841f9b65d716ec2d659f680a412 Mon Sep 17 00:00:00 2001
From: Newbyte <newbie13xd@gmail.com>
Date: Sat, 30 Jul 2022 14:27:34 -0400
Subject: [PATCH] lark-freeme-70-2s: remove dtb location workaround (MR 3254)

See previous commit for rationale.
---
 device/testing/device-lark-freeme-70-2s/APKBUILD       | 10 +++-------
 .../testing/device-lark-freeme-70-2s/u-boot-script.cmd |  4 ++--
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/device/testing/device-lark-freeme-70-2s/APKBUILD b/device/testing/device-lark-freeme-70-2s/APKBUILD
index 111331178..4f0af3a1b 100644
--- a/device/testing/device-lark-freeme-70-2s/APKBUILD
+++ b/device/testing/device-lark-freeme-70-2s/APKBUILD
@@ -2,8 +2,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lark-freeme-70-2s
 pkgdesc="Lark FreeMe 70.2S"
-pkgver=0.2
-pkgrel=2
+pkgver=0.2.1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -44,10 +44,6 @@ package() {
 	# U-Boot boot script
 	install -Dm644 "$srcdir"/boot.scr \
 		"$pkgdir"/boot/boot.scr
-
-	# Device Tree - temporary workaround: copy from kernel package
-	install -Dm644 /usr/share/dtb/sun4i-a10-lark-freeme-70-2s.dtb \
-		"$pkgdir"/boot/dtbs-postmarketos-allwinner/sun4i-a10-lark-freeme-70-2s.dtb
 }
 
 nonfree_firmware() {
@@ -58,5 +54,5 @@ nonfree_firmware() {
 
 sha512sums="
 61ceb08acef7c6d082ea33e869263b9de82bd1b6e43a6a9771e5e317626cbb2a55445b8d95e6e64dfd6246f22934e77185819500547124d29926f4f7fef96643  deviceinfo
-6cfb7a8a996468441779207a24b6f346bc13b248758822f2a0cc78c296f68c97d1a7dd96bf226a039fb5936d93ff2659c25396466e97fb7e94ddf0ee4d11be67  u-boot-script.cmd
+5b8c1d440867a3cee891168a156fb428b14dfeaf0b437da3e4dc1dd1408458bde98b4ce4682dfb0c5f9c5055a0e2c34cc78ba6160b6ca64281f9721d8d02dede  u-boot-script.cmd
 "
diff --git a/device/testing/device-lark-freeme-70-2s/u-boot-script.cmd b/device/testing/device-lark-freeme-70-2s/u-boot-script.cmd
index ffa256069..c50e36188 100644
--- a/device/testing/device-lark-freeme-70-2s/u-boot-script.cmd
+++ b/device/testing/device-lark-freeme-70-2s/u-boot-script.cmd
@@ -2,8 +2,8 @@ setenv kernel-flavor postmarketos-allwinner
 
 setenv bootargs init=/init.sh rw console=tty1 panic=10 consoleblank=0 loglevel=1 PMOS_FORCE_PARTITION_RESIZE pmos_boot=/dev/mmcblk0p1 pmos_root=/dev/mmcblk0p2
 
-echo Loading DTB: dtbs-${kernel-flavor}/${fdtfile}
-load mmc 0:1 ${fdt_addr_r} dtbs-${kernel-flavor}/${fdtfile}
+echo Loading DTB: dtbs/${fdtfile}
+load mmc 0:1 ${fdt_addr_r} dtbs/${fdtfile}
 
 echo Resizing FDT
 fdt addr ${fdt_addr_r}