6 files changed, 59 insertions, 61 deletions
diff --git a/libre/uboot-usbarmory-linux-libre/PKGBUILD b/libre/uboot-usbarmory-linux-libre/PKGBUILD
deleted file mode 100644
index 72ab2db42..000000000
--- a/libre/uboot-usbarmory-linux-libre/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# U-Boot: Inverse Path USB armory
-# Maintainer (Arch): Kevin Mihelich <kevin@archlinuxarm.org>
-# Maintainer (Arch): Jason Plum <jplum@archlinuxarm.org>
-# Contributor: André Silva <emulatorman@parabola.nu>
-
-buildarch=4
-
-_pkgname=linux-libre
-pkgname=uboot-usbarmory-${_pkgname}
-pkgver=2015.04
-pkgrel=1
-pkgdesc="U-Boot for USB Armory (built for the linux-libre kernel package)"
-arch=('armv7h')
-url="http://git.denx.de/u-boot.git/"
-license=('GPL')
-makedepends=('bc')
-depends=('linux-libre')
-replaces=('uboot-usbarmory')
-install=${pkgname}.install
-backup=(boot/${pkgname}/boot.txt boot/${pkgname}/boot.scr)
-source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
-        '0001-parabola-arm-modifications.patch'
-        'boot.txt'
-        'mkscr')
-md5sums=('570bdc2c47270c2a98ca60ff6c5c74cd'
-         '2ca10f4a7eeb0073035263fbbf3dd33a'
-         'eb83db44c372a6ff3349e026083f15f9'
-         '021623a04afd29ac3f368977140cfbfd')
-
-prepare() {
-  cd u-boot-${pkgver}
-
-  patch -Np1 -i ../0001-parabola-arm-modifications.patch
-}
-
-build() {
-  cd u-boot-${pkgver}
-
-  unset CFLAGS CXXFLAGS LDFLAGS
-
-  make distclean
-  make usbarmory_config
-  make
-}
-
-package() {
-  cd u-boot-${pkgver}
-
-  install -d "${pkgdir}/boot/${pkgname}"
-  install -Dm644 u-boot.imx "${pkgdir}/boot/${pkgname}"
-
-  install -Dm644 ../boot.txt "${pkgdir}/boot/${pkgname}"/boot.txt
-  tools/mkimage -A arm -O linux -T script -C none -n "U-Boot boot script" -d ../boot.txt "${pkgdir}/boot/${pkgname}"/boot.scr
-  install -Dm755 ../mkscr "${pkgdir}/boot/${pkgname}"/mkscr
-}
diff --git a/libre/uboot-usbarmory-linux-libre/0001-parabola-arm-modifications.patch b/libre/uboot-usbarmory/0001-parabola-arm-modifications.patch
index a252648ee..9b14cabec 100644
--- a/libre/uboot-usbarmory-linux-libre/0001-parabola-arm-modifications.patch
+++ b/libre/uboot-usbarmory/0001-parabola-arm-modifications.patch
@@ -1,8 +1,8 @@
 diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h
-index 8237239..2477edf 100644
+index d8165cc..377322b 100644
 --- a/include/config_distro_defaults.h
 +++ b/include/config_distro_defaults.h
-@@ -59,4 +59,7 @@
+@@ -68,4 +68,7 @@
  #define CONFIG_SUPPORT_RAW_INITRD
  #define CONFIG_SYS_HUSH_PARSER
  
@@ -11,10 +11,10 @@ index 8237239..2477edf 100644
 +
  #endif	/* _CONFIG_CMD_DISTRO_DEFAULTS_H */
 diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h
-index f29ab2d..9a947d2 100644
+index 714e3e2..6be57dc 100644
 --- a/include/configs/usbarmory.h
 +++ b/include/configs/usbarmory.h
-@@ -24,6 +24,8 @@
+@@ -23,6 +23,8 @@
  
  #include <config_distro_defaults.h>
  
@@ -22,7 +22,7 @@ index f29ab2d..9a947d2 100644
 +
  /* U-Boot commands */
  #define CONFIG_CMD_MEMTEST
- #undef CONFIG_CMD_IMLS
+ 
 -- 
-2.4.4
+2.6.1
 
diff --git a/libre/uboot-usbarmory/PKGBUILD b/libre/uboot-usbarmory/PKGBUILD
new file mode 100644
index 000000000..86a8db13e
--- /dev/null
+++ b/libre/uboot-usbarmory/PKGBUILD
@@ -0,0 +1,53 @@
+# U-Boot: Inverse Path USB Armory
+# Maintainer: André Silva <emulatorman@parabola.nu>
+
+buildarch=4
+
+pkgname=uboot-usbarmory
+pkgver=2016.01
+pkgrel=1.parabola1
+pkgdesc="U-Boot for USB Armory"
+arch=('armv7h')
+url="http://git.denx.de/u-boot.git/"
+license=('GPL')
+makedepends=('bc')
+depends=('linux-libre')
+replaces=('uboot-usbarmory-linux-libre')
+conflicts=('uboot4extlinux-usbarmory' 'uboot4grub-usbarmory')
+install=${pkgname}.install
+backup=(boot/boot.txt boot/boot.scr)
+source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
+        '0001-parabola-arm-modifications.patch'
+        'boot.txt'
+        'mkscr')
+md5sums=('7d4f65fd43d4d706f5c5650e020d899d'
+         '15bacb3ff7c9bfb350e7e43f081bd9b3'
+         'eb83db44c372a6ff3349e026083f15f9'
+         '021623a04afd29ac3f368977140cfbfd')
+
+prepare() {
+  cd u-boot-${pkgver}
+
+  patch -Np1 -i ../0001-parabola-arm-modifications.patch
+}
+
+build() {
+  cd u-boot-${pkgver}
+
+  unset CFLAGS CXXFLAGS LDFLAGS
+
+  make distclean
+  make usbarmory_config
+  make
+}
+
+package() {
+  cd u-boot-${pkgver}
+
+  install -d "${pkgdir}"/boot
+  install -Dm644 u-boot.imx "${pkgdir}"/boot
+
+  install -Dm644 ../boot.txt "${pkgdir}"/boot/boot.txt
+  tools/mkimage -A arm -O linux -T script -C none -n "U-Boot boot script" -d ../boot.txt "${pkgdir}"/boot/boot.scr
+  install -Dm755 ../mkscr "${pkgdir}"/boot/mkscr
+}
diff --git a/libre/uboot-usbarmory-linux-libre/boot.txt b/libre/uboot-usbarmory/boot.txt
index 2454291f8..2454291f8 100644
--- a/libre/uboot-usbarmory-linux-libre/boot.txt
+++ b/libre/uboot-usbarmory/boot.txt
diff --git a/libre/uboot-usbarmory-linux-libre/mkscr b/libre/uboot-usbarmory/mkscr
index 272b6a7a5..272b6a7a5 100755
--- a/libre/uboot-usbarmory-linux-libre/mkscr
+++ b/libre/uboot-usbarmory/mkscr
diff --git a/libre/uboot-usbarmory-linux-libre/uboot-usbarmory-linux-libre.install b/libre/uboot-usbarmory/uboot-usbarmory.install
index 6c0ddcf9e..6c0ddcf9e 100644
--- a/libre/uboot-usbarmory-linux-libre/uboot-usbarmory-linux-libre.install
+++ b/libre/uboot-usbarmory/uboot-usbarmory.install