diff options
| author | Tom Rini <trini@ti.com> | 2014-02-20 12:18:59 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-02-20 12:18:59 -0500 |
| commit | 6853e6aa77b388998a5368b400aee3ae7776b1c2 (patch) | |
| tree | e91dfbc15a79c452fa50d8896d5e8eb10aa1771d /arch/arm/cpu/armv7/zynq/cpu.c | |
| parent | 130fbeb1c51f19a2b81c4e27d23da735b5b235d4 (diff) | |
| parent | 3e11350255d9c5d4bd03c2a65769da84c05d3294 (diff) | |
| download | blackbird-obmc-uboot-6853e6aa77b388998a5368b400aee3ae7776b1c2.tar.gz blackbird-obmc-uboot-6853e6aa77b388998a5368b400aee3ae7776b1c2.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/cpu/armv7/zynq/cpu.c')
| -rw-r--r-- | arch/arm/cpu/armv7/zynq/cpu.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv7/zynq/cpu.c b/arch/arm/cpu/armv7/zynq/cpu.c index 9af340e75e..7626b5c1a3 100644 --- a/arch/arm/cpu/armv7/zynq/cpu.c +++ b/arch/arm/cpu/armv7/zynq/cpu.c @@ -6,6 +6,7 @@ */ #include <common.h> #include <asm/io.h> +#include <asm/arch/clk.h> #include <asm/arch/sys_proto.h> #include <asm/arch/hardware.h> @@ -16,7 +17,7 @@ void lowlevel_init(void) int arch_cpu_init(void) { zynq_slcr_unlock(); - +#ifndef CONFIG_SPL_BUILD /* Device config APB, unlock the PCAP */ writel(0x757BDF0D, &devcfg_base->unlock); writel(0xFFFFFFFF, &devcfg_base->rom_shadow); @@ -34,7 +35,8 @@ int arch_cpu_init(void) /* Urgent write, ports S2/S3 */ writel(0xC, &slcr_base->ddr_urgent); #endif - +#endif + zynq_clk_early_init(); zynq_slcr_lock(); return 0; @@ -46,3 +48,11 @@ void reset_cpu(ulong addr) while (1) ; } + +#ifndef CONFIG_SYS_DCACHE_OFF +void enable_caches(void) +{ + /* Enable D-cache. I-cache is already enabled in start.S */ + dcache_enable(); +} +#endif |
