From fc0303107d60c631a7363952b5c9349bf2e25524 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 26 Jan 2014 11:11:45 +0100
Subject: [PATCH] cubieboard2-uboot: miscellaneous tweaks.

- Also set 'console=tty0' to kernel cmdline arguments.
- Change cubieboard2.fex to set default storage medium to the SD card.
- Install boot.cmd to regenerate it after booting.
---
 srcpkgs/cubieboard2-uboot/files/cubieboard2.bootcmd | 2 +-
 srcpkgs/cubieboard2-uboot/files/cubieboard2.fex     | 2 +-
 srcpkgs/cubieboard2-uboot/template                  | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cubieboard2-uboot/files/cubieboard2.bootcmd b/srcpkgs/cubieboard2-uboot/files/cubieboard2.bootcmd
index 066d40e5b60..b7729f6e476 100644
--- a/srcpkgs/cubieboard2-uboot/files/cubieboard2.bootcmd
+++ b/srcpkgs/cubieboard2-uboot/files/cubieboard2.bootcmd
@@ -1,4 +1,4 @@
-setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p2 rw rootwait panic=10 ${extra}
+setenv bootargs console=ttyS0,115200 console=tty0 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
diff --git a/srcpkgs/cubieboard2-uboot/files/cubieboard2.fex b/srcpkgs/cubieboard2-uboot/files/cubieboard2.fex
index abed89dec83..9d80219d5d4 100644
--- a/srcpkgs/cubieboard2-uboot/files/cubieboard2.fex
+++ b/srcpkgs/cubieboard2-uboot/files/cubieboard2.fex
@@ -12,7 +12,7 @@ dcdc3_vol = 1250
 ldo2_vol = 3000
 ldo3_vol = 2800
 ldo4_vol = 2800
-storage_type = 0
+storage_type = 1
 
 [clock]
 pll3 = 297
diff --git a/srcpkgs/cubieboard2-uboot/template b/srcpkgs/cubieboard2-uboot/template
index b08dccf7755..8ad47bb510d 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=3
+revision=4
 wrksrc="u-boot-sunxi-${version/v/}-sunxi"
 hostmakedepends="sunxi-tools uboot-mkimage"
 short_desc="Cubieboard2 U-Boot files for SD booting"
@@ -30,5 +30,6 @@ do_install() {
 	vinstall u-boot-sunxi-with-spl.bin 644 boot
 	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
 }