summaryrefslogtreecommitdiff
path: root/arch/blackfin/cpu/Makefile
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2013-05-14 11:45:41 -0400
committerTom Rini <trini@ti.com>2013-05-14 11:45:41 -0400
commit805fa87f6d2366e2193f3d9eb1f793ad41ae1430 (patch)
tree743278b9e271dc84670680a466ef2ebaabcbbce9 /arch/blackfin/cpu/Makefile
parenta661b99dbc35e725f229a7b8e189ca21304ba026 (diff)
parentda34aae5fba36c1f1989fdd41fffa723f300eaad (diff)
Merge branch 'master' of git://git.denx.de/u-boot-blackfin into powerpc-eldk53-warning-fixes
Diffstat (limited to 'arch/blackfin/cpu/Makefile')
-rw-r--r--arch/blackfin/cpu/Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/blackfin/cpu/Makefile b/arch/blackfin/cpu/Makefile
index 0a72ec5df3..1421cb2ca2 100644
--- a/arch/blackfin/cpu/Makefile
+++ b/arch/blackfin/cpu/Makefile
@@ -18,14 +18,12 @@ CEXTRA := initcode.o
SEXTRA := start.o
SOBJS := interrupt.o cache.o
COBJS-y += cpu.o
-COBJS-y += gpio.o
+COBJS-$(CONFIG_ADI_GPIO1) += gpio.o
COBJS-y += interrupts.o
COBJS-$(CONFIG_JTAG_CONSOLE) += jtag-console.o
COBJS-y += os_log.o
COBJS-y += reset.o
-COBJS-y += serial.o
COBJS-y += traps.o
-COBJS-$(CONFIG_HW_WATCHDOG) += watchdog.o
SRCS := $(SEXTRA:.o=.S) $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS-y) $(SOBJS))