From 0f5aed60d4580557ad634b223c4683211739b2fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 7 Oct 2010 07:29:12 +0000
Subject: [PATCH] U-Boot: Fix the environment address for the GuruPlug.

svn path=/nixpkgs/trunk/; revision=24126
---
 pkgs/misc/uboot/guruplug-file-systems.patch | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkgs/misc/uboot/guruplug-file-systems.patch b/pkgs/misc/uboot/guruplug-file-systems.patch
index 76734456c2fb..30dc1994303d 100644
--- a/pkgs/misc/uboot/guruplug-file-systems.patch
+++ b/pkgs/misc/uboot/guruplug-file-systems.patch
@@ -1,8 +1,22 @@
 Add support for the various file systems as found in `sheevaplug.h'.
+As for the SheevaPlug, the increase in size means that the environment
+must be pushed further away.
+
 In addition, increase the malloc area size to allow compilation of UbiFS.
 
 --- u-boot/include/configs/guruplug.h	1970-01-01 01:00:01.000000000 +0100
 +++ u-boot/include/configs/guruplug.h	2010-09-29 18:59:52.000000000 +0200
+@@ -123,8 +123,8 @@
+  * it has to be rounded to sector size
+  */
+ #define CONFIG_ENV_SIZE			0x20000	/* 128k */
+-#define CONFIG_ENV_ADDR			0x40000
+-#define CONFIG_ENV_OFFSET		0x40000	/* env starts here */
++#define CONFIG_ENV_ADDR			0x60000
++#define CONFIG_ENV_OFFSET		0x60000	/* env starts here */
+ 
+ /*
+  * Default environment variables
 @@ -145,7 +145,7 @@
  /*
   * Size of malloc() pool