[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-39-g0bac4f2

[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  0bac4f2f36e16d0bcf852c389a149acb302253a0 (commit)
      from  8e0bbeea13fa595eca3d86806d11881b3a77f083 (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 0bac4f2f36e16d0bcf852c389a149acb302253a0
Author: Eric Jarrige <eri...@ar...>
Date:   Thu Feb 9 02:09:30 2012 +0100

    [UBOOT] apf28: Improve stride_count computation

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

Summary of changes:
 patches/u-boot/2011.12/502-add-apf28.patch |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/patches/u-boot/2011.12/502-add-apf28.patch b/patches/u-boot/2011.12/502-add-apf28.patch
index 7627f31..01c583f 100644
--- a/patches/u-boot/2011.12/502-add-apf28.patch
+++ b/patches/u-boot/2011.12/502-add-apf28.patch
@@ -554,7 +554,7 @@
 +#########################################################################
 --- u-boot-2011.12/board/armadeus/apf28/mx28_bcb.c	1970-01-01 01:00:00.000000000 +0100
 +++ u-boot-2011.12/board/armadeus/apf28/mx28_bcb.c	2012-02-08 23:00:37.501763289 +0100
-@@ -0,0 +1,549 @@
+@@ -0,0 +1,548 @@
 +/*
 + * i.MX28 NAND Boot Control Blocks generator
 + *
@@ -1029,9 +1029,8 @@
 +	stride_pages = ((readl(&ocotp_regs->hw_ocotp_rom1) >> 4) & 0x0f) * 64;
 +	if (stride_pages < 64) stride_pages = 64;
 +	
-+	stride_count = ((readl(&ocotp_regs->hw_ocotp_rom1) >> 8) & 0x0f);
-+	if (stride_count < 1) stride_count = 2;
-+	stride_count = 2 << (stride_count-1);	/* stride_count = 2^stride_count */
++	stride_count = 1 << ((readl(&ocotp_regs->hw_ocotp_rom1) >> 8) & 0x0f);
++	if (stride_count < 2) stride_count = 4;
 +	
 +	if (firmware_max_size <= nand->erasesize)
 +		firmware_max_size = 1 * 1024 * 1024;


hooks/post-receive
-- 
armadeus