From d2e42d117345d627ac3f0b34afcae7b7294ac3d5 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Thu, 21 May 2015 09:18:57 +0200
Subject: [PATCH] cubieboard2-uboot: fix copy/pasta in boot.txt.

---
 srcpkgs/cubieboard2-uboot/files/boot.txt | 6 ++----
 srcpkgs/cubieboard2-uboot/template       | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/cubieboard2-uboot/files/boot.txt b/srcpkgs/cubieboard2-uboot/files/boot.txt
index 824d5fc8c3..bed04911ec 100644
--- a/srcpkgs/cubieboard2-uboot/files/boot.txt
+++ b/srcpkgs/cubieboard2-uboot/files/boot.txt
@@ -2,10 +2,8 @@ part uuid ${devtype} ${devnum}:${bootpart} uuid
 setenv bootargs console=${console} root=PARTUUID=${uuid} rw rootwait
 
 if load ${devtype} ${devnum}:${bootpart} ${kernel_addr_r} /boot/zImage; then
-  if load ${devtype} ${devnum}:${bootpart} ${fdt_addr_r}
-/boot/dtbs/${fdtfile}; then
-    if load ${devtype} ${devnum}:${bootpart} ${ramdisk_addr_r}
-/boot/initramfs-linux.img; then
+  if load ${devtype} ${devnum}:${bootpart} ${fdt_addr_r} /boot/dtbs/${fdtfile}; then
+    if load ${devtype} ${devnum}:${bootpart} ${ramdisk_addr_r} /boot/initramfs-linux.img; then
       bootz ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr_r};
     else
       bootz ${kernel_addr_r} - ${fdt_addr_r};
diff --git a/srcpkgs/cubieboard2-uboot/template b/srcpkgs/cubieboard2-uboot/template
index 0cf32ac229..2b9ea00b32 100644
--- a/srcpkgs/cubieboard2-uboot/template
+++ b/srcpkgs/cubieboard2-uboot/template
@@ -1,7 +1,7 @@
 # Template file for 'cubieboard2-uboot'
 pkgname=cubieboard2-uboot
 version=2015.01
-revision=1
+revision=2
 wrksrc="u-boot-${version}"
 hostmakedepends="bc git sunxi-tools uboot-mkimage"
 short_desc="U-Boot for cubieboard2"