[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-191-g590d540

[jorasse <jo...@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  590d54031cc57967128bf55dfa023b7105efc974 (commit)
       via  584278a6b89644a88a8b279389a22f093dd06a41 (commit)
      from  a58152c247e41d10d376bb0928e7d2b3f9279367 (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 590d54031cc57967128bf55dfa023b7105efc974
Merge: 584278a a58152c
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Mar 21 23:17:27 2012 +0100

    Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit 584278a6b89644a88a8b279389a22f093dd06a41
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Mar 21 23:16:39 2012 +0100

    [UBOOT] apf27: add nand lock/unlock command

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

Summary of changes:
 .../311-imx-nand-lock-unlock.patch}                |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
 copy patches/u-boot/{2010.03/u-boot-2010.03-311-imx-nand-lock-unlock.patch => 2011.12/311-imx-nand-lock-unlock.patch} (93%)

diff --git a/patches/u-boot/2010.03/u-boot-2010.03-311-imx-nand-lock-unlock.patch b/patches/u-boot/2011.12/311-imx-nand-lock-unlock.patch
similarity index 93%
copy from patches/u-boot/2010.03/u-boot-2010.03-311-imx-nand-lock-unlock.patch
copy to patches/u-boot/2011.12/311-imx-nand-lock-unlock.patch
index 9306d8c..bce4dd1 100644
--- a/patches/u-boot/2010.03/u-boot-2010.03-311-imx-nand-lock-unlock.patch
+++ b/patches/u-boot/2011.12/311-imx-nand-lock-unlock.patch
@@ -71,11 +71,11 @@ Index: u-boot-2010.03/drivers/mtd/nand/mxc_nand.c
 +			&& !(readw(&host->regs->nfc_nf_wrprst) & NFC_WRPR_LTS)
 +			&& ((readw(&host->regs->nfc_unlockend_blkaddr) >= page_addr>>6)
 +			&& (readw(&host->regs->nfc_unlockstart_blkaddr) <= page_addr>>6))) {
-+			writeb(NFC_WRPR_US, &host->regs->main_area[0][0]);
++			writew(NFC_WRPR_US, &host->regs->main_area[0][0]);
 +		} else if (readw(&host->regs->nfc_nf_wrprst) & NFC_WRPR_LTS) {
-+			writeb(readw(&host->regs->nfc_nf_wrprst), &host->regs->main_area[0][0]);
++			writew(readw(&host->regs->nfc_nf_wrprst), &host->regs->main_area[0][0]);
 +		} else {
-+			writeb(readw(&host->regs->nfc_nf_wrprst) & ~NFC_WRPR_US, host->regs->main_area[0]);
++			writew(readw(&host->regs->nfc_nf_wrprst) & ~NFC_WRPR_US, &host->regs->main_area[0][0]);
 +		}
 +		return;
 +#endif


hooks/post-receive
-- 
armadeus