From b3ba8331d7a741eee5b34324b1b3a800946d1dbf Mon Sep 17 00:00:00 2001
From: Dan Johansen <strit@manjaro.org>
Date: Tue, 31 Mar 2020 11:33:52 +0200
Subject: fix UART in extlinux

---
 PKGBUILD      | 5 +++--
 extlinux.conf | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index 36f5493..8a5a77c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,12 +4,13 @@
 
 pkgname=uboot-pinebook
 pkgver=v2019.01.rc3.r35.g64abfc9b6b
-pkgrel=1
+pkgrel=2
 pkgdesc="U-Boot for Pine64"
 arch=('aarch64')
 url='http://www.denx.de/wiki/U-Boot/WebHome'
 license=('GPL')
 makedepends=('bc' 'git' 'python' 'swig' 'dtc')
+backup=('boot/extlinux/extlinux.conf')
 install=${pkgname}.install
 source=('git+https://github.com/u-boot/u-boot.git#commit=64abfc9b6bb3'
         'git+https://github.com/ARM-software/arm-trusted-firmware.git#commit=63b9b5425f15'
@@ -18,7 +19,7 @@ source=('git+https://github.com/u-boot/u-boot.git#commit=64abfc9b6bb3'
 md5sums=('SKIP'
          'SKIP'
          '3213c96ce0713249719dc73d58395620'
-         '9641cbc5984727d43f76350a7c0e124e')
+         '96aebf8a7cca044bb2c765ba8812299b')
 
 pkgver() {
   cd u-boot
diff --git a/extlinux.conf b/extlinux.conf
index 32757f4..ac76893 100644
--- a/extlinux.conf
+++ b/extlinux.conf
@@ -1,4 +1,4 @@
 LABEL Manjaro ARM
-KERNEL ../Image
-FDT ../dtbs/allwinner/sun50i-a64-pinebook.dtb
-APPEND initrd=../initramfs-linux.img console=tty1 root=LABEL=ROOT rw rootwait bootsplash.bootfile=bootsplash-themes/manjaro/bootsplash
+KERNEL /Image
+FDT /dtbs/allwinner/sun50i-a64-pinebook.dtb
+APPEND initrd=/initramfs-linux.img console=tty1 console=ttyS0,115200 root=LABEL=ROOT rw rootwait video=eDP-1:1920x1080@60 video=HDMI-A-1:1920x1080@60 bootsplash.bootfile=bootsplash-themes/manjaro/bootsplash
-- 
cgit v1.2.3-54-g00ecf