From 36427e16da441c3528f4d7b997749d2e586433fa Mon Sep 17 00:00:00 2001
From: Martijn Braam <martijn@brixit.nl>
Date: Mon, 9 Dec 2019 01:31:47 +0100
Subject: [PATCH] pine64-pinephone: fix emmc booting (!801)

---
 device/device-pine64-pinephone/APKBUILD         |  4 ++--
 device/device-pine64-pinephone/uboot-script.cmd | 11 ++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/device/device-pine64-pinephone/APKBUILD b/device/device-pine64-pinephone/APKBUILD
index 55bcb420e..629ae2c0e 100644
--- a/device/device-pine64-pinephone/APKBUILD
+++ b/device/device-pine64-pinephone/APKBUILD
@@ -2,7 +2,7 @@
 pkgname="device-pine64-pinephone"
 pkgdesc="PINE64 PinePhone"
 pkgver=0.1
-pkgrel=15
+pkgrel=16
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -68,7 +68,7 @@ nonfree_firmware() {
 
 
 sha512sums="bfb39f14c5a0b928d08cbcb5d19e63e141b052ebb72186c7c26f54d89c2ebf069674bc110215df0cacdd663610594eef5ffb3022eae5bd0e08aea34ab4e2f319  deviceinfo
-f7271c2b231e3417bd8729a25f19ef4ce149c7afd7d64b2b16a4f131e281e3f43687055210179ae14993a0df766feb11ee4091b33185b00a21608a31e615d712  uboot-script.cmd
+35a5ce7c18747e4363c6b310a1c33143f333a9dd2031d619dee10773d499329487a5ed76749e182d56829d03511266a54890cfa706ba21565e9ba8ffdb88f872  uboot-script.cmd
 c4c57d1627dd451213e1ef20d89de9266cd4edcc2d33a69aa9a1f13e16d9f9742036b69dc149fd910d7213f7525c41eb79576d4457bc85cc96eba0d986382d27  weston.ini
 f86ef35730b89bcc8160c08db7a7fcd0970adf60c0b77af68bac397de49c0d1783e6b8db1762380c9bf874aff2d030c6f44ecb75c803d69e79ede11376409369  xorg.conf
 3dd6d612c381cb0002049d1974d8fb5aa5a53a1eb4d6bcbf62eb2ad52cfdc45f0f6ad24a699716d3513b0371aa1316f25dc72afc10d7176cc3b99d0965c3f030  hwtest.ini
diff --git a/device/device-pine64-pinephone/uboot-script.cmd b/device/device-pine64-pinephone/uboot-script.cmd
index 2c14e1333..236e289a4 100644
--- a/device/device-pine64-pinephone/uboot-script.cmd
+++ b/device/device-pine64-pinephone/uboot-script.cmd
@@ -1,5 +1,14 @@
 gpio set 114
-setenv bootargs init=/init.sh rw console=tty0 console=ttyS0,115200 no_console_suspend earlycon=uart,mmio32,0x01c28000 panic=10 consoleblank=0 loglevel=1 cma=256M PMOS_NO_OUTPUT_REDIRECT pmos_boot=/dev/mmcblk${mmc_bootdev}p1 pmos_root=/dev/mmcblk${mmc_bootdev}p2
+
+if test ${mmc_bootdev} -eq 0 ; then
+	echo "Booting from SD";
+	setenv bootdev 0;
+else
+	echo "Booting from eMMC";
+	setenv bootdev 2;
+fi;
+
+setenv bootargs init=/init.sh rw console=tty0 console=ttyS0,115200 no_console_suspend earlycon=uart,mmio32,0x01c28000 panic=10 consoleblank=0 loglevel=1 cma=256M PMOS_NO_OUTPUT_REDIRECT pmos_boot=/dev/mmcblk${bootdev}p1 pmos_root=/dev/mmcblk${bootdev}p2
 
 printenv