forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

goclever-gcta741l: remove dtb location workaround (MR 3254)

Browse source 
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.
This commit is contained in:
Newbyte 2022-07-30 14:22:51 -04:00 committed by Oliver Smith
parent 70efe55031
commit b9bb6bbba8
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
device/testing/device-goclever-gcta741l/APKBUILD
View file

@ -2,8 +2,8 @@
# Reference: <https://postmarketos.org/devicepkg> # Reference: <https://postmarketos.org/devicepkg>
pkgname=device-goclever-gcta741l pkgname=device-goclever-gcta741l
pkgdesc="GoClever Orion 70L" pkgdesc="GoClever Orion 70L"
pkgver=0.2 pkgver=0.2.1
pkgrel=2 pkgrel=0
url="https://postmarketos.org" url="https://postmarketos.org"
license="MIT" license="MIT"
arch="armv7" arch="armv7"
@ -44,10 +44,6 @@ package() {
# U-Boot boot script # U-Boot boot script
install -Dm644 "$srcdir"/boot.scr \ install -Dm644 "$srcdir"/boot.scr \
"$pkgdir"/boot/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() { nonfree_firmware() {
@ -58,5 +54,5 @@ nonfree_firmware() {
sha512sums=" sha512sums="
5ce62bae1017dffa217578011cd11acc832472406381fe36fbbea1a8c008706f4d84ddda5b8bda0d8f21ed35bb12d228505b908030c7707d10564933c6cf1993 deviceinfo 5ce62bae1017dffa217578011cd11acc832472406381fe36fbbea1a8c008706f4d84ddda5b8bda0d8f21ed35bb12d228505b908030c7707d10564933c6cf1993 deviceinfo
6cfb7a8a996468441779207a24b6f346bc13b248758822f2a0cc78c296f68c97d1a7dd96bf226a039fb5936d93ff2659c25396466e97fb7e94ddf0ee4d11be67 u-boot-script.cmd 5b8c1d440867a3cee891168a156fb428b14dfeaf0b437da3e4dc1dd1408458bde98b4ce4682dfb0c5f9c5055a0e2c34cc78ba6160b6ca64281f9721d8d02dede u-boot-script.cmd
" "

4
device/testing/device-goclever-gcta741l/u-boot-script.cmd
View file

@ -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 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} echo Loading DTB: dtbs/${fdtfile}
load mmc 0:1 ${fdt_addr_r} dtbs-${kernel-flavor}/${fdtfile} load mmc 0:1 ${fdt_addr_r} dtbs/${fdtfile}
echo Resizing FDT echo Resizing FDT
fdt addr ${fdt_addr_r} fdt addr ${fdt_addr_r}