From b9bb6bbba8055b780121d66f3b31c9e63a2b21ff Mon Sep 17 00:00:00 2001 From: Newbyte Date: Sat, 30 Jul 2022 14:22:51 -0400 Subject: [PATCH] goclever-gcta741l: remove dtb location workaround (MR 3254) We previously installed dtbs outside of the boot partition, so it was necessary to copy them from the root partition to boot if you wanted to utilise them in U-Boot scripts. This is no longer necessary as we now install dtbs to the boot partition directly, so remove this workaround and edit the U-Boot script to reflect the change. --- device/testing/device-goclever-gcta741l/APKBUILD | 10 +++------- .../testing/device-goclever-gcta741l/u-boot-script.cmd | 4 ++-- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/device/testing/device-goclever-gcta741l/APKBUILD b/device/testing/device-goclever-gcta741l/APKBUILD index abf460839..6a9b6c42e 100644 --- a/device/testing/device-goclever-gcta741l/APKBUILD +++ b/device/testing/device-goclever-gcta741l/APKBUILD @@ -2,8 +2,8 @@ # Reference: pkgname=device-goclever-gcta741l pkgdesc="GoClever Orion 70L" -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/sun6i-a31s-goclever-gcta741l.dtb \ - "$pkgdir"/boot/dtbs-postmarketos-allwinner/sun6i-a31s-goclever-gcta741l.dtb } nonfree_firmware() { @@ -58,5 +54,5 @@ nonfree_firmware() { sha512sums=" 5ce62bae1017dffa217578011cd11acc832472406381fe36fbbea1a8c008706f4d84ddda5b8bda0d8f21ed35bb12d228505b908030c7707d10564933c6cf1993 deviceinfo -6cfb7a8a996468441779207a24b6f346bc13b248758822f2a0cc78c296f68c97d1a7dd96bf226a039fb5936d93ff2659c25396466e97fb7e94ddf0ee4d11be67 u-boot-script.cmd +5b8c1d440867a3cee891168a156fb428b14dfeaf0b437da3e4dc1dd1408458bde98b4ce4682dfb0c5f9c5055a0e2c34cc78ba6160b6ca64281f9721d8d02dede u-boot-script.cmd " diff --git a/device/testing/device-goclever-gcta741l/u-boot-script.cmd b/device/testing/device-goclever-gcta741l/u-boot-script.cmd index ffa256069..c50e36188 100644 --- a/device/testing/device-goclever-gcta741l/u-boot-script.cmd +++ b/device/testing/device-goclever-gcta741l/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}