From 38607b7f12ca43d46714a74b6adefcd772e27d93 Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Mon, 7 Sep 2020 16:32:48 -0700
Subject: [PATCH] device-purism-librem5: select dtb based on device rev (MR
 1673)

[ci:skip-build]: already built successfully in CI
---
 device/community/device-purism-librem5/APKBUILD       |  6 +++---
 device/community/device-purism-librem5/deviceinfo     |  2 +-
 .../community/device-purism-librem5/uboot-script.cmd  | 11 ++++++++++-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/device/community/device-purism-librem5/APKBUILD b/device/community/device-purism-librem5/APKBUILD
index 7f2fc4050..74185f0c9 100644
--- a/device/community/device-purism-librem5/APKBUILD
+++ b/device/community/device-purism-librem5/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer:  Clayton Craft <clayton@craftyguy.net>
 pkgname=device-purism-librem5
 pkgdesc="Purism Librem 5 Phone"
-pkgver=1.6
+pkgver=1.7
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -98,9 +98,9 @@ sha512sums="f37d08f1a325cbf79870976da9893ac2f43713677d9048057deeff3aae282b630ceb
 9b4ecf6692db6d291799b2ebcdd7f3ceba52d657c01b40a15f4d819f1f9d2f0576bfcf94b1889da767d1757f3af86f4056160b9b31b1ecab0517acfb958f22a9  00-mesa.sh
 be0cf9f9e37c33d526fdf5fb61de1b42b3bb9309faf1feb0db51fa9639c3c0b35608977c898130ff60ebf2e8081ac36799b96c748b7efa9dcef7501753bc4890  70-gnss.rules
 00355d9ad085a77e157f3c62eb4f1bcac2823d3b341e34d1128edbfb1444fba83e8eacd263ea61da9f6d853f1328ab7fbe5ea63bd08c8a1bc9b8eaf44ae1f1c6  77-mm-broadmobi-port-types.rules
-1cb3ca568d96797696b2d69cb156f097e15668ff357b12f37bd8b74a88cb977fa545e2adf7fbeefb87a6d09914e57debea3db7c5230f5800637ff4eaacb3d1dc  deviceinfo
+d0fcd8a2cd0c16d646e196a0d47001afa3bb922f4d1028b924e90df6396727a92f23a4a51834faa9b8674c21f76a9b1abb814a8751ce98776b50772eda69b2a5  deviceinfo
 d033df2b9125622c946af67dad83070473c86937b5825f57ad272c9145b594071dd6913949127803c45af4ea3226526551718d40739f9f1ee4bfe6446e62c856  flash_script.lst
 9dc018f0de523cbfe5a49cbe831aa30e975a8dd34635197bb52582f072ac356ef2c02223fc794d970380091a69a83a74c3fbe34520190c8536e77f9ea98c7659  modprobe.d_rsi.conf
 a0740e405781ec6ef765fdc9f5700c95adbb241c45c97b9384ba68cdece662cb216ca5918640042f6e65a5d1b1a9099936382c99b49a44303f7b6d77a075a471  modules-load.d_librem5.conf
-3bc45540000e438e525501b2e816282d778fca10d426e42c9a80c0e752618ce50deb12c3edd9f3edc52edd8eb229d16afae7d407fe2c4ba0dbfefbcb4214780c  uboot-script.cmd
+ed4f8caa061e51ffb123261c89454554e6773feea733de4b78be929a36dc5ac0ff448ac1ed69a0a97e7fa54f9d711076e8965465b180ba6a05237dab4fb45924  uboot-script.cmd
 1cbc65cf2cb8fad4b0332d012a0256a266205b9b64371f5c0dae09dbb7f1e45b254e8c43993b896097e9d7035a72d547d9bce1ab2133addc56a5abdb80b44616  xorg.conf"
diff --git a/device/community/device-purism-librem5/deviceinfo b/device/community/device-purism-librem5/deviceinfo
index 6a5b694a4..e27c8263b 100644
--- a/device/community/device-purism-librem5/deviceinfo
+++ b/device/community/device-purism-librem5/deviceinfo
@@ -6,7 +6,7 @@ deviceinfo_name="Purism Librem 5 Phone"
 deviceinfo_manufacturer="Purism"
 deviceinfo_codename="purism-librem5"
 deviceinfo_year="2019"
-deviceinfo_dtb="freescale/imx8mq-librem5"
+deviceinfo_dtb="freescale/imx8mq-librem5 freescale/imx8mq-librem5-r2 freescale/imx8mq-librem5-r3"
 deviceinfo_append_dtb="false"
 deviceinfo_modules_initfs="phy_fsl_imx8mq_usb dwc3 udc_core xhci_hcd xhci_plat_hcd tps6598x libcomposite"
 deviceinfo_arch="aarch64"
diff --git a/device/community/device-purism-librem5/uboot-script.cmd b/device/community/device-purism-librem5/uboot-script.cmd
index b4cb8a87b..7ed59867a 100644
--- a/device/community/device-purism-librem5/uboot-script.cmd
+++ b/device/community/device-purism-librem5/uboot-script.cmd
@@ -3,8 +3,17 @@ setenv mmcdev 0
 setenv mmcpart 1
 
 printenv
+
+# select the correct dtb based on device revision
+dtb_file=imx8mq-librem5.dtb
+if itest.s "x2" == "x$board_rev" ; then
+        dtb_file=imx8mq-librem5-r2.dtb
+elif itest.s "x3" == "x$board_rev" ; then
+        dtb_file=imx8mq-librem5-r3.dtb
+fi
+
 echo Loading DTB
-ext2load mmc ${mmcdev}:${mmcpart} ${fdt_addr_r} imx8mq-librem5.dtb
+ext2load mmc ${mmcdev}:${mmcpart} ${fdt_addr_r} ${dtb_file}
 
 echo Loading Initramfs
 ext2load mmc ${mmcdev}:${mmcpart} ${ramdisk_addr_r} uInitrd-purism-librem5