[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-114-g3b6b1d0

[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  3b6b1d0d193f573a8ef67feefc05e1e1a8a10be0 (commit)
       via  744f61287cec203ccc03e9088a1a3f5342fa7407 (commit)
      from  ec24802831d611c30609a2fd232e82c683c2919a (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 3b6b1d0d193f573a8ef67feefc05e1e1a8a10be0
Merge: 744f61287cec203ccc03e9088a1a3f5342fa7407 ec24802831d611c30609a2fd232e82c683c2919a
Author: Eric Jarrige <eri...@ar...>
Date:   Sun Nov 21 14:13:42 2010 +0100

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

commit 744f61287cec203ccc03e9088a1a3f5342fa7407
Author: Eric Jarrige <eri...@ar...>
Date:   Sun Nov 21 11:34:16 2010 +0100

    [UBOOT] Fix EMI clock computation when derived from AHB clock

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

Summary of changes:
 .../target/u-boot/u-boot-2010.03-400-imx51.patch   |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/buildroot/target/u-boot/u-boot-2010.03-400-imx51.patch b/buildroot/target/u-boot/u-boot-2010.03-400-imx51.patch
index 65efc3f..77183b9 100644
--- a/buildroot/target/u-boot/u-boot-2010.03-400-imx51.patch
+++ b/buildroot/target/u-boot/u-boot-2010.03-400-imx51.patch
@@ -108,7 +108,7 @@ diff -purN u-boot-2010.03-ref/cpu/arm_cortexa8/mx51/clock.c u-boot-2010.03/cpu/a
 +	emi_podf = (emi_podf & MXC_CCM_CBCDR_EMI_PODF_MASK) >>
 +			MXC_CCM_CBCDR_EMI_PODF_OFFSET;
 +	/* if emi_clock_sel */
-+	if (__raw_readl(&mxc_ccm->cbcmr) & MXC_CCM_CBCDR_EMI_CLK_SEL)
++	if (__raw_readl(&mxc_ccm->cbcdr) & MXC_CCM_CBCDR_EMI_CLK_SEL)
 +		return get_ahb_clk()/ (emi_podf + 1);
 +	else
 +		return get_periph_clk() / (emi_podf + 1);


hooks/post-receive
-- 
armadeus