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/bcm2835/Makefile | |
| parent | 5675b509165b67465a20e5cf71e07f40b449ef0c (diff) | |
| download | blackbird-obmc-uboot-59d63f7d2cad78382574beea01c85cbca96925df.tar.gz blackbird-obmc-uboot-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/bcm2835/Makefile')
| -rw-r--r-- | arch/arm/cpu/arm1176/bcm2835/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/arm1176/bcm2835/Makefile b/arch/arm/cpu/arm1176/bcm2835/Makefile index 4ea6d6b89f..95da6a822a 100644 --- a/arch/arm/cpu/arm1176/bcm2835/Makefile +++ b/arch/arm/cpu/arm1176/bcm2835/Makefile @@ -17,7 +17,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(SOC).o SOBJS := lowlevel_init.o -COBJS := reset.o timer.o +COBJS := init.o reset.o timer.o SRCS := $(SOBJS:.o=.c) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) |
