libre: uboot4extlinux-am335x: update to 2019.10

Other changes
- Added support to the chiliboard
- 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>

2 files changed, 42 insertions, 14 deletions

diff --git a/libre/uboot4extlinux-am335x/PKGBUILD b/libre/uboot4extlinux-am335x/PKGBUILD
index 7d905d7e3..5480ab8ab 100644
--- a/libre/uboot4extlinux-am335x/PKGBUILD
+++ b/libre/uboot4extlinux-am335x/PKGBUILD
@@ -4,9 +4,10 @@
 # Contributor: Márcio Silva <coadde@hyperbola.info>
 
 pkgbase=uboot4extlinux-am335x
-pkgname=('uboot4extlinux-am335x_bone')
-pkgver=2019.01
-pkgrel=4
+pkgname=('uboot4extlinux-am335x_bone'
+         'uboot4extlinux-chiliboard')
+pkgver=2019.10
+pkgrel=1
 arch=('armv7h')
 url="http://git.denx.de/u-boot.git/"
 license=('GPL')
@@ -14,10 +15,11 @@ makedepends=('bc' 'bison' 'dtc' 'flex' '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'
-            'dcce8acd934eef35360c9e455197b1b46455a1a35c78bc94b9ed96234f2bb2b8')
+sha256sums=('8d6d6070739522dd236cba7055b8736bfe92b4fac0ea18ad809829ca79667014'
+            '445fb52f25787d184596d8ad6f6c6359d4ca2508fd68f7a178970b760f8080fd')
 
-boards=('am335x_evm')
+boards=('am335x_evm'
+        'chiliboard')
 
 prepare() {
   cd u-boot-${pkgver}
@@ -56,3 +58,21 @@ package_uboot4extlinux-am335x_bone() {
 
   install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
 }
+
+package_uboot4extlinux-chiliboard() {
+  pkgdesc="U-Boot with Extlinux support for the ChiliBoard"
+
+  install=${pkgbase}.install
+  provides=('uboot4extlinux-am335x')
+  conflicts=('uboot-chiliboard')
+
+  install -d "${pkgdir}"/boot/extlinux
+  install -d "${pkgdir}"/boot/u-boot/images/
+
+  install -Dm644 \
+	bin_chiliboard/MLO \
+	bin_chiliboard/u-boot.img \
+	"${pkgdir}"/boot/u-boot/images/
+
+  install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
+}
diff --git a/libre/uboot4extlinux-am335x/extlinux.conf b/libre/uboot4extlinux-am335x/extlinux.conf
index 160e4da86..d188c4f6e 100644
--- a/libre/uboot4extlinux-am335x/extlinux.conf
+++ b/libre/uboot4extlinux-am335x/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=ttyO0,115200 coherent_pool=1M
+	initrd /boot/initramfs-linux-libre-fallback.img
+	append coherent_pool=1M console=ttyO0,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=ttyO0,115200 coherent_pool=1M
+	initrd /boot/initramfs-linux-libre-lts-fallback.img
+	append coherent_pool=1M console=ttyO0,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=ttyO0,115200 coherent_pool=1M
+	initrd /boot/initramfs-linux-libre-lts-knock-fallback.img
+	append coherent_pool=1M console=ttyO0,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=ttyO0,115200 coherent_pool=1M
+	initrd /boot/initramfs-linux-libre-hardened-fallback.img
+	append coherent_pool=1M console=ttyO0,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=ttyO0,115200 coherent_pool=1M
+	initrd /boot/initramfs-linux-libre-lts-apparmor-fallback.img
+	append coherent_pool=1M console=ttyO0,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=ttyO0,115200 coherent_pool=1M
+	initrd /boot/initramfs-linux-libre-pck-fallback.img
+	append coherent_pool=1M console=ttyO0,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=ttyO0,115200 coherent_pool=1M
+	initrd /boot/initramfs-linux-libre-rt-fallback.img
+	append coherent_pool=1M console=ttyO0,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=ttyO0,115200 coherent_pool=1M
+	initrd /boot/initramfs-linux-libre-xtreme-fallback.img
+	append coherent_pool=1M console=ttyO0,115200 root=/dev/mmcblk0p1 rw rootwait
 	fdtdir /boot/dtbs/linux-libre-xtreme