From: Kyungmin Park <kyungmin.park@samsung.com>
Date: Thu, 14 Jan 2010 09:46:34 +0000 (+0900)
Subject: Merge branch 'master' of http://git.denx.de/u-boot
X-Git-Tag: JA03_20100114~3^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4fc0afaa158332bb71c5e216dac56c383a7bc429;p=kernel%2Fu-boot.git

Merge branch 'master' of http://git.denx.de/u-boot

Conflicts:

	common/env_onenand.c

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
---

4fc0afaa158332bb71c5e216dac56c383a7bc429
diff --cc common/env_onenand.c
index ce243cf,cf997bf..7ccce4d
--- a/common/env_onenand.c
+++ b/common/env_onenand.c
@@@ -107,14 -104,10 +105,15 @@@ int saveenv(void
  	struct erase_info instr = {
  		.callback	= NULL,
  	};
 -	size_t retlen;
 +	size_t retlen, len;
 +
 +	len = CONFIG_ENV_SIZE;
 +
 +	if (len < mtd->erasesize)
 +		len = ALIGN(len, mtd->erasesize);
  
 -	instr.len = CONFIG_ENV_SIZE;
 +	instr.len = len;
+ #ifdef CONFIG_ENV_ADDR_FLEX
  	if (FLEXONENAND(this)) {
  		env_addr = CONFIG_ENV_ADDR_FLEX;
  		instr.len = CONFIG_ENV_SIZE_FLEX;