uboot4extlinux-*: get in sync with current kernels

14 files changed, 28 insertions, 133 deletions

diff --git a/libre-testing/uboot4extlinux-am335x_bone/PKGBUILD b/libre-testing/uboot4extlinux-am335x_bone/PKGBUILD
index 8aceb2028..d2d5efbf7 100644
--- a/libre-testing/uboot4extlinux-am335x_bone/PKGBUILD
+++ b/libre-testing/uboot4extlinux-am335x_bone/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=uboot4extlinux-am335x_bone
 pkgver=2015.04
-pkgrel=4
+pkgrel=4.1
 pkgdesc="U-Boot with Extlinux support for BeagleBone and BeagleBone Black"
 arch=('armv7h')
 url="http://git.denx.de/u-boot.git/"
diff --git a/libre-testing/uboot4extlinux-am335x_bone/extlinux.conf b/libre-testing/uboot4extlinux-am335x_bone/extlinux.conf
index 3c50750b7..b29bec2d7 100644
--- a/libre-testing/uboot4extlinux-am335x_bone/extlinux.conf
+++ b/libre-testing/uboot4extlinux-am335x_bone/extlinux.conf
@@ -12,11 +12,6 @@ label Parabola GNU/Linux-libre, linux-libre-lts kernel
 	append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8
 	fdtdir /boot/dtbs/linux-libre-lts
 
-label Parabola GNU/Linux-libre, linux-libre-knock kernel
-	kernel /boot/vmlinuz-linux-libre-knock
-	append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8
-	fdtdir /boot/dtbs/linux-libre-knock
-
 label Parabola GNU/Linux-libre, linux-libre-lts-knock kernel
 	kernel /boot/vmlinuz-linux-libre-lts-knock
 	append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8
@@ -27,21 +22,11 @@ label Parabola GNU/Linux-libre, linux-libre-hardened kernel
 	append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8
 	fdtdir /boot/dtbs/linux-libre-hardened
 
-label Parabola GNU/Linux-libre, linux-libre-apparmor kernel
-	kernel /boot/vmlinuz-linux-libre-apparmor
-	append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8
-	fdtdir /boot/dtbs/linux-libre-apparmor
-
 label Parabola GNU/Linux-libre, linux-libre-lts-apparmor kernel
 	kernel /boot/vmlinuz-linux-libre-lts-apparmor
 	append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8
 	fdtdir /boot/dtbs/linux-libre-lts-apparmor
 
-label Parabola GNU/Linux-libre, linux-libre-audit kernel
-	kernel /boot/vmlinuz-linux-libre-audit
-	append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8
-	fdtdir /boot/dtbs/linux-libre-audit
-
 label Parabola GNU/Linux-libre, linux-libre-pck kernel
 	kernel /boot/vmlinuz-linux-libre-pck
 	append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8
@@ -52,7 +37,7 @@ label Parabola GNU/Linux-libre, linux-libre-rt kernel
 	append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8
 	fdtdir /boot/dtbs/linux-libre-rt
 
-label Parabola GNU/Linux-libre, linux-libre-xen kernel
-	kernel /boot/vmlinuz-linux-libre-xen
+label Parabola GNU/Linux-libre, linux-libre-xtreme kernel
+	kernel /boot/vmlinuz-linux-libre-xtreme
 	append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8
-	fdtdir /boot/dtbs/linux-libre-xen
+	fdtdir /boot/dtbs/linux-libre-xtreme
diff --git a/libre-testing/uboot4extlinux-chiliboard/PKGBUILD b/libre-testing/uboot4extlinux-chiliboard/PKGBUILD
index 1b00b881d..64c85700a 100644
--- a/libre-testing/uboot4extlinux-chiliboard/PKGBUILD
+++ b/libre-testing/uboot4extlinux-chiliboard/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=uboot4extlinux-chiliboard
 pkgver=2014.07
-pkgrel=3
+pkgrel=3.1
 pkgdesc="U-Boot with Extlinux support for ChiliBoard"
 arch=('armv7h')
 url="http://git.denx.de/u-boot.git/"
