[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-154-g9c22e76

[Nicolas <th...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  9c22e76d25397855e9ad1b827fa4a669440f3b77 (commit)
      from  18c5217b822262214d1f1f36fdd1ae326dac0db5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9c22e76d25397855e9ad1b827fa4a669440f3b77
Author: nicolas colombain <nic...@ar...>
Date:   Mon Dec 6 14:34:19 2010 +0100

    [U-BOOT] fix apf51 nand unlock and nand oob

-----------------------------------------------------------------------

Summary of changes:
 .../u-boot/u-boot-2010.03-407-imx51-nand.patch     |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/buildroot/target/u-boot/u-boot-2010.03-407-imx51-nand.patch b/buildroot/target/u-boot/u-boot-2010.03-407-imx51-nand.patch
index dd67a8b..f677e71 100644
--- a/buildroot/target/u-boot/u-boot-2010.03-407-imx51-nand.patch
+++ b/buildroot/target/u-boot/u-boot-2010.03-407-imx51-nand.patch
@@ -12,7 +12,7 @@ diff -purN u-boot-2010.03-ref/drivers/mtd/nand/Makefile u-boot-2010.03/drivers/m
 diff -purN u-boot-2010.03-ref/drivers/mtd/nand/mx51_nand.c u-boot-2010.03/drivers/mtd/nand/mx51_nand.c
 --- u-boot-2010.03-ref/drivers/mtd/nand/mx51_nand.c	2010-09-16 23:11:51.000000000 +0200
 +++ u-boot-2010.03/drivers/mtd/nand/mx51_nand.c	2010-09-16 05:34:54.000000000 +0200
-@@ -0,0 +1,976 @@
+@@ -0,0 +1,979 @@
 +/*
 + * Copyright (C) 2010 Eric Jarrige <jo...@ar...> 
 + * Copyright 2004-2007 Freescale Semiconductor, Inc.
@@ -177,7 +177,10 @@ diff -purN u-boot-2010.03-ref/drivers/mtd/nand/mx51_nand.c u-boot-2010.03/driver
 +	.eccpos = {
 +		8, 9, 10, 11, 12, 13, 14, 15,
 +	},
-+	.oobfree = {  {0, 8}, {16, 48} },
++	.oobfree = {
++			{.offset = 2, .length = 5},
++			{.offset = 16, .length = 48} 
++	},
 +};
 +
 +
@@ -825,7 +828,7 @@ diff -purN u-boot-2010.03-ref/drivers/mtd/nand/mx51_nand.c u-boot-2010.03/driver
 +		return;
 +   	case NAND_CMD_UNLOCK2:{
 +			int temp = readl(NFC_WRPROT_UNLOCK_BLK_ADD0) & 0x0000FFFF;
-+			writel((page_addr>>6) & temp , NFC_WRPROT_UNLOCK_BLK_ADD0);
++			writel(((page_addr>>6)<<16) | temp , NFC_WRPROT_UNLOCK_BLK_ADD0);
 +			/* Unlock Block Command for given address range */
 +			writel(0x84 , NFC_WRPROT);
 +		}
@@ -897,7 +900,7 @@ diff -purN u-boot-2010.03-ref/drivers/mtd/nand/mx51_nand.c u-boot-2010.03/driver
 +{
 +	if (host->pagesize_2k){
 +		NFC_SET_SPAS(0x20); /* set spare to 64bytes */
-+		writel(0x7020A139, NFC_CONFIG2); /* set 2k page and 64bytes spare */
++		writel(0x7020A0B9, NFC_CONFIG2); /* set 2k page and 64bytes spare */
 +	}
 +}
 +


hooks/post-receive
-- 
armadeus