[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-375-gf6d3307

[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  f6d3307b11ce28e7e315e4953f76f92cb29a97be (commit)
      from  0f26d38497107e4a9c4d1667fdb8b4942f2aee74 (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 f6d3307b11ce28e7e315e4953f76f92cb29a97be
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Jun 13 23:57:04 2012 +0200

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

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

Summary of changes:
 .../device/armadeus/apf27/apf27-u-boot-2012.04.h   |    3 ++-
 .../device/armadeus/pps/pps-u-boot-2012.04.h       |    3 ++-
 ...-Add-support-for-the-armadeus-apf27-board.patch |    6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.04.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.04.h
index d422159..4ee2da3 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.04.h
@@ -25,7 +25,7 @@
 
 #define CONFIG_VERSION_VARIABLE
 #define CONFIG_ENV_VERSION 	"3.0"
-#define CONFIG_IDENT_STRING	" apf27 patch 3.3"
+#define CONFIG_IDENT_STRING	" apf27 patch 3.4"
 #define CONFIG_BOARD_NAME	apf27
 
 /*
@@ -39,6 +39,7 @@
  * Enable the call to miscellaneous platform dependent initialization.
  */
 #define CONFIG_SYS_NO_FLASH	/* to be define before <config_cmd_default.h> */
+#define CONFIG_SYS_DCACHE_OFF
 #define CONFIG_MISC_INIT_R
 
 /*
diff --git a/buildroot/target/device/armadeus/pps/pps-u-boot-2012.04.h b/buildroot/target/device/armadeus/pps/pps-u-boot-2012.04.h
index 6a1f199..e3875ce 100644
--- a/buildroot/target/device/armadeus/pps/pps-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/pps/pps-u-boot-2012.04.h
@@ -25,7 +25,7 @@
 
 #define CONFIG_VERSION_VARIABLE
 #define CONFIG_ENV_VERSION 	"3.0"
-#define CONFIG_IDENT_STRING	" pps patch 3.3"
+#define CONFIG_IDENT_STRING	" pps patch 3.4"
 #define CONFIG_BOARD_NAME	pps
 
 /*
@@ -39,6 +39,7 @@
  * Enable the call to miscellaneous platform dependent initialization.
  */
 #define CONFIG_SYS_NO_FLASH	/* to be define before <config_cmd_default.h> */
+#define CONFIG_SYS_DCACHE_OFF
 #define CONFIG_MISC_INIT_R
 
 /*
diff --git a/patches/u-boot/2012.04/302-Add-support-for-the-armadeus-apf27-board.patch b/patches/u-boot/2012.04/302-Add-support-for-the-armadeus-apf27-board.patch
index acc36d1..9fb4010 100644
--- a/patches/u-boot/2012.04/302-Add-support-for-the-armadeus-apf27-board.patch
+++ b/patches/u-boot/2012.04/302-Add-support-for-the-armadeus-apf27-board.patch
@@ -381,14 +381,14 @@ index 0000000..c55da1a
 +	return rc;
 +}
 +
-+#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
 +}
 +
-+#endif
 diff --git a/board/armadeus/apf27/config.mk b/board/armadeus/apf27/config.mk
 new file mode 100644
 index 0000000..9713e69


hooks/post-receive
-- 
armadeus