libre: uboot4extlinux-am335x: Update to 2020.04, Fix extlinux.conf, package documentation

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>

2 files changed, 17 insertions, 37 deletions

diff --git a/libre/uboot4extlinux-am335x/PKGBUILD b/libre/uboot4extlinux-am335x/PKGBUILD
index 5480ab8ab..6d76ae497 100644
--- a/libre/uboot4extlinux-am335x/PKGBUILD
+++ b/libre/uboot4extlinux-am335x/PKGBUILD
@@ -6,7 +6,7 @@
 pkgbase=uboot4extlinux-am335x
 pkgname=('uboot4extlinux-am335x_bone'
          'uboot4extlinux-chiliboard')
-pkgver=2019.10
+pkgver=2020.04
 pkgrel=1
 arch=('armv7h')
 url="http://git.denx.de/u-boot.git/"
@@ -15,8 +15,8 @@ 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=('8d6d6070739522dd236cba7055b8736bfe92b4fac0ea18ad809829ca79667014'
-            '445fb52f25787d184596d8ad6f6c6359d4ca2508fd68f7a178970b760f8080fd')
+sha256sums=('fe732aaf037d9cc3c0909bad8362af366ae964bbdac6913a34081ff4ad565372'
+            'SKIP')
 
 boards=('am335x_evm'
         'chiliboard')
@@ -42,7 +42,7 @@ build() {
 }
 
 package_uboot4extlinux-am335x_bone() {
-  pkgdesc="U-Boot with Extlinux support for various BeagleBones"
+  pkgdesc="U-Boot with Extlinux support for various BeagleBones, the AM335x GP EVM and EVM SK EVM SK"
 
   install=${pkgbase}.install
   provides=('uboot4extlinux-am335x')
@@ -57,6 +57,11 @@ package_uboot4extlinux-am335x_bone() {
 	"${pkgdir}"/boot/u-boot/images/
 
   install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
+
+  # Package documentation as well
+  install -d "${pkgdir}"/usr/share/doc/u-boot
+  # The README might move in doc/board/ at some point
+  install -Dm644 u-boot-${pkgver}/board/ti/am335x/README "${pkgdir}"/usr/share/doc/u-boot/am335x_bone.txt
 }
 
 package_uboot4extlinux-chiliboard() {
@@ -75,4 +80,9 @@ package_uboot4extlinux-chiliboard() {
 	"${pkgdir}"/boot/u-boot/images/
 
   install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
+
+  # Package documentation as well
+  install -d "${pkgdir}"/usr/share/doc/u-boot
+  # The README might move in doc/board/ at some point
+  install -Dm644 u-boot-${pkgver}/board/grinn/chiliboard/README "${pkgdir}"/usr/share/doc/u-boot/chiliboard.txt
 }
diff --git a/libre/uboot4extlinux-am335x/extlinux.conf b/libre/uboot4extlinux-am335x/extlinux.conf
index d188c4f6e..86d5e0df7 100644
--- a/libre/uboot4extlinux-am335x/extlinux.conf
+++ b/libre/uboot4extlinux-am335x/extlinux.conf
@@ -4,48 +4,18 @@ timeout 50
 
 label Parabola GNU/Linux-libre, linux-libre kernel
 	kernel /boot/vmlinuz-linux-libre
-	initrd /boot/initramfs-linux-libre-fallback.img
+	initrd /boot/initramfs-linux-libre.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
-	initrd /boot/initramfs-linux-libre-lts-fallback.img
+	initrd /boot/initramfs-linux-libre-lts.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
-	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
-	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
-	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
-	initrd /boot/initramfs-linux-libre-pck-fallback.img
+	initrd /boot/initramfs-linux-libre-pck.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
-	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
-	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