[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-378-g6a94351

[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  6a94351baab3869bd983400ae740e10342b25640 (commit)
      from  c77a44a704164c941f8ab6aada66b2f72339b1f9 (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 6a94351baab3869bd983400ae740e10342b25640
Author: Eric Jarrige <eri...@ar...>
Date:   Thu Jun 14 00:15:24 2012 +0200

    [UBOOT] apf9328: update code to support U-Boot data cache

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

Summary of changes:
 .../armadeus/apf9328/apf9328-u-boot-2012.04.h      |    3 ++-
 patches/u-boot/2012.04/103-apf9328.patch           |    6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2012.04.h b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2012.04.h
index 12ab4bd..e85d1f0 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2012.04.h
@@ -24,7 +24,7 @@
 
 #define CONFIG_VERSION_VARIABLE
 #define CONFIG_ENV_VERSION 	"5.1"
-#define CONFIG_IDENT_STRING	" apf9328 patch 5.3"
+#define CONFIG_IDENT_STRING	" apf9328 patch 5.4"
 #define CONFIG_BOARD_NAME	apf9328
 
 /*
@@ -37,6 +37,7 @@
 /*
  * Enable the call to miscellaneous platform dependent initialization.
  */
+#define CONFIG_SYS_DCACHE_OFF
 #define CONFIG_MISC_INIT_R
 
 /*
diff --git a/patches/u-boot/2012.04/103-apf9328.patch b/patches/u-boot/2012.04/103-apf9328.patch
index 6897dab..edd07ea 100644
--- a/patches/u-boot/2012.04/103-apf9328.patch
+++ b/patches/u-boot/2012.04/103-apf9328.patch
@@ -137,13 +137,13 @@ index 0000000..b72491d
 +	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();  fix kernel 2.6.29 boot crash first*/
-+}
++	dcache_enable();
 +#endif
++}
 +
 +/*
 + * Miscellaneous intialization


hooks/post-receive
-- 
armadeus