Message ID | 1330897659-9049-3-git-send-email-eric.nelson@boundarydevices.com |
---|---|
State | Deferred |
Delegated to: | Stefano Babic |
Headers | show |
On 03/04/2012 02:47 PM, Eric Nelson wrote: > disabled by default until drivers are fixed > > Signed-off-by: Eric Nelson<eric.nelson@boundarydevices.com> > Acked-by: Marek Vasut<marex@denx.de> > --- > 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(-) > Hi Stefano, Can you tell that I'm doing some house-cleaning? Let me know if there's something you'd like changed in this patch. Regards, Eric
On 13/03/2012 02:11, Eric Nelson wrote: > On 03/04/2012 02:47 PM, Eric Nelson wrote: >> disabled by default until drivers are fixed >> >> Signed-off-by: Eric Nelson<eric.nelson@boundarydevices.com> >> Acked-by: Marek Vasut<marex@denx.de> >> --- >> 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(-) >> Applied to u-boot-imx, next branch. Best regards, Stefano Babic
On 19/03/2012 16:39, Stefano Babic wrote: > On 13/03/2012 02:11, Eric Nelson wrote: >> On 03/04/2012 02:47 PM, Eric Nelson wrote: >>> disabled by default until drivers are fixed >>> >>> Signed-off-by: Eric Nelson<eric.nelson@boundarydevices.com> >>> Acked-by: Marek Vasut<marex@denx.de> >>> --- >>> 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(-) >>> > > Applied to u-boot-imx, next branch. Wrong - merge into u-boot-imx, master. It goes in this release. Best regards, Stefano Babic
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 8bc8a83..d3b31fe 100644 --- a/include/configs/mx6qsabrelite.h +++ b/include/configs/mx6qsabrelite.h @@ -212,4 +212,6 @@ #define CONFIG_OF_LIBFDT +#define CONFIG_SYS_DCACHE_OFF + #endif /* __CONFIG_H */