Patchwork [U-Boot,3/4] i.MX6: implement enable_caches()

login
register
mail settings
Submitter Eric Nelson
Date March 2, 2012, 11:06 p.m.
Message ID <1330729572-12642-4-git-send-email-eric.nelson@boundarydevices.com>
Download mbox | patch
Permalink /patch/144381/
State Accepted
Commit 4d422fe2dce90d1052c9ab133fe0059ff2e92394
Headers show

Comments

Eric Nelson - March 2, 2012, 11:06 p.m.
disabled by default until drivers are fixed

Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
---
 arch/arm/cpu/armv7/mx6/soc.c    |    8 ++++++++
 include/configs/mx6qarm2.h      |    2 ++
 include/configs/mx6qsabrelite.h |    2 ++
 3 files changed, 12 insertions(+), 0 deletions(-)
Marek Vasut - March 2, 2012, 11:26 p.m.
> 	disabled by default until drivers are fixed
> 
> Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
> ---
>  arch/arm/cpu/armv7/mx6/soc.c    |    8 ++++++++
>  include/configs/mx6qarm2.h      |    2 ++
>  include/configs/mx6qsabrelite.h |    2 ++
>  3 files changed, 12 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c
> index 2ac74b5..eb418eb 100644
> --- a/arch/arm/cpu/armv7/mx6/soc.c
> +++ b/arch/arm/cpu/armv7/mx6/soc.c
> @@ -79,6 +79,14 @@ int arch_cpu_init(void)
>  }
>  #endif
> 
> +#ifndef CONFIG_SYS_DCACHE_OFF
> +void enable_caches(void)
> +{
> +	/* Enable D-cache. I-cache is already enabled in start.S */
> +	dcache_enable();
> +}
> +#endif
> +
>  #if defined(CONFIG_FEC_MXC)
>  void imx_get_mac_from_fuse(int dev_id, unsigned char *mac)
>  {
> diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h
> index 0962d3c..e83aec6 100644
> --- a/include/configs/mx6qarm2.h
> +++ b/include/configs/mx6qarm2.h
> @@ -169,4 +169,6 @@
> 
>  #define CONFIG_OF_LIBFDT
> 
> +#define CONFIG_SYS_DCACHE_OFF
> +
>  #endif				/* __CONFIG_H */
> diff --git a/include/configs/mx6qsabrelite.h
> b/include/configs/mx6qsabrelite.h index a1a2267..3bd9bdb 100644
> --- a/include/configs/mx6qsabrelite.h
> +++ b/include/configs/mx6qsabrelite.h
> @@ -210,4 +210,6 @@
> 
>  #define CONFIG_OF_LIBFDT
> 
> +#define CONFIG_SYS_DCACHE_OFF
> +
>  #endif                         /* __CONFIG_H */

Acked-by: Marek Vasut <marex@denx.de>

Patch

diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c
index 2ac74b5..eb418eb 100644
--- a/arch/arm/cpu/armv7/mx6/soc.c
+++ b/arch/arm/cpu/armv7/mx6/soc.c
@@ -79,6 +79,14 @@  int arch_cpu_init(void)
 }
 #endif
 
+#ifndef CONFIG_SYS_DCACHE_OFF
+void enable_caches(void)
+{
+	/* Enable D-cache. I-cache is already enabled in start.S */
+	dcache_enable();
+}
+#endif
+
 #if defined(CONFIG_FEC_MXC)
 void imx_get_mac_from_fuse(int dev_id, unsigned char *mac)
 {
diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h
index 0962d3c..e83aec6 100644
--- a/include/configs/mx6qarm2.h
+++ b/include/configs/mx6qarm2.h
@@ -169,4 +169,6 @@ 
 
 #define CONFIG_OF_LIBFDT
 
+#define CONFIG_SYS_DCACHE_OFF
+
 #endif				/* __CONFIG_H */
diff --git a/include/configs/mx6qsabrelite.h b/include/configs/mx6qsabrelite.h
index a1a2267..3bd9bdb 100644
--- a/include/configs/mx6qsabrelite.h
+++ b/include/configs/mx6qsabrelite.h
@@ -210,4 +210,6 @@ 
 
 #define CONFIG_OF_LIBFDT
 
+#define CONFIG_SYS_DCACHE_OFF
+
 #endif                         /* __CONFIG_H */