From 52ec3b67239220f0537ce78304bb980978c0a136 Mon Sep 17 00:00:00 2001
From: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Date: Sun, 10 Nov 2019 20:42:30 +0100
Subject: libre: uboot4extlinux-sunxi: update to 2019.10

Other changes
- extlinux.conf:
  - Added the initramfs in the example configuration
  - Added rootwait parameter in case the rootfs takes time to appear

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
---
 libre/uboot4extlinux-sunxi/PKGBUILD      |  8 ++++----
 libre/uboot4extlinux-sunxi/extlinux.conf | 24 ++++++++++++++++--------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/libre/uboot4extlinux-sunxi/PKGBUILD b/libre/uboot4extlinux-sunxi/PKGBUILD
index e3eef2a84..b0e2f89f0 100644
--- a/libre/uboot4extlinux-sunxi/PKGBUILD
+++ b/libre/uboot4extlinux-sunxi/PKGBUILD
@@ -25,8 +25,8 @@ pkgname=('uboot4extlinux-a10-olinuxino-lime'
          'uboot4extlinux-orangepi_one'
          'uboot4extlinux-orangepi_pc'
          'uboot4extlinux-orangepi_plus')
-pkgver=2019.01
-pkgrel=5
+pkgver=2019.10
+pkgrel=1
 arch=('armv7h')
 url="http://git.denx.de/u-boot.git/"
 license=('GPL')
@@ -34,8 +34,8 @@ makedepends=('bc' 'dtc' 'python' 'python2' 'swig')
 backup=(boot/extlinux/extlinux.conf)
 source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
         'extlinux.conf')
-sha256sums=('50bd7e5a466ab828914d080d5f6a432345b500e8fba1ad3b7b61e95e60d51c22'
-            '34550c6d700c6b4713f490d6d1b4e3ceb78a04072786225084fe6d13e232f105')
+sha256sums=('8d6d6070739522dd236cba7055b8736bfe92b4fac0ea18ad809829ca79667014'
+            '4da5d8f208b5b3258aa9de3c217cf99c738b93f3bbbf8c1c7e63e773c76e18ee')
 
 boards=('A10-OLinuXino-Lime'
         'A10s-OLinuXino-M'
diff --git a/libre/uboot4extlinux-sunxi/extlinux.conf b/libre/uboot4extlinux-sunxi/extlinux.conf
index 02b942df6..805b6dfdb 100644
--- a/libre/uboot4extlinux-sunxi/extlinux.conf
+++ b/libre/uboot4extlinux-sunxi/extlinux.conf
@@ -4,40 +4,48 @@ timeout 50
 
 label Parabola GNU/Linux-libre, linux-libre kernel
 	kernel /boot/vmlinuz-linux-libre
-	append root=/dev/mmcblk0p1 rw console=ttyS0,115200
+	initrd /boot/initramfs-linux-libre-fallback.img
+	append console=ttyS0,115200 root=/dev/mmcblk0p1 rw rootwait
 	fdtdir /boot/dtbs/linux-libre
 
 label Parabola GNU/Linux-libre, linux-libre-lts kernel
 	kernel /boot/vmlinuz-linux-libre-lts
-	append root=/dev/mmcblk0p1 rw console=ttyS0,115200
+	initrd /boot/initramfs-linux-libre-lts-fallback.img
+	append console=ttyS0,115200 root=/dev/mmcblk0p1 rw rootwait
 	fdtdir /boot/dtbs/linux-libre-lts
 
 label Parabola GNU/Linux-libre, linux-libre-lts-knock kernel
 	kernel /boot/vmlinuz-linux-libre-lts-knock
-	append root=/dev/mmcblk0p1 rw console=ttyS0,115200
+	initrd /boot/initramfs-linux-libre-lts-knock-fallback.img
+	append console=ttyS0,115200 root=/dev/mmcblk0p1 rw rootwait
 	fdtdir /boot/dtbs/linux-libre-lts-knock
 
 label Parabola GNU/Linux-libre, linux-libre-hardened kernel
 	kernel /boot/vmlinuz-linux-libre-hardened
-	append root=/dev/mmcblk0p1 rw console=ttyS0,115200
+	initrd /boot/initramfs-linux-libre-hardened-fallback.img
+	append console=ttyS0,115200 root=/dev/mmcblk0p1 rw rootwait
 	fdtdir /boot/dtbs/linux-libre-hardened
 
 label Parabola GNU/Linux-libre, linux-libre-lts-apparmor kernel
 	kernel /boot/vmlinuz-linux-libre-lts-apparmor
-	append root=/dev/mmcblk0p1 rw console=ttyS0,115200
+	initrd /boot/initramfs-linux-libre-lts-apparmor-fallback.img
+	append console=ttyS0,115200 root=/dev/mmcblk0p1 rw rootwait
 	fdtdir /boot/dtbs/linux-libre-lts-apparmor
 
 label Parabola GNU/Linux-libre, linux-libre-pck kernel
 	kernel /boot/vmlinuz-linux-libre-pck
-	append root=/dev/mmcblk0p1 rw console=ttyS0,115200
+	initrd /boot/initramfs-linux-libre-pck-fallback.img
+	append console=ttyS0,115200 root=/dev/mmcblk0p1 rw rootwait
 	fdtdir /boot/dtbs/linux-libre-pck
 
 label Parabola GNU/Linux-libre, linux-libre-rt kernel
 	kernel /boot/vmlinuz-linux-libre-rt
-	append root=/dev/mmcblk0p1 rw console=ttyS0,115200
+	initrd /boot/initramfs-linux-libre-rt-fallback.img
+	append console=ttyS0,115200 root=/dev/mmcblk0p1 rw rootwait
 	fdtdir /boot/dtbs/linux-libre-rt
 
 label Parabola GNU/Linux-libre, linux-libre-xtreme kernel
 	kernel /boot/vmlinuz-linux-libre-xtreme
-	append root=/dev/mmcblk0p1 rw console=ttyS0,115200
+	initrd /boot/initramfs-linux-libre-xtreme-fallback.img
+	append console=ttyS0,115200 root=/dev/mmcblk0p1 rw rootwait
 	fdtdir /boot/dtbs/linux-libre-xtreme
-- 
cgit v1.2.3