From 00fcaf3267a79b81bd0c128d2692d8f2d2e5753d Mon Sep 17 00:00:00 2001
From: Ulf Samuelsson <ulf_samuelsson@telia.com>
Date: Mon, 21 Nov 2011 16:34:10 +0100
Subject: u-boot-2010.06: Support sam9gx5 chips

Signed-off-by: Ulf Samuelsson <ulf_samuelsson@telia.com>
---
 .../0001-Increase-malloc-area-512-kB.patch         | 25 +++++++++++
 recipes/u-boot/u-boot_2010.06.bb                   | 52 +++++++++++++++++++---
 2 files changed, 72 insertions(+), 5 deletions(-)
 create mode 100644 recipes/u-boot/u-boot-2010.06/0001-Increase-malloc-area-512-kB.patch

diff --git a/recipes/u-boot/u-boot-2010.06/0001-Increase-malloc-area-512-kB.patch b/recipes/u-boot/u-boot-2010.06/0001-Increase-malloc-area-512-kB.patch
new file mode 100644
index 0000000000..b22533a216
--- /dev/null
+++ b/recipes/u-boot/u-boot-2010.06/0001-Increase-malloc-area-512-kB.patch
@@ -0,0 +1,25 @@
+From de0ff9ad9f973b1d9b38ec394a70e48c1e562f4d Mon Sep 17 00:00:00 2001
+From: Ulf Samuelsson <ulf_samuelsson@telia.com>
+Date: Sat, 22 Oct 2011 01:39:56 +0200
+Subject: [PATCH] Increase malloc area > 512 kB
+
+---
+ include/configs/at91sam9x5ek.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
+index a123ece..5551a93 100644
+--- a/include/configs/at91sam9x5ek.h
++++ b/include/configs/at91sam9x5ek.h
+@@ -224,7 +224,7 @@
+ /*
+  * Size of malloc() pool
+  */
+-#define CONFIG_SYS_MALLOC_LEN	ROUND(3 * CONFIG_ENV_SIZE + 128*1024, 0x1000)
++#define CONFIG_SYS_MALLOC_LEN	ROUND(3 * CONFIG_ENV_SIZE + 512*1024, 0x1000)
+ #define CONFIG_SYS_GBL_DATA_SIZE	128	/* 128 bytes for initial data */
+ 
+ #define CONFIG_STACKSIZE	(32*1024)	/* regular stack */
+-- 
+1.7.5.4
+
diff --git a/recipes/u-boot/u-boot_2010.06.bb b/recipes/u-boot/u-boot_2010.06.bb
index 4723fe35c9..27b1b42fa5 100644
--- a/recipes/u-boot/u-boot_2010.06.bb
+++ b/recipes/u-boot/u-boot_2010.06.bb
@@ -1,21 +1,63 @@
-PR = "r1"
-require u-boot.inc
+PR = "r3"
+require u-boot_r2.inc
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_lite5200 = "1"
 DEFAULT_PREFERENCE_tqm8540 = "1"
+DEFAULT_PREFERENCE_at91sam9g15ek = "2"
+DEFAULT_PREFERENCE_at91sam9g25ek = "2"
+DEFAULT_PREFERENCE_at91sam9g35ek = "2"
+DEFAULT_PREFERENCE_at91sam9x25ek = "2"
+DEFAULT_PREFERENCE_at91sam9x35ek = "2"
 
-SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 "
+SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \
+	ftp://ftp.linux4sam.org/pub/uboot/u-boot-v2010.06/u-boot-5series_1.0.patch;apply=yes;name=at91exp \
+	file://0001-Increase-malloc-area-512-kB.patch \
+	"
 
 TARGET_LDFLAGS = ""
 
 inherit base
 
+
+#addtask do_apply_at91_exp_patch before do_patch after do_unpack
+#
+#do_apply_at91_exp_patch () {
+#	cd	${S}
+#	cat	patches/u-boot-5series_1.0.patch	| patch -p1
+#}
+
+
+# Override the include file
+do_configure () {
+	echo
+}
+
 do_compile () {
-       oe_runmake ${UBOOT_MACHINE}
-       oe_runmake all
+	if ! [ "x${UBOOT_MACHINES}" == "x" ] ; then
+		echo ${UBOOT_MACHINES} > board_files.txt
+		for board in ${UBOOT_MACHINES} ; do
+			if ! [ `grep ${board}_config Makefile | wc -c` == 0 ] ; then
+				unset LDFLAGS
+				unset CFLAGS
+				unset CPPFLAGS
+				mkdir -p binaries/${board}
+				oe_runmake O=binaries/${board} distclean
+				oe_runmake O=binaries/${board} ${board}_config
+				oe_runmake O=binaries/${board} all
+			fi
+#			oe_runmake tools env
+		done
+	else
+	       oe_runmake ${UBOOT_MACHINE}
+	       oe_runmake all
+	fi
 }
 
 SRC_URI[md5sum] = "cd42bc64b6edafa6930ce299a144503e"
 SRC_URI[sha256sum] = "790ccb12d99fc527a8b8d20dfdf491795d30f87aa0902f8cbda196583aa20bc8"
+SRC_URI[at91exp.md5sum] = "544c71e11a008d914dc507e04c5b7e95"
+SRC_URI[at91exp.sha256sum] = "691ba4cba126c2e409f38a0ef8a97d696bbde09804e5c0c9df4cb1ae40243f78"
+
+
 
-- 
cgit 1.2.3-korg