diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-01-28 21:09:32 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-01-28 21:09:32 +0100 |
| commit | ee64d0acc93f4f15850736eafaacdeadd7f12d25 (patch) | |
| tree | c3cbea9a94ac333eaaaa0f6d277d5b6c1fe9759c /cpu/blackfin/Makefile | |
| parent | 9cda4f104b5313fadc21b75aa781c7a6aaf6ea60 (diff) | |
| parent | fe033ad6d0883063fe857237abb9436fab03208c (diff) | |
| download | u-boot-imx-ee64d0acc93f4f15850736eafaacdeadd7f12d25.zip u-boot-imx-ee64d0acc93f4f15850736eafaacdeadd7f12d25.tar.gz u-boot-imx-ee64d0acc93f4f15850736eafaacdeadd7f12d25.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-blackfin
Diffstat (limited to 'cpu/blackfin/Makefile')
| -rw-r--r-- | cpu/blackfin/Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cpu/blackfin/Makefile b/cpu/blackfin/Makefile index 8fed4b4..b4049ff 100644 --- a/cpu/blackfin/Makefile +++ b/cpu/blackfin/Makefile @@ -17,14 +17,15 @@ EXTRA := CEXTRA := initcode.o SEXTRA := start.o SOBJS := interrupt.o cache.o -COBJS := cpu.o traps.o interrupts.o reset.o serial.o i2c.o watchdog.o +COBJS-y := cpu.o traps.o interrupts.o reset.o serial.o watchdog.o +COBJS-$(CONFIG_JTAG_CONSOLE) += jtag-console.o ifeq ($(CONFIG_BFIN_BOOT_MODE),BFIN_BOOT_BYPASS) -COBJS += initcode.o +COBJS-y += initcode.o endif -SRCS := $(SEXTRA:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS)) +SRCS := $(SEXTRA:.o=.S) $(SOBJS:.o=.S) $(COBJS-y:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS-y) $(SOBJS)) EXTRA := $(addprefix $(obj),$(EXTRA)) CEXTRA := $(addprefix $(obj),$(CEXTRA)) SEXTRA := $(addprefix $(obj),$(SEXTRA)) |