diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-01-17 23:08:42 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-01-17 23:08:42 +0100 |
| commit | 3e3989619f5ed3ee28002d985f3da28540586ab9 (patch) | |
| tree | d4434455cafdc0c750aa26e642949232ffd0b2d3 /cpu/blackfin/Makefile | |
| parent | 64917ca38933d10b3763f61df7a1e58e1e127b52 (diff) | |
| parent | 846a6391e4bc9fdd721753a1021953ff0ca17c27 (diff) | |
| download | u-boot-imx-3e3989619f5ed3ee28002d985f3da28540586ab9.zip u-boot-imx-3e3989619f5ed3ee28002d985f3da28540586ab9.tar.gz u-boot-imx-3e3989619f5ed3ee28002d985f3da28540586ab9.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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpu/blackfin/Makefile b/cpu/blackfin/Makefile index 5eef6a3..211b8d5 100644 --- a/cpu/blackfin/Makefile +++ b/cpu/blackfin/Makefile @@ -24,7 +24,7 @@ COBJS-y += os_log.o COBJS-y += reset.o COBJS-y += serial.o COBJS-y += traps.o -COBJS-y += watchdog.o +COBJS-$(CONFIG_HW_WATCHDOG) += watchdog.o ifeq ($(CONFIG_BFIN_BOOT_MODE),BFIN_BOOT_BYPASS) COBJS-y += initcode.o |