[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-325-gd6a9936

[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  d6a993678745fe0c8fc42473db042d767031f9d6 (commit)
       via  ad3378c08224e7dc826acb597cc5888acf01c86b (commit)
      from  9a8fafb0679025cb5c15f93339022d0c5504d7db (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 d6a993678745fe0c8fc42473db042d767031f9d6
Merge: ad3378c08224e7dc826acb597cc5888acf01c86b 9a8fafb0679025cb5c15f93339022d0c5504d7db
Author: Eric Jarrige <jo...@ar...>
Date:   Thu Apr 29 03:26:56 2010 +0200

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

commit ad3378c08224e7dc826acb597cc5888acf01c86b
Author: Eric Jarrige <jo...@ar...>
Date:   Thu Apr 29 03:26:04 2010 +0200

    [UBOOT] Fix clock init to support bootstrap loader

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

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

diff --git a/buildroot/target/u-boot/u-boot-2010.03-310-apf27.patch b/buildroot/target/u-boot/u-boot-2010.03-310-apf27.patch
index 71d51fc..283b389 100755
--- a/buildroot/target/u-boot/u-boot-2010.03-310-apf27.patch
+++ b/buildroot/target/u-boot/u-boot-2010.03-310-apf27.patch
@@ -848,7 +848,6 @@
 +	writel(DSCR2, CONFIG_SYS_DSCR2_VAL)
 +
 +
-+	init_clock
 +
 +	/* skip clock and sdram initialization if we run from ram */
 +	cmp	pc, #0xa0000000
@@ -858,6 +857,7 @@
 +
 +	mov	pc,r10
 +1:
++	init_clock
 +
 +	sdram_init
 +


hooks/post-receive
-- 
armadeus