2 files changed, 59 insertions, 49 deletions
diff --git a/libre-testing/uboot4extlinux-nitrogen6q/PKGBUILD b/libre-testing/uboot4extlinux-nitrogen6q/PKGBUILD
index 337e59cc2..17c038a45 100644
--- a/libre-testing/uboot4extlinux-nitrogen6q/PKGBUILD
+++ b/libre-testing/uboot4extlinux-nitrogen6q/PKGBUILD
@@ -5,7 +5,7 @@ buildarch=4
 
 pkgname=uboot4extlinux-nitrogen6q
 pkgver=2014.07
-pkgrel=2
+pkgrel=3
 arch=('armv7h')
 pkgdesc="U-Boot with Extlinux support for Nitrogen6X/Sabre Lite"
 url="https://github.com/boundarydevices/u-boot-imx6/tree/production"
@@ -23,14 +23,14 @@ source=("https://github.com/boundarydevices/u-boot-imx6/archive/${_commit}.tar.g
         '0005-common-board-use-__weak.patch'
         '0006-common-board_f-cosmetic-use-__weak-for-leds.patch'
         'extlinux.conf')
-md5sums=('b12f5f383c57de06f16625b3465e74d9'
-         'ad04be1baecb91dd55e362a90fdc858c'
-         '721a46867e189d8dedc6b6f86a536a34'
-         'f6b687eca2d2d01f741cbda90dbacb41'
-         '8087672256020417438b12ec4946e1cf'
-         'a536d28bf45add6dbf9f84277f943de8'
-         '2823d0e0c3c826632f6ae934f2b746d9'
-         '49a6f7142cdba53d596971a582cfa643')
+sha256sums=('d06ad5e6b9adb84e7bfa99f8d5335ef06d48b351809e6f65e83a92c0e8a4d3ce'
+            '1592a845ef7a229e5d370586edf344502f3ded5c24c853c790b600e8ef0128c7'
+            '257269c4573712d3454b7c6d53d04b45af1166cb65dd9df73bd397a087f85e1e'
+            '2fb98981885fbffba32fadb7b4a321e5540278c2a97f39b2700ad14c2ddb4d2a'
+            '83f56e80b09d010a7d0f9cc18d4df43c7f100ee3a815421f2ccbf2c337ae5431'
+            'bb9f0bde66266998db0eae3204346364568bab963fe7be1086d633339652b70c'
+            'dd2d912d4e14dc7ea83fbe6148feecc65f104ae367292278f668cdfc11f947a5'
+            'e96d167d99967ebefde8d02b27b4564e46409cc0c8738d5de72f431a2e438cf8')
 
 prepare() {
   cd u-boot-imx6-${_commit}
diff --git a/libre-testing/uboot4extlinux-nitrogen6q/extlinux.conf b/libre-testing/uboot4extlinux-nitrogen6q/extlinux.conf
index 32b370479..029c94bf9 100644
--- a/libre-testing/uboot4extlinux-nitrogen6q/extlinux.conf
+++ b/libre-testing/uboot4extlinux-nitrogen6q/extlinux.conf
@@ -4,45 +4,55 @@ timeout 50
 
 label Parabola GNU/Linux-libre, linux-libre kernel
 	kernel /boot/vmlinuz-linux-libre
-	append root=/dev/mmcblk0p2 rw console=ttymxc1
+        append root=/dev/mmcblk0p2 rw console=ttymxc1
 	fdtdir /boot/dtbs/linux-libre
 
-#label Parabola GNU/Linux-libre, linux-libre-lts kernel
-#	kernel /boot/vmlinuz-linux-libre-lts
-#	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
-#	fdtdir /boot/dtbs/linux-libre-lts-knock
-
-#label Parabola GNU/Linux-libre, linux-libre-grsec kernel
-#	kernel /boot/vmlinuz-linux-libre-grsec
-#	append root=/dev/mmcblk0p2 rw console=ttymxc1
-#	fdtdir /boot/dtbs/linux-libre-grsec
-
-#label Parabola GNU/Linux-libre, linux-libre-grsec-knock kernel
-#	kernel /boot/vmlinuz-linux-libre-grsec-knock
-#	append root=/dev/mmcblk0p2 rw console=ttymxc1
-#	fdtdir /boot/dtbs/linux-libre-grsec-knock
-
-#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
-#	fdtdir /boot/dtbs/linux-libre-pck
-
-#label Parabola GNU/Linux-libre, linux-libre-rt kernel
-#	kernel /boot/vmlinuz-linux-libre-rt
-#	append root=/dev/mmcblk0p2 rw console=ttymxc1
-#	fdtdir /boot/dtbs/linux-libre-rt
+label Parabola GNU/Linux-libre, linux-libre-lts kernel
+	kernel /boot/vmlinuz-linux-libre-lts
+	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
+	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/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
+	fdtdir /boot/dtbs/linux-libre-pck
+
+label Parabola GNU/Linux-libre, linux-libre-rt kernel
+	kernel /boot/vmlinuz-linux-libre-rt
+	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
+	append root=/dev/mmcblk0p2 rw console=ttymxc1
+	fdtdir /boot/dtbs/linux-libre-xen