diff --git a/libre-testing/uboot4extlinux-chiliboard/extlinux.conf b/libre-testing/uboot4extlinux-chiliboard/extlinux.conf
index 3c50750b7..b29bec2d7 100644
--- a/libre-testing/uboot4extlinux-chiliboard/extlinux.conf
+++ b/libre-testing/uboot4extlinux-chiliboard/extlinux.conf
@@ -12,11 +12,6 @@ label Parabola GNU/Linux-libre, linux-libre-lts kernel
 	append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8
 	fdtdir /boot/dtbs/linux-libre-lts
 
-label Parabola GNU/Linux-libre, linux-libre-knock kernel
-	kernel /boot/vmlinuz-linux-libre-knock
-	append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8
-	fdtdir /boot/dtbs/linux-libre-knock
-
 label Parabola GNU/Linux-libre, linux-libre-lts-knock kernel
 	kernel /boot/vmlinuz-linux-libre-lts-knock
 	append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8
@@ -27,21 +22,11 @@ label Parabola GNU/Linux-libre, linux-libre-hardened kernel
 	append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8
 	fdtdir /boot/dtbs/linux-libre-hardened
 
-label Parabola GNU/Linux-libre, linux-libre-apparmor kernel
-	kernel /boot/vmlinuz-linux-libre-apparmor
-	append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8
-	fdtdir /boot/dtbs/linux-libre-apparmor
-
 label Parabola GNU/Linux-libre, linux-libre-lts-apparmor kernel
 	kernel /boot/vmlinuz-linux-libre-lts-apparmor
 	append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8
 	fdtdir /boot/dtbs/linux-libre-lts-apparmor
 
-label Parabola GNU/Linux-libre, linux-libre-audit kernel
-	kernel /boot/vmlinuz-linux-libre-audit
-	append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8
-	fdtdir /boot/dtbs/linux-libre-audit
-
 label Parabola GNU/Linux-libre, linux-libre-pck kernel
 	kernel /boot/vmlinuz-linux-libre-pck
 	append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8
@@ -52,7 +37,7 @@ label Parabola GNU/Linux-libre, linux-libre-rt kernel
 	append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8
 	fdtdir /boot/dtbs/linux-libre-rt
 
-label Parabola GNU/Linux-libre, linux-libre-xen kernel
-	kernel /boot/vmlinuz-linux-libre-xen
+label Parabola GNU/Linux-libre, linux-libre-xtreme kernel
+	kernel /boot/vmlinuz-linux-libre-xtreme
 	append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8
-	fdtdir /boot/dtbs/linux-libre-xen
+	fdtdir /boot/dtbs/linux-libre-xtreme
diff --git a/libre-testing/uboot4extlinux-nitrogen6q/PKGBUILD b/libre-testing/uboot4extlinux-nitrogen6q/PKGBUILD
index 4be4e39b9..9cbeca70f 100644
--- a/libre-testing/uboot4extlinux-nitrogen6q/PKGBUILD
+++ b/libre-testing/uboot4extlinux-nitrogen6q/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=uboot4extlinux-nitrogen6q
 pkgver=2014.07
-pkgrel=3
+pkgrel=3.1
 arch=('armv7h')
 pkgdesc="U-Boot with Extlinux support for Nitrogen6X/Sabre Lite"
 url="https://github.com/boundarydevices/u-boot-imx6/tree/production"
diff --git a/libre-testing/uboot4extlinux-nitrogen6q/extlinux.conf b/libre-testing/uboot4extlinux-nitrogen6q/extlinux.conf
index 029c94bf9..7369fc759 100644
--- a/libre-testing/uboot4extlinux-nitrogen6q/extlinux.conf
+++ b/libre-testing/uboot4extlinux-nitrogen6q/extlinux.conf
@@ -12,11 +12,6 @@ label Parabola GNU/Linux-libre, linux-libre-lts kernel
 	append root=/dev/mmcblk0p2 rw console=ttymxc1
 	fdtdir /boot/dtbs/linux-libre-lts
 
-label Parabola GNU/Linux-libre, linux-libre-knock kernel
-	kernel /boot/vmlinuz-linux-libre-knock
-	append root=/dev/mmcblk0p2 rw console=ttymxc1
-	fdtdir /boot/dtbs/linux-libre-knock
-
 label Parabola GNU/Linux-libre, linux-libre-lts-knock kernel
 	kernel /boot/vmlinuz-linux-libre-lts-knock
 	append root=/dev/mmcblk0p2 rw console=ttymxc1
@@ -27,21 +22,11 @@ label Parabola GNU/Linux-libre, linux-libre-hardened kernel
 	append root=/dev/mmcblk0p2 rw console=ttymxc1
 	fdtdir /boot/dtbs/linux-libre-hardened
 
-label Parabola GNU/Linux-libre, linux-libre-apparmor kernel
-	kernel /boot/vmlinuz-linux-libre-apparmor
-	append root=/dev/mmcblk0p2 rw console=ttymxc1
-	fdtdir /boot/dtbs/linux-libre-apparmor
-
 label Parabola GNU/Linux-libre, linux-libre-lts-apparmor kernel
 	kernel /boot/vmlinuz-linux-libre-lts-apparmor
 	append root=/dev/mmcblk0p2 rw console=ttymxc1
 	fdtdir /boot/dtbs/linux-libre-lts-apparmor
 
-label Parabola GNU/Linux-libre, linux-libre-audit kernel
-	kernel /boot/vmlinuz-linux-libre-audit
-	append root=/dev/mmcblk0p2 rw console=ttymxc1
-	fdtdir /boot/dtbs/linux-libre-audit
-
 label Parabola GNU/Linux-libre, linux-libre-pck kernel
 	kernel /boot/vmlinuz-linux-libre-pck
 	append root=/dev/mmcblk0p2 rw console=ttymxc1
@@ -52,7 +37,7 @@ label Parabola GNU/Linux-libre, linux-libre-rt kernel
 	append root=/dev/mmcblk0p2 rw console=ttymxc1
 	fdtdir /boot/dtbs/linux-libre-rt
 
-label Parabola GNU/Linux-libre, linux-libre-xen kernel
-	kernel /boot/vmlinuz-linux-libre-xen
+label Parabola GNU/Linux-libre, linux-libre-xtreme kernel
+	kernel /boot/vmlinuz-linux-libre-xtreme
 	append root=/dev/mmcblk0p2 rw console=ttymxc1
-	fdtdir /boot/dtbs/linux-libre-xen
+	fdtdir /boot/dtbs/linux-libre-xtreme
diff --git a/libre-testing/uboot4extlinux-omap3_beagle/PKGBUILD b/libre-testing/uboot4extlinux-omap3_beagle/PKGBUILD
index db503e120..98ca69f6f 100644
--- a/libre-testing/uboot4extlinux-omap3_beagle/PKGBUILD
+++ b/libre-testing/uboot4extlinux-omap3_beagle/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=uboot4extlinux-omap3_beagle
 pkgver=2016.01
-pkgrel=4
+pkgrel=4.1
 pkgdesc="U-Boot with Extlinux support for BeagleBoard and BeagleBoard-xM"
 arch=('armv7h')
 url="http://git.denx.de/u-boot.git/"
diff --git a/libre-testing/uboot4extlinux-omap3_beagle/extlinux.conf b/libre-testing/uboot4extlinux-omap3_beagle/extlinux.conf
index 42525abe7..bb48ab97f 100644
--- a/libre-testing/uboot4extlinux-omap3_beagle/extlinux.conf
+++ b/libre-testing/uboot4extlinux-omap3_beagle/extlinux.conf
@@ -12,11 +12,6 @@ label Parabola GNU/Linux-libre, linux-libre-lts kernel
 	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
 	fdtdir /boot/dtbs/linux-libre-lts
 
-label Parabola GNU/Linux-libre, linux-libre-knock kernel
-	kernel /boot/vmlinuz-linux-libre-knock
-	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
-	fdtdir /boot/dtbs/linux-libre-knock
-
 label Parabola GNU/Linux-libre, linux-libre-lts-knock kernel
 	kernel /boot/vmlinuz-linux-libre-lts-knock
 	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
@@ -27,21 +22,11 @@ label Parabola GNU/Linux-libre, linux-libre-hardened kernel
 	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
 	fdtdir /boot/dtbs/linux-libre-hardened
 
-label Parabola GNU/Linux-libre, linux-libre-apparmor kernel
-	kernel /boot/vmlinuz-linux-libre-apparmor
-	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
-	fdtdir /boot/dtbs/linux-libre-apparmor
-
 label Parabola GNU/Linux-libre, linux-libre-lts-apparmor kernel
 	kernel /boot/vmlinuz-linux-libre-lts-apparmor
 	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
 	fdtdir /boot/dtbs/linux-libre-lts-apparmor
 
-label Parabola GNU/Linux-libre, linux-libre-audit kernel
-	kernel /boot/vmlinuz-linux-libre-audit
-	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
-	fdtdir /boot/dtbs/linux-libre-audit
-
 label Parabola GNU/Linux-libre, linux-libre-pck kernel
 	kernel /boot/vmlinuz-linux-libre-pck
 	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
@@ -52,7 +37,7 @@ label Parabola GNU/Linux-libre, linux-libre-rt kernel
 	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
 	fdtdir /boot/dtbs/linux-libre-rt
 
-label Parabola GNU/Linux-libre, linux-libre-xen kernel
-	kernel /boot/vmlinuz-linux-libre-xen
+label Parabola GNU/Linux-libre, linux-libre-xtreme kernel
+	kernel /boot/vmlinuz-linux-libre-xtreme
 	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
-	fdtdir /boot/dtbs/linux-libre-xen
+	fdtdir /boot/dtbs/linux-libre-xtreme
diff --git a/libre-testing/uboot4extlinux-omap4_panda/PKGBUILD b/libre-testing/uboot4extlinux-omap4_panda/PKGBUILD
index 38549ea30..cdd8c65d1 100644
--- a/libre-testing/uboot4extlinux-omap4_panda/PKGBUILD
+++ b/libre-testing/uboot4extlinux-omap4_panda/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=uboot4extlinux-omap4_panda
 pkgver=2017.01
-pkgrel=1
+pkgrel=1.1
 pkgdesc="U-Boot with Extlinux support for PandaBoard and PandaBoard ES"
 arch=('armv7h')
 url="http://git.denx.de/u-boot.git/"
diff --git a/libre-testing/uboot4extlinux-omap4_panda/extlinux.conf b/libre-testing/uboot4extlinux-omap4_panda/extlinux.conf
index 42525abe7..bb48ab97f 100644
--- a/libre-testing/uboot4extlinux-omap4_panda/extlinux.conf
+++ b/libre-testing/uboot4extlinux-omap4_panda/extlinux.conf
@@ -12,11 +12,6 @@ label Parabola GNU/Linux-libre, linux-libre-lts kernel
 	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
 	fdtdir /boot/dtbs/linux-libre-lts
 
-label Parabola GNU/Linux-libre, linux-libre-knock kernel
-	kernel /boot/vmlinuz-linux-libre-knock
-	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
-	fdtdir /boot/dtbs/linux-libre-knock
-
 label Parabola GNU/Linux-libre, linux-libre-lts-knock kernel
 	kernel /boot/vmlinuz-linux-libre-lts-knock
 	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
@@ -27,21 +22,11 @@ label Parabola GNU/Linux-libre, linux-libre-hardened kernel
 	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
 	fdtdir /boot/dtbs/linux-libre-hardened
 
-label Parabola GNU/Linux-libre, linux-libre-apparmor kernel
-	kernel /boot/vmlinuz-linux-libre-apparmor
-	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
-	fdtdir /boot/dtbs/linux-libre-apparmor
-
 label Parabola GNU/Linux-libre, linux-libre-lts-apparmor kernel
 	kernel /boot/vmlinuz-linux-libre-lts-apparmor
 	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
 	fdtdir /boot/dtbs/linux-libre-lts-apparmor
 
-label Parabola GNU/Linux-libre, linux-libre-audit kernel
-	kernel /boot/vmlinuz-linux-libre-audit
-	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
-	fdtdir /boot/dtbs/linux-libre-audit
-
 label Parabola GNU/Linux-libre, linux-libre-pck kernel
 	kernel /boot/vmlinuz-linux-libre-pck
 	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
@@ -52,7 +37,7 @@ label Parabola GNU/Linux-libre, linux-libre-rt kernel
 	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
 	fdtdir /boot/dtbs/linux-libre-rt
 
-label Parabola GNU/Linux-libre, linux-libre-xen kernel
-	kernel /boot/vmlinuz-linux-libre-xen
+label Parabola GNU/Linux-libre, linux-libre-xtreme kernel
+	kernel /boot/vmlinuz-linux-libre-xtreme
 	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
-	fdtdir /boot/dtbs/linux-libre-xen
+	fdtdir /boot/dtbs/linux-libre-xtreme
diff --git a/libre-testing/uboot4extlinux-udoo/PKGBUILD b/libre-testing/uboot4extlinux-udoo/PKGBUILD
index 1c0a82881..ece74b85c 100644
--- a/libre-testing/uboot4extlinux-udoo/PKGBUILD
+++ b/libre-testing/uboot4extlinux-udoo/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=uboot4extlinux-udoo
 pkgver=2016.11
-pkgrel=1
+pkgrel=1.1
 pkgdesc="U-Boot with Extlinux support for UDOO Dual and Quad"
 arch=('armv7h')
 url="http://git.denx.de/u-boot.git/"
diff --git a/libre-testing/uboot4extlinux-udoo/extlinux.conf b/libre-testing/uboot4extlinux-udoo/extlinux.conf
index 777662ee3..918a679d6 100644
--- a/libre-testing/uboot4extlinux-udoo/extlinux.conf
+++ b/libre-testing/uboot4extlinux-udoo/extlinux.conf
@@ -12,11 +12,6 @@ label Parabola GNU/Linux-libre, linux-libre-lts kernel
 	append root=/dev/mmcblk0p1 rw console=ttymxc1,115200
 	fdtdir /boot/dtbs/linux-libre-lts
 
-label Parabola GNU/Linux-libre, linux-libre-knock kernel
-	kernel /boot/vmlinuz-linux-libre-knock
-	append root=/dev/mmcblk0p1 rw console=ttymxc1,115200
-	fdtdir /boot/dtbs/linux-libre-knock
-
 label Parabola GNU/Linux-libre, linux-libre-lts-knock kernel
 	kernel /boot/vmlinuz-linux-libre-lts-knock
 	append root=/dev/mmcblk0p1 rw console=ttymxc1,115200
@@ -27,21 +22,11 @@ label Parabola GNU/Linux-libre, linux-libre-hardened kernel
 	append root=/dev/mmcblk0p1 rw console=ttymxc1,115200
 	fdtdir /boot/dtbs/linux-libre-hardened
 
-label Parabola GNU/Linux-libre, linux-libre-apparmor kernel
-	kernel /boot/vmlinuz-linux-libre-apparmor
-	append root=/dev/mmcblk0p1 rw console=ttymxc1,115200
-	fdtdir /boot/dtbs/linux-libre-apparmor
-
 label Parabola GNU/Linux-libre, linux-libre-lts-apparmor kernel
 	kernel /boot/vmlinuz-linux-libre-lts-apparmor
 	append root=/dev/mmcblk0p1 rw console=ttymxc1,115200
 	fdtdir /boot/dtbs/linux-libre-lts-apparmor
 
-label Parabola GNU/Linux-libre, linux-libre-audit kernel
-	kernel /boot/vmlinuz-linux-libre-audit
-	append root=/dev/mmcblk0p1 rw console=ttymxc1,115200
-	fdtdir /boot/dtbs/linux-libre-audit
-
 label Parabola GNU/Linux-libre, linux-libre-pck kernel
 	kernel /boot/vmlinuz-linux-libre-pck
 	append root=/dev/mmcblk0p1 rw console=ttymxc1,115200
@@ -52,7 +37,7 @@ label Parabola GNU/Linux-libre, linux-libre-rt kernel
 	append root=/dev/mmcblk0p1 rw console=ttymxc1,115200
 	fdtdir /boot/dtbs/linux-libre-rt
 
-label Parabola GNU/Linux-libre, linux-libre-xen kernel
-	kernel /boot/vmlinuz-linux-libre-xen
+label Parabola GNU/Linux-libre, linux-libre-xtreme kernel
+	kernel /boot/vmlinuz-linux-libre-xtreme
 	append root=/dev/mmcblk0p1 rw console=ttymxc1,115200
-	fdtdir /boot/dtbs/linux-libre-xen
+	fdtdir /boot/dtbs/linux-libre-xtreme
diff --git a/libre-testing/uboot4extlinux-wandboard/PKGBUILD b/libre-testing/uboot4extlinux-wandboard/PKGBUILD
index 3f729ed26..e4233d667 100644
--- a/libre-testing/uboot4extlinux-wandboard/PKGBUILD
+++ b/libre-testing/uboot4extlinux-wandboard/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=uboot4extlinux-wandboard
 pkgver=2015.10
-pkgrel=4
+pkgrel=4.1
 pkgdesc="U-Boot with Extlinux support for Wandboard"
 arch=('armv7h')
 url="http://git.denx.de/u-boot.git/"
diff --git a/libre-testing/uboot4extlinux-wandboard/extlinux.conf b/libre-testing/uboot4extlinux-wandboard/extlinux.conf
index 4081479f0..9ab822b7e 100644
--- a/libre-testing/uboot4extlinux-wandboard/extlinux.conf
+++ b/libre-testing/uboot4extlinux-wandboard/extlinux.conf
@@ -12,11 +12,6 @@ label Parabola GNU/Linux-libre, linux-libre-lts kernel
 	append root=/dev/mmcblk0p2 rw console=ttymxc0
 	fdtdir /boot/dtbs/linux-libre-lts
 
-label Parabola GNU/Linux-libre, linux-libre-knock kernel
-	kernel /boot/vmlinuz-linux-libre-knock
-	append root=/dev/mmcblk0p2 rw console=ttymxc0
-	fdtdir /boot/dtbs/linux-libre-knock
-
 label Parabola GNU/Linux-libre, linux-libre-lts-knock kernel
 	kernel /boot/vmlinuz-linux-libre-lts-knock
 	append root=/dev/mmcblk0p2 rw console=ttymxc0
@@ -27,21 +22,11 @@ label Parabola GNU/Linux-libre, linux-libre-hardened kernel
 	append root=/dev/mmcblk0p2 rw console=ttymxc0
 	fdtdir /boot/dtbs/linux-libre-hardened
 
-label Parabola GNU/Linux-libre, linux-libre-apparmor kernel
-	kernel /boot/vmlinuz-linux-libre-apparmor
-	append root=/dev/mmcblk0p2 rw console=ttymxc0
-	fdtdir /boot/dtbs/linux-libre-apparmor
-
 label Parabola GNU/Linux-libre, linux-libre-lts-apparmor kernel
 	kernel /boot/vmlinuz-linux-libre-lts-apparmor
 	append root=/dev/mmcblk0p2 rw console=ttymxc0
 	fdtdir /boot/dtbs/linux-libre-lts-apparmor
 
-label Parabola GNU/Linux-libre, linux-libre-audit kernel
-	kernel /boot/vmlinuz-linux-libre-audit
-	append root=/dev/mmcblk0p2 rw console=ttymxc0
-	fdtdir /boot/dtbs/linux-libre-audit
-
 label Parabola GNU/Linux-libre, linux-libre-pck kernel
 	kernel /boot/vmlinuz-linux-libre-pck
 	append root=/dev/mmcblk0p2 rw console=ttymxc0
@@ -52,7 +37,7 @@ label Parabola GNU/Linux-libre, linux-libre-rt kernel
 	append root=/dev/mmcblk0p2 rw console=ttymxc0
 	fdtdir /boot/dtbs/linux-libre-rt
 
-label Parabola GNU/Linux-libre, linux-libre-xen kernel
-	kernel /boot/vmlinuz-linux-libre-xen
+label Parabola GNU/Linux-libre, linux-libre-xtreme kernel
+	kernel /boot/vmlinuz-linux-libre-xtreme
 	append root=/dev/mmcblk0p2 rw console=ttymxc0
-	fdtdir /boot/dtbs/linux-libre-xen
+	fdtdir /boot/dtbs/linux-libre-xtreme