diff options
| author | Stephen Warren <swarren@wwwdotorg.org> | 2012-09-01 16:27:56 +0000 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-09-25 13:27:58 -0700 |
| commit | 59d63f7d2cad78382574beea01c85cbca96925df (patch) | |
| tree | 9f562e244aca6609ba2bb01358189f4658dcde57 /arch/arm/cpu/arm1176/cpu.c | |
| parent | 5675b509165b67465a20e5cf71e07f40b449ef0c (diff) | |
| download | olio-uboot-2014.01-59d63f7d2cad78382574beea01c85cbca96925df.tar.xz olio-uboot-2014.01-59d63f7d2cad78382574beea01c85cbca96925df.zip | |
ARM: arm1176: Define arch_cpu_init() at the SoC level
Commit 86c6326 "ARM: arm1176: enable instruction cache in
arch_cpu_init()" defined arch_cpu_init() in a file that is shared across
all arm1176 SoCs. tnetv107x already implemented this function, which
caused linking to break. Move the new conflicting arch_cpu_init() into
arm1176/bcm2835/init.c so that it doesn't conflict; grep indicates this
function is usually defined at the SoC-level, not the CPU-level, at least
for ARM.
Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
Acked-by: Marek Vasut <marex@denx.de>
Diffstat (limited to 'arch/arm/cpu/arm1176/cpu.c')
| -rw-r--r-- | arch/arm/cpu/arm1176/cpu.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/cpu/arm1176/cpu.c b/arch/arm/cpu/arm1176/cpu.c index 532a90b54..c0fd114e1 100644 --- a/arch/arm/cpu/arm1176/cpu.c +++ b/arch/arm/cpu/arm1176/cpu.c @@ -65,10 +65,3 @@ static void cache_flush (void) /* mem barrier to sync things */ asm ("mcr p15, 0, %0, c7, c10, 4": :"r" (0)); } - -int arch_cpu_init(void) -{ - icache_enable(); - - return 0; -} |