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

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

2 files changed, 11 insertions, 36 deletions

diff --git a/libre/uboot4extlinux-omap3/PKGBUILD b/libre/uboot4extlinux-omap3/PKGBUILD
index 0f619dee2..786e33996 100644
--- a/libre/uboot4extlinux-omap3/PKGBUILD
+++ b/libre/uboot4extlinux-omap3/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgbase=uboot4extlinux-omap3
 pkgname=('uboot4extlinux-omap3_beagle')
-pkgver=2019.10
+pkgver=2020.04
 pkgrel=1
 arch=('armv7h')
 url="http://git.denx.de/u-boot.git/"
@@ -15,9 +15,9 @@ backup=(boot/extlinux/extlinux.conf)
 source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
         '0001-omap34xx-SPL-enable-MMC-raw-boot-with-u-boot.img.patch'
         'extlinux.conf')
-sha256sums=('8d6d6070739522dd236cba7055b8736bfe92b4fac0ea18ad809829ca79667014'
+sha256sums=('fe732aaf037d9cc3c0909bad8362af366ae964bbdac6913a34081ff4ad565372'
             'SKIP'
-            'd8ca994d80f05a99963b92736860d0a7f420d0771a6e5da9add0c6eac40034b6')
+            'SKIP')
 
 boards=('omap3_beagle')
 
@@ -77,4 +77,9 @@ package_uboot4extlinux-omap3_beagle() {
 	"${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 be converted to ReStructuredText at some point and be moved because of that
+  install -Dm644 u-boot-${pkgver}/doc/README.omap3 "${pkgdir}"/usr/share/doc/u-boot/
 }
diff --git a/libre/uboot4extlinux-omap3/extlinux.conf b/libre/uboot4extlinux-omap3/extlinux.conf
index e31c975d7..3307eb9de 100644
--- a/libre/uboot4extlinux-omap3/extlinux.conf
+++ b/libre/uboot4extlinux-omap3/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 console=ttyO2,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 console=ttyO2,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 console=ttyO2,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 console=ttyO2,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 console=ttyO2,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 console=ttyO2,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 console=ttyO2,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 console=ttyO2,115200 root=/dev/mmcblk0p1 rw rootwait
-	fdtdir /boot/dtbs/linux-libre-xtreme