From c1e93daab2e1e0c63d2003cb419ea81fd76b26a6 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 26 Jan 2014 14:51:29 +0100
Subject: [PATCH] cubieboard2-uboot: remove useless uEnv.txt; use boot.cmd
 instead and remove console=tty0.

---
 srcpkgs/cubieboard2-uboot/files/cubieboard2.bootcmd | 4 ++--
 srcpkgs/cubieboard2-uboot/files/cubieboard2.env     | 1 -
 srcpkgs/cubieboard2-uboot/template                  | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)
 delete mode 100644 srcpkgs/cubieboard2-uboot/files/cubieboard2.env

diff --git a/srcpkgs/cubieboard2-uboot/files/cubieboard2.bootcmd b/srcpkgs/cubieboard2-uboot/files/cubieboard2.bootcmd
index 3ba7c6a3be..ec2135193e 100644
--- a/srcpkgs/cubieboard2-uboot/files/cubieboard2.bootcmd
+++ b/srcpkgs/cubieboard2-uboot/files/cubieboard2.bootcmd
@@ -1,5 +1,5 @@
-setenv bootargs console=ttyS0,115200 console=tty0 root=/dev/mmcblk0p2 rw rootwait panic=10 ${extra}
+setenv machid 0x10bb
+setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p2 rw rootwait panic=10 ${extra}
 fatload mmc 0 0x43000000 script.bin || ext2load mmc 0 0x43000000 boot/script.bin
 fatload mmc 0 0x48000000 uImage || ext2load mmc 0 0x48000000 uImage boot/uImage
 bootm 0x48000000
-setenv machid 0x10bb
diff --git a/srcpkgs/cubieboard2-uboot/files/cubieboard2.env b/srcpkgs/cubieboard2-uboot/files/cubieboard2.env
deleted file mode 100644
index 5cc9dd2d71..0000000000
--- a/srcpkgs/cubieboard2-uboot/files/cubieboard2.env
+++ /dev/null
@@ -1 +0,0 @@
-machid=0x10bb
diff --git a/srcpkgs/cubieboard2-uboot/template b/srcpkgs/cubieboard2-uboot/template
index 082172602a..bf18ed3034 100644
--- a/srcpkgs/cubieboard2-uboot/template
+++ b/srcpkgs/cubieboard2-uboot/template
@@ -1,7 +1,7 @@
 # Template file for 'cubieboard2-uboot'
 pkgname=cubieboard2-uboot
 version=v2013.10
-revision=5
+revision=6
 wrksrc="u-boot-sunxi-${version/v/}-sunxi"
 hostmakedepends="sunxi-tools uboot-mkimage"
 short_desc="Cubieboard2 U-Boot files for SD booting"
@@ -31,5 +31,4 @@ do_install() {
 	vinstall script.bin 644 boot
 	vinstall boot.scr 644 boot
 	vinstall ${FILESDIR}/cubieboard2.bootcmd 644 boot boot.cmd
-	vinstall ${FILESDIR}/cubieboard2.env 644 boot uEnv.txt
 }