diff --git a/device/main/device-purism-librem5/APKBUILD b/device/main/device-purism-librem5/APKBUILD index 83fd199f6..4eea65e6b 100644 --- a/device/main/device-purism-librem5/APKBUILD +++ b/device/main/device-purism-librem5/APKBUILD @@ -3,8 +3,8 @@ # Co-Maintainer: Bhushan Shah pkgname=device-purism-librem5 pkgdesc="Purism Librem 5 Phone" -pkgver=1.34 -pkgrel=1 +pkgver=1.35 +pkgrel=0 _confver=52 _purismrel=1 # . @@ -170,7 +170,7 @@ ccb47fd421c5e35a8def8e6fb61dad99e42cf542690068a68f90c257e41d33f45f1069db0a8d8937 a0740e405781ec6ef765fdc9f5700c95adbb241c45c97b9384ba68cdece662cb216ca5918640042f6e65a5d1b1a9099936382c99b49a44303f7b6d77a075a471 modules-load.d_librem5.conf 8ef4ec7a9e9a4fb801d207e7d94b627aacc9243a93b0ec28e0823a6f44b8102416c040e4ddf499f87bb9dfa960cf6f627b008b79f197f6814b3fd881e18ae8ef pcscd-librem5-reader.conf 2618b40eebd3602066ee75ab85cbdbb4cfee498def9879c95a304f05a6eeedf1ab28c5dd9fa5efc8f88c790f49c96458c61d5dfe8a3ca0f96bcc0e244313ab01 pcscd-librem5.initd -6971669a7ae4206f6d38f5050747ebc9ffb591a92921a00623e20bb9369ed25d6168dba719de0abec900f1dc5f2f02089a05b5f4e871d6a7cee5afcf38c581fc uboot-script.cmd +66960a2693a2ee9d09163e9fc7e28b3d19021bfc61d1d9643b4dc49ea69fe5e5a15144790fb647ce09db4ba6c060db0b5d4f8dd187140c9c21a8154d6dbeaa89 uboot-script.cmd 1cbc65cf2cb8fad4b0332d012a0256a266205b9b64371f5c0dae09dbb7f1e45b254e8c43993b896097e9d7035a72d547d9bce1ab2133addc56a5abdb80b44616 xorg.conf fad386071fc45f9880a94cc8004fabd5d98b3e6a12606c98d8e72e0208f22ab54f03b921f5967a959782507e2bff67d2fa92e46d8cd242011a3afcdbda529279 70-librem5-xwayland-accel.sh b45749fcddfd65a302b502bcabfa5828d1b63e45d844fd50e44009a756b919db20fe9526102947c0f0dfcdffe4a037e5050fe1b24fb915933ce0837f49759378 0002-udev-cameras-use-correct-path-for-modprobe-on-Alpine.patch diff --git a/device/main/device-purism-librem5/uboot-script.cmd b/device/main/device-purism-librem5/uboot-script.cmd index a944c9e28..d660d338b 100644 --- a/device/main/device-purism-librem5/uboot-script.cmd +++ b/device/main/device-purism-librem5/uboot-script.cmd @@ -19,14 +19,20 @@ fi setenv bootargs init=/init.sh rw console=ttymxc0,115200 cma=256M PMOS_NO_OUTPUT_REDIRECT PMOS_FORCE_PARTITION_RESIZE -# select the correct dtb based on device revision -# default to "-r2" if board_rev isn't set, since it'll boot on any librem5 -# revision -dtb_file=imx8mq-librem5-r2.dtb +# Select the correct dtb based on device revision +# Default to "-r4" if board_rev isn't set, since there are apparently Evergreen +# boards that either 1) identify as r4, 2) identify as r5 (or something else?), +# or 3) don't identify as anything(?). +# See: https://gitlab.com/postmarketOS/pmaports/-/issues/1643#note_1147248594 +dtb_file=imx8mq-librem5-r4.dtb if itest.s "x3" == "x$board_rev" ; then dtb_file=imx8mq-librem5-r3.dtb -elif itest.s "x4" == "x$board_rev" ; then - dtb_file=imx8mq-librem5-r4.dtb +elif itest.s "x2" == "x$board_rev" ; then + dtb_file=imx8mq-librem5-r2.dtb +elif itest.s "x1" == "x$board_rev" ; then + dtb_file=imx8mq-librem5-r2.dtb +elif itest.s "x0" == "x$board_rev" ; then + dtb_file=imx8mq-librem5-r2.dtb fi echo Loading DTB