aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2010-11-19 19:17:53 -0500
committerMike Frysinger <vapier@gentoo.org>2010-11-19 19:17:57 -0500
commit4024242669a47cd4e138d0b6805a24e6d3d270e7 (patch)
tree247063ad42026f6cd497b8b04102df4d9ccf9ebc /arch
parentfa722ea76be565de6823ca04c107cc4fbd96b776 (diff)
downloadu-boot-linaro-stable-4024242669a47cd4e138d0b6805a24e6d3d270e7.tar.gz
Blackfin: drop initcode.o from combined object
We explicitly link in the initcode.o in the Blackfin linker script, so there is no need to merge it into the main common object for the linker to pull in itself. This also fixes duplicate symbol errors with the new partial linking logic. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/blackfin/cpu/Makefile4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/blackfin/cpu/Makefile b/arch/blackfin/cpu/Makefile
index 7c5400e90..4a9e577a8 100644
--- a/arch/blackfin/cpu/Makefile
+++ b/arch/blackfin/cpu/Makefile
@@ -29,10 +29,6 @@ COBJS-y += serial.o
COBJS-y += traps.o
COBJS-$(CONFIG_HW_WATCHDOG) += watchdog.o
-ifeq ($(CONFIG_BFIN_BOOT_MODE),BFIN_BOOT_BYPASS)
-COBJS-y += initcode.o
-endif
-
SRCS := $(SEXTRA:.o=.S) $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS-y) $(SOBJS))
EXTRA := $(addprefix $(obj),$(EXTRA))