[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-377-gc77a44a

[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  c77a44a704164c941f8ab6aada66b2f72339b1f9 (commit)
       via  44316373768bcd54d1945f1e5a1428d69e3238d7 (commit)
      from  f6d3307b11ce28e7e315e4953f76f92cb29a97be (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 c77a44a704164c941f8ab6aada66b2f72339b1f9
Merge: 4431637 f6d3307
Author: Eric Jarrige <eri...@ar...>
Date:   Thu Jun 14 00:02:28 2012 +0200

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

commit 44316373768bcd54d1945f1e5a1428d69e3238d7
Author: Eric Jarrige <eri...@ar...>
Date:   Thu Jun 14 00:02:11 2012 +0200

    [UBOOT] apf51: Fix dcache message on boot

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

Summary of changes:
 patches/u-boot/2012.04/401-apf51.patch |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/patches/u-boot/2012.04/401-apf51.patch b/patches/u-boot/2012.04/401-apf51.patch
index 6b38aeb..043867e 100644
--- a/patches/u-boot/2012.04/401-apf51.patch
+++ b/patches/u-boot/2012.04/401-apf51.patch
@@ -67,7 +67,7 @@ new file mode 100644
 index 0000000..e09b561
 --- /dev/null
 +++ b/board/armadeus/apf51/apf51.c
-@@ -0,0 +1,1221 @@
+@@ -0,0 +1,1220 @@
 +/*
 + * (C) Copyright 2010-2012 Eric Jarrige, Armadeus Project
 + *
@@ -1058,14 +1058,13 @@ index 0000000..e09b561
 +	return 0;
 +}
 +
-+#ifndef CONFIG_SYS_DCACHE_OFF
 +void enable_caches(void)
 +{
++#ifndef CONFIG_SYS_DCACHE_OFF
 +	/* Enable D-cache. I-cache is already enabled in start.S */
-+	//dcache_enable();
-+}
-+
++	dcache_enable();
 +#endif
++}
 +
 +#ifndef CONFIG_L2_OFF
 +void v7_outer_cache_enable(void)


hooks/post-receive
-- 
armadeus