uboot-nitrogen6q: add new package to [libre]

8 files changed, 12 insertions, 13 deletions

diff --git a/libre/uboot-boundary-linux-libre/0001-parabola-arm-modifications.patch b/libre/uboot-nitrogen6q/0001-parabola-arm-modifications.patch
index fe4b43820..fe4b43820 100644
--- a/libre/uboot-boundary-linux-libre/0001-parabola-arm-modifications.patch
+++ b/libre/uboot-nitrogen6q/0001-parabola-arm-modifications.patch
diff --git a/libre/uboot-boundary-linux-libre/0002-kernel-add-support-for-gcc-5.patch b/libre/uboot-nitrogen6q/0002-kernel-add-support-for-gcc-5.patch
index 30718c561..30718c561 100644
--- a/libre/uboot-boundary-linux-libre/0002-kernel-add-support-for-gcc-5.patch
+++ b/libre/uboot-nitrogen6q/0002-kernel-add-support-for-gcc-5.patch
diff --git a/libre/uboot-boundary-linux-libre/0003-ARM-asm-io.h-use-static-inline.patch b/libre/uboot-nitrogen6q/0003-ARM-asm-io.h-use-static-inline.patch
index 14ff6a5d8..14ff6a5d8 100644
--- a/libre/uboot-boundary-linux-libre/0003-ARM-asm-io.h-use-static-inline.patch
+++ b/libre/uboot-nitrogen6q/0003-ARM-asm-io.h-use-static-inline.patch
diff --git a/libre/uboot-boundary-linux-libre/0004-common-main.c-make-show_boot_progress-__weak.patch b/libre/uboot-nitrogen6q/0004-common-main.c-make-show_boot_progress-__weak.patch
index 41b9c5cb2..41b9c5cb2 100644
--- a/libre/uboot-boundary-linux-libre/0004-common-main.c-make-show_boot_progress-__weak.patch
+++ b/libre/uboot-nitrogen6q/0004-common-main.c-make-show_boot_progress-__weak.patch
diff --git a/libre/uboot-boundary-linux-libre/0005-common-board-use-__weak.patch b/libre/uboot-nitrogen6q/0005-common-board-use-__weak.patch
index 5cd77dbba..5cd77dbba 100644
--- a/libre/uboot-boundary-linux-libre/0005-common-board-use-__weak.patch
+++ b/libre/uboot-nitrogen6q/0005-common-board-use-__weak.patch
diff --git a/libre/uboot-boundary-linux-libre/0006-common-board_f-cosmetic-use-__weak-for-leds.patch b/libre/uboot-nitrogen6q/0006-common-board_f-cosmetic-use-__weak-for-leds.patch
index bff38b486..bff38b486 100644
--- a/libre/uboot-boundary-linux-libre/0006-common-board_f-cosmetic-use-__weak-for-leds.patch
+++ b/libre/uboot-nitrogen6q/0006-common-board_f-cosmetic-use-__weak-for-leds.patch
diff --git a/libre/uboot-boundary-linux-libre/6x_bootscript b/libre/uboot-nitrogen6q/6x_bootscript
index 17d68d86c..45e5fe9b6 100644
--- a/libre/uboot-boundary-linux-libre/6x_bootscript
+++ b/libre/uboot-nitrogen6q/6x_bootscript
@@ -1,6 +1,6 @@
 echo "checking for U-Boot upgrades..";
 setenv offset 0x400
-if load ${dtype} ${disk}:1 12000000 /boot/uboot-boundary-linux-libre/u-boot.imx; then
+if load ${dtype} ${disk}:1 12000000 /boot/u-boot.imx; then
   echo "  found u-boot.imx $filesize bytes)";
   if sf probe || sf probe || sf probe 1 27000000 || sf probe 1 27000000; then
     echo "probed SPI ROM";
@@ -102,4 +102,4 @@ setenv bootargs $bootargs console=ttymxc1,115200 vmalloc=400M root=PARTUUID=${uu
 setenv fdtfile imx6q-nitrogen6x.dtb
 load ${dtype} ${disk}:1 10800000 /boot/vmlinuz-linux-libre && load ${dtype} ${disk}:1 11000000 /boot/dtbs/linux-libre/${fdtfile} && bootz 10800000 - 11000000
 
-load ${dtype} ${disk}:1 10800000 /boot/uImage-linux-libre && bootm 10800000
+load ${dtype} ${disk}:1 10800000 /boot/uImage && bootm 10800000
diff --git a/libre/uboot-boundary-linux-libre/PKGBUILD b/libre/uboot-nitrogen6q/PKGBUILD
index 48d302b3e..775cb713c 100644
--- a/libre/uboot-boundary-linux-libre/PKGBUILD
+++ b/libre/uboot-nitrogen6q/PKGBUILD
@@ -1,20 +1,19 @@
 # U-Boot: Boundary Devices Nitrogen6X/Sabre Lite
-# Maintainer (Arch): Kevin Mihelich <kevin@archlinuxarm.org>
-# Contributor: André Silva <emulatorman@parabola.nu>
+# Maintainer: André Silva <emulatorman@parabola.nu>
 
 buildarch=4
 
-_pkgname=linux-libre
-pkgname=uboot-boundary-${_pkgname}
+pkgname=uboot-nitrogen6q
 pkgver=2014.07
-pkgrel=1.1
+pkgrel=1
 arch=('armv7h')
-pkgdesc="U-Boot for Nitrogen6X/Sabre Lite (built for the linux-libre kernel package)"
-url="http://git.denx.de/u-boot.git/"
+pkgdesc="U-Boot for Nitrogen6X/Sabre Lite"
+url="https://github.com/boundarydevices/u-boot-imx6/tree/production"
 license=('GPL')
 makedepends=('bc')
 depends=('linux-libre')
-replaces=('uboot-boundary')
+replaces=('uboot-boundary' 'uboot-boundary-linux-libre')
+conflicts=('uboot4extlinux-nitrogen6q' 'uboot4grub-nitrogen6q')
 backup=('6x_bootscript')
 _commit=bb9dde563768731423fd6c560e95e1793a90710a
 source=("https://github.com/boundarydevices/u-boot-imx6/archive/${_commit}.tar.gz"
@@ -59,7 +58,7 @@ build() {
 package() {
   cd u-boot-imx6-${_commit}
 
-  mkdir -p "${pkgdir}/boot/${pkgname}"
-  cp u-boot.imx "${pkgdir}/boot/${pkgname}"
-  tools/mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "boot script" -d ../6x_bootscript "${pkgdir}/boot/${pkgname}"/6x_bootscript
+  mkdir -p "${pkgdir}"/boot
+  cp u-boot.imx "${pkgdir}"/boot
+  tools/mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "boot script" -d ../6x_bootscript ${pkgdir}/6x_bootscript
 }