From 2f3b5469b2bf9e2ff1a20d623ca226156b5e6e30 Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Sat, 31 Aug 2019 21:07:54 -0700
Subject: [PATCH] purism-librem5dev: update deviceinfo and uboot script (!590)

This simplifies the uboot script and updates it to use correct address
offsets for kernel, ramdisk and fdt. Appending the dtb to the kernel is
no longer necessary. This also changes the dtb to the one used on
PureOS.
---
 device/device-purism-librem5dev/APKBUILD         |  8 ++++----
 device/device-purism-librem5dev/deviceinfo       |  4 ++--
 device/device-purism-librem5dev/uboot-script.cmd | 14 ++++++--------
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/device/device-purism-librem5dev/APKBUILD b/device/device-purism-librem5dev/APKBUILD
index c3fdb3c77..06fed3125 100644
--- a/device/device-purism-librem5dev/APKBUILD
+++ b/device/device-purism-librem5dev/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname="device-purism-librem5dev"
 pkgdesc="Purism Librem 5 Devkit"
-pkgver=0.7
-pkgrel=3
+pkgver=0.8
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -39,8 +39,8 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
-sha512sums="d2c5ab7b094092f4e3280bb27b8a03b339cd882a41951e9ea968d4206decbc3cc87c3af62003839ff20097b3ef48156b25d7f37cabce24d16ac4d1c8ce073deb  deviceinfo
-b6622d11b3975e004d4a7baed52d56bcc9831d9b66f26a1174b08d2c10d53d9a1c9ad45d1938e20579c88741b31512d48cf30282cf8539162f1ab49d5342596c  uboot-script.cmd
+sha512sums="020c10d969c95b9d6fc7d2d245c0586c5f35aa9e13164bbf2a4ec65b410342323f4bbc03b1fb7ad3abc69682b6e73f83b86583026c214ecff2c58c2c853f84e7  deviceinfo
+79abf8de1035418220c1d9168b038df10e06f23def18c944c065846dc5c4f5da66e8e62ae7ce9f5804ef064b0832d0b938f0e11e68878f203c322b05eb0ed639  uboot-script.cmd
 d10531ad6646ad6cfaf8ee1b0cc38f4e5e2eb39599251b75f25e954f1105761d5480d92cbe06ad52560207b883439071db89b19babf046a810360bd07c52c655  modprobe.d_rsi.conf
 5fdf45859f2bb154bcfe7c7341de4d5b239ef43d3f865e30456af073a8ee9d6682515c7e1dd52ddbe3969669d60689ba93c08ead32aadcfb164ff72a02b2e1a4  00-mesa.sh
 aeb04c73359889444e3d7da3d6c935a7899e1c190542dfc0224ef0c728a914f61074808d3df920daf02671292ed43eb43a03525ac676f34185cdbb73b39442e1  flash_script.lst"
diff --git a/device/device-purism-librem5dev/deviceinfo b/device/device-purism-librem5dev/deviceinfo
index 9c94403a5..abdce979a 100644
--- a/device/device-purism-librem5dev/deviceinfo
+++ b/device/device-purism-librem5dev/deviceinfo
@@ -6,8 +6,8 @@ deviceinfo_name="Purism Librem 5 Devkit"
 deviceinfo_manufacturer="Purism"
 deviceinfo_codename="purism-librem5dev"
 deviceinfo_date=""
-deviceinfo_dtb="freescale/librem5-evk"
-deviceinfo_append_dtb="true"
+deviceinfo_dtb="freescale/imx8mq-librem5-devkit"
+deviceinfo_append_dtb="false"
 deviceinfo_modules_initfs=""
 deviceinfo_arch="aarch64"
 
diff --git a/device/device-purism-librem5dev/uboot-script.cmd b/device/device-purism-librem5dev/uboot-script.cmd
index ddf37c02a..0e442bae9 100644
--- a/device/device-purism-librem5dev/uboot-script.cmd
+++ b/device/device-purism-librem5dev/uboot-script.cmd
@@ -1,22 +1,20 @@
-setenv bootargs init=/init.sh rw console=ttymxc0,115200 earlycon=ec_imx7q,0x30860000,115200 video=HDMI-A-1:1920x1080-32@60 usbcore.autosuspend=-1 PMOS_NO_OUTPUT_REDIRECT PMOS_FORCE_PARTITION_RESIZE
+setenv bootargs init=/init.sh rw console=ttymxc0,115200 cma=256M PMOS_NO_OUTPUT_REDIRECT PMOS_FORCE_PARTITION_RESIZE
 setenv mmcdev 0
 setenv mmcpart 1
 
 printenv
 echo Loading DTB
-ext2load mmc ${mmcdev}:${mmcpart} ${fdt_addr} librem5-evk.dtb
+ext2load mmc ${mmcdev}:${mmcpart} ${fdt_addr_r} imx8mq-librem5-devkit.dtb
 
 echo Loading Initramfs
-ext2load mmc ${mmcdev}:${mmcpart} ${initrd_addr} uInitrd-purism-librem5dev
+ext2load mmc ${mmcdev}:${mmcpart} ${ramdisk_addr_r} uInitrd-purism-librem5dev
 
 echo Loading Kernel
-ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} vmlinuz-purism-librem5dev
+ext2load mmc ${mmcdev}:${mmcpart} ${kernel_addr_r} vmlinuz-purism-librem5dev
 
 echo Resizing FDT
-fdt addr ${fdt_addr}
+fdt addr ${fdt_addr_r}
 fdt resize
 
 echo Booting kernel
-booti ${loadaddr} ${initrd_addr} ${fdt_addr}
-
-
+booti ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr_r}