20 files changed, 26 insertions, 26 deletions
diff --git a/libre-testing/uboot-udoo/0001-parabola-arm-modifications.patch b/libre-testing/uboot4extlinux-udoo/0001-parabola-arm-modifications.patch
index 7328d1ad7..7328d1ad7 100644
--- a/libre-testing/uboot-udoo/0001-parabola-arm-modifications.patch
+++ b/libre-testing/uboot4extlinux-udoo/0001-parabola-arm-modifications.patch
diff --git a/libre-testing/uboot-udoo/0002-kernel-add-support-for-gcc-5.patch b/libre-testing/uboot4extlinux-udoo/0002-kernel-add-support-for-gcc-5.patch
index 30718c561..30718c561 100644
--- a/libre-testing/uboot-udoo/0002-kernel-add-support-for-gcc-5.patch
+++ b/libre-testing/uboot4extlinux-udoo/0002-kernel-add-support-for-gcc-5.patch
diff --git a/libre-testing/uboot-udoo/PKGBUILD b/libre-testing/uboot4extlinux-udoo/PKGBUILD
index 45871fe07..41f6960a4 100644
--- a/libre-testing/uboot-udoo/PKGBUILD
+++ b/libre-testing/uboot4extlinux-udoo/PKGBUILD
@@ -3,10 +3,10 @@
 
 buildarch=4
 
-pkgbase=uboot-udoo
-pkgname=('uboot-udoo_dl' 'uboot-udoo_quad')
+pkgbase=uboot4extlinux-udoo
+pkgname=('uboot4extlinux-udoo_dl' 'uboot4extlinux-udoo_quad')
 pkgver=2015.01
-pkgrel=4
+pkgrel=1
 arch=('armv7h')
 url="http://git.denx.de/u-boot.git/"
 license=('GPL')
@@ -42,12 +42,12 @@ build() {
   done
 }
 
-package_uboot-udoo_dl() {
-  pkgdesc="U-Boot for UDOO Dual"
+package_uboot4extlinux-udoo_dl() {
+  pkgdesc="U-Boot with Extlinux support for UDOO Dual"
   replaces=('uboot-udoo-dual-linux-libre' 'uboot-udoo-dual-linux-libre-grsec'
-            'uboot-udoo-dual')
+            'uboot-udoo-dual' 'uboot-udoo_dl')
   conflicts=('uboot-udoo-dual-linux-libre' 'uboot-udoo-dual-linux-libre-grsec'
-             'uboot-udoo-dual' 'uboot-udoo-quad' 'uboot-udoo_quad' 'uboot4grub-udoo_dl' 'uboot4grub-udoo_quad')
+             'uboot-udoo-dual' 'uboot-udoo_dl' 'uboot4extlinux-udoo_quad' 'uboot4grub-udoo_dl' 'uboot4grub-udoo_quad')
   install=${pkgbase}.install
 
   mkdir -p "${pkgdir}"/boot/extlinux
@@ -55,12 +55,12 @@ package_uboot-udoo_dl() {
   cp "${srcdir}"/extlinux.conf "${pkgdir}"/boot/extlinux
 }
 
-package_uboot-udoo_quad() {
-  pkgdesc="U-Boot for UDOO Quad"
+package_uboot4extlinux-udoo_quad() {
+  pkgdesc="U-Boot with Extlinux support for UDOO Quad"
   replaces=('uboot-udoo-quad-linux-libre' 'uboot-udoo-quad-linux-libre-grsec'
-            'uboot-udoo-quad')
+            'uboot-udoo-quad' 'uboot-udoo_quad')
   conflicts=('uboot-udoo-quad-linux-libre' 'uboot-udoo-quad-linux-libre-grsec'
-             'uboot-udoo-quad' 'uboot-udoo-dual' 'uboot-udoo_dl' 'uboot4grub-udoo_quad' 'uboot4grub-udoo_dl')
+             'uboot-udoo-quad' 'uboot-udoo_quad' 'uboot4extlinux-udoo_dl'  'uboot4grub-udoo_dl' 'uboot4grub-udoo_quad')
   install=${pkgbase}.install
 
   mkdir -p "${pkgdir}"/boot/extlinux
diff --git a/libre-testing/uboot-udoo/extlinux.conf b/libre-testing/uboot4extlinux-udoo/extlinux.conf
index 45d603094..45d603094 100644
--- a/libre-testing/uboot-udoo/extlinux.conf
+++ b/libre-testing/uboot4extlinux-udoo/extlinux.conf
diff --git a/libre-testing/uboot-udoo/uboot-udoo.install b/libre-testing/uboot4extlinux-udoo/uboot4extlinux-udoo.install
index 8a45c3b16..8a45c3b16 100644
--- a/libre-testing/uboot-udoo/uboot-udoo.install
+++ b/libre-testing/uboot4extlinux-udoo/uboot4extlinux-udoo.install
diff --git a/libre/uboot-am335x_bone/0001-parabola-arm-modifications.patch b/libre/uboot4extlinux-am335x_bone/0001-parabola-arm-modifications.patch
index 0f1c145da..0f1c145da 100644
--- a/libre/uboot-am335x_bone/0001-parabola-arm-modifications.patch
+++ b/libre/uboot4extlinux-am335x_bone/0001-parabola-arm-modifications.patch
diff --git a/libre/uboot-am335x_bone/PKGBUILD b/libre/uboot4extlinux-am335x_bone/PKGBUILD
index 5b7051f91..f1436af02 100644
--- a/libre/uboot-am335x_bone/PKGBUILD
+++ b/libre/uboot4extlinux-am335x_bone/PKGBUILD
@@ -5,18 +5,18 @@
 
 buildarch=4
 
-pkgname=uboot-am335x_bone
+pkgname=uboot4extlinux-am335x_bone
 pkgver=2015.04
-pkgrel=7
-pkgdesc="U-Boot for BeagleBone and BeagleBone Black"
+pkgrel=1
+pkgdesc="U-Boot with Extlinux support for BeagleBone and BeagleBone Black"
 arch=('armv7h')
 url="http://git.denx.de/u-boot.git/"
 replaces=('uboot-beaglebone-linux-libre' 'uboot-beaglebone-linux-libre-lts'
           'uboot-beaglebone-linux-libre-grsec' 'uboot-beaglebone-linux-libre-pck'
-          'uboot-beaglebone')
+          'uboot-beaglebone' 'uboot-am335x_bone')
 conflicts=('uboot-beaglebone-linux-libre' 'uboot-beaglebone-linux-libre-lts'
            'uboot-beaglebone-linux-libre-grsec' 'uboot-beaglebone-linux-libre-pck'
-           'uboot-beaglebone' 'uboot4grub-am335x_bone')
+           'uboot-beaglebone' 'uboot-am335x_bone' 'uboot4grub-am335x_bone')
 makedepends=('bc')
 license=('GPL')
 backup=(boot/extlinux/extlinux.conf)
diff --git a/libre/uboot-am335x_bone/extlinux.conf b/libre/uboot4extlinux-am335x_bone/extlinux.conf
index 52de94d49..52de94d49 100644
--- a/libre/uboot-am335x_bone/extlinux.conf
+++ b/libre/uboot4extlinux-am335x_bone/extlinux.conf
diff --git a/libre/uboot-am335x_bone/uEnv.txt b/libre/uboot4extlinux-am335x_bone/uEnv.txt
index f432efc6b..f432efc6b 100644
--- a/libre/uboot-am335x_bone/uEnv.txt
+++ b/libre/uboot4extlinux-am335x_bone/uEnv.txt
diff --git a/libre/uboot-am335x_bone/uboot-am335x_bone.install b/libre/uboot4extlinux-am335x_bone/uboot4extlinux-am335x_bone.install
index 4467c694e..4467c694e 100644
--- a/libre/uboot-am335x_bone/uboot-am335x_bone.install
+++ b/libre/uboot4extlinux-am335x_bone/uboot4extlinux-am335x_bone.install
diff --git a/libre/uboot-omap3_beagle/0001-parabola-arm-modifications.patch b/libre/uboot4extlinux-omap3_beagle/0001-parabola-arm-modifications.patch
index c99cd89b8..c99cd89b8 100644
--- a/libre/uboot-omap3_beagle/0001-parabola-arm-modifications.patch
+++ b/libre/uboot4extlinux-omap3_beagle/0001-parabola-arm-modifications.patch
diff --git a/libre/uboot-omap3_beagle/PKGBUILD b/libre/uboot4extlinux-omap3_beagle/PKGBUILD
index 2b41eb15a..a3c16f7cc 100644
--- a/libre/uboot-omap3_beagle/PKGBUILD
+++ b/libre/uboot4extlinux-omap3_beagle/PKGBUILD
@@ -3,19 +3,19 @@
 
 buildarch=4
 
-pkgname=uboot-omap3_beagle
+pkgname=uboot4extlinux-omap3_beagle
 pkgver=2016.01
-pkgrel=2
-pkgdesc="U-Boot for BeagleBoard and BeagleBoard-xM"
+pkgrel=1
+pkgdesc="U-Boot with Extlinux support for BeagleBoard and BeagleBoard-xM"
 arch=('armv7h')
 url="http://git.denx.de/u-boot.git/"
 license=('GPL')
 replaces=('uboot-beagleboard-linux-libre' 'uboot-beagleboard-linux-libre-lts'
           'uboot-beagleboard-linux-libre-grsec' 'uboot-beagleboard-linux-libre-pck'
-          'uboot-beagleboard')
+          'uboot-beagleboard' 'uboot-omap3_beagle')
 conflicts=('uboot-beagleboard-linux-libre' 'uboot-beagleboard-linux-libre-lts'
            'uboot-beagleboard-linux-libre-grsec' 'uboot-beagleboard-linux-libre-pck'
-           'uboot-beagleboard' 'uboot4grub-omap3_beagle')
+           'uboot-beagleboard' 'uboot-omap3_beagle' 'uboot4grub-omap3_beagle')
 makedepends=('bc')
 backup=(boot/extlinux/extlinux.conf)
 install=${pkgname}.install
diff --git a/libre/uboot-omap3_beagle/extlinux.conf b/libre/uboot4extlinux-omap3_beagle/extlinux.conf
index 708bfcddb..708bfcddb 100644
--- a/libre/uboot-omap3_beagle/extlinux.conf
+++ b/libre/uboot4extlinux-omap3_beagle/extlinux.conf
diff --git a/libre/uboot-omap3_beagle/uEnv.txt b/libre/uboot4extlinux-omap3_beagle/uEnv.txt
index e69de29bb..e69de29bb 100644
--- a/libre/uboot-omap3_beagle/uEnv.txt
+++ b/libre/uboot4extlinux-omap3_beagle/uEnv.txt
diff --git a/libre/uboot-omap3_beagle/uboot-omap3_beagle.install b/libre/uboot4extlinux-omap3_beagle/uboot4extlinux-omap3_beagle.install
index 8aff26699..8aff26699 100644
--- a/libre/uboot-omap3_beagle/uboot-omap3_beagle.install
+++ b/libre/uboot4extlinux-omap3_beagle/uboot4extlinux-omap3_beagle.install
diff --git a/libre/uboot-omap4_panda/0001-parabola-arm-modifications.patch b/libre/uboot4extlinux-omap4_panda/0001-parabola-arm-modifications.patch
index 09aee7ce0..09aee7ce0 100644
--- a/libre/uboot-omap4_panda/0001-parabola-arm-modifications.patch
+++ b/libre/uboot4extlinux-omap4_panda/0001-parabola-arm-modifications.patch
diff --git a/libre/uboot-omap4_panda/PKGBUILD b/libre/uboot4extlinux-omap4_panda/PKGBUILD
index 6aaf94b60..cf9132074 100644
--- a/libre/uboot-omap4_panda/PKGBUILD
+++ b/libre/uboot4extlinux-omap4_panda/PKGBUILD
@@ -3,14 +3,14 @@
 
 buildarch=4
 
-pkgname=uboot-omap4_panda
+pkgname=uboot4extlinux-omap4_panda
 pkgver=2016.01
-pkgrel=2
-pkgdesc="U-Boot for PandaBoard and PandaBoard ES"
+pkgrel=1
+pkgdesc="U-Boot with Extlinux support for PandaBoard and PandaBoard ES"
 arch=('armv7h')
 url="http://git.denx.de/u-boot.git/"
-replaces=('uboot-pandaboard-linux-libre' 'uboot-pandaboard')
-conflicts=('uboot-pandaboard-linux-libre' 'uboot-pandaboard' 'uboot4grub-omap4_panda')
+replaces=('uboot-pandaboard-linux-libre' 'uboot-pandaboard' 'uboot-omap4_panda')
+conflicts=('uboot-pandaboard-linux-libre' 'uboot-pandaboard' 'uboot-omap4_panda' 'uboot4grub-omap4_panda')
 makedepends=('bc')
 license=('GPL')
 install=${pkgname}.install
diff --git a/libre/uboot-omap4_panda/extlinux.conf b/libre/uboot4extlinux-omap4_panda/extlinux.conf
index 725121811..725121811 100644
--- a/libre/uboot-omap4_panda/extlinux.conf
+++ b/libre/uboot4extlinux-omap4_panda/extlinux.conf
diff --git a/libre/uboot-omap4_panda/uEnv.txt b/libre/uboot4extlinux-omap4_panda/uEnv.txt
index 55298e1a9..55298e1a9 100644
--- a/libre/uboot-omap4_panda/uEnv.txt
+++ b/libre/uboot4extlinux-omap4_panda/uEnv.txt
diff --git a/libre/uboot-omap4_panda/uboot-omap4_panda.install b/libre/uboot4extlinux-omap4_panda/uboot4extlinux-omap4_panda.install
index 771f1f0b3..771f1f0b3 100644
--- a/libre/uboot-omap4_panda/uboot-omap4_panda.install
+++ b/libre/uboot4extlinux-omap4_panda/uboot4extlinux-omap4_panda.install