2 files changed, 6 insertions, 36 deletions
diff --git a/libre/uboot4extlinux-sunxi/PKGBUILD b/libre/uboot4extlinux-sunxi/PKGBUILD
index b0e2f89f0..f3d069855 100644
--- a/libre/uboot4extlinux-sunxi/PKGBUILD
+++ b/libre/uboot4extlinux-sunxi/PKGBUILD
@@ -25,7 +25,7 @@ pkgname=('uboot4extlinux-a10-olinuxino-lime'
          'uboot4extlinux-orangepi_one'
          'uboot4extlinux-orangepi_pc'
          'uboot4extlinux-orangepi_plus')
-pkgver=2019.10
+pkgver=2020.04
 pkgrel=1
 arch=('armv7h')
 url="http://git.denx.de/u-boot.git/"
@@ -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=('8d6d6070739522dd236cba7055b8736bfe92b4fac0ea18ad809829ca79667014'
-            '4da5d8f208b5b3258aa9de3c217cf99c738b93f3bbbf8c1c7e63e773c76e18ee')
+sha256sums=('fe732aaf037d9cc3c0909bad8362af366ae964bbdac6913a34081ff4ad565372'
+            'SKIP')
 
 boards=('A10-OLinuXino-Lime'
         'A10s-OLinuXino-M'
diff --git a/libre/uboot4extlinux-sunxi/extlinux.conf b/libre/uboot4extlinux-sunxi/extlinux.conf
index 805b6dfdb..4cc4b1b18 100644
--- a/libre/uboot4extlinux-sunxi/extlinux.conf
+++ b/libre/uboot4extlinux-sunxi/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=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
-	initrd /boot/initramfs-linux-libre-lts-fallback.img
+	initrd /boot/initramfs-linux-libre-lts.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
-	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
-	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
-	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
-	initrd /boot/initramfs-linux-libre-pck-fallback.img
+	initrd /boot/initramfs-linux-libre-pck.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
-	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
-	initrd /boot/initramfs-linux-libre-xtreme-fallback.img
-	append console=ttyS0,115200 root=/dev/mmcblk0p1 rw rootwait
-	fdtdir /boot/dtbs/linux-libre-xtreme