diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-01-14 17:00:02 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-01-14 17:00:02 +0100 |
| commit | a17617d6553369ba72c080128ed8d0b0c33dfc89 (patch) | |
| tree | c8903ddc48e628192c56cc95667f702fd1d77c6e /drivers/watchdog/Makefile | |
| parent | 1199c377cf14c240b903e351ab02b3b2cd3800c6 (diff) | |
| parent | 11d80af4876b609832856853b63d06a1011bccf1 (diff) | |
| download | u-boot-imx-a17617d6553369ba72c080128ed8d0b0c33dfc89.zip u-boot-imx-a17617d6553369ba72c080128ed8d0b0c33dfc89.tar.gz u-boot-imx-a17617d6553369ba72c080128ed8d0b0c33dfc89.tar.bz2 | |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'drivers/watchdog/Makefile')
| -rw-r--r-- | drivers/watchdog/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index bc09123..b1f4e0f 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile @@ -27,6 +27,9 @@ LIB := $(obj)libwatchdog.o COBJS-$(CONFIG_AT91SAM9_WATCHDOG) += at91sam9_wdt.o COBJS-$(CONFIG_FTWDT010_WATCHDOG) += ftwdt010_wdt.o +ifneq (,$(filter $(SOC), mx31 mx35 mx5 mx6)) +COBJS-y += imx_watchdog.o +endif COBJS-$(CONFIG_TNETV107X_WATCHDOG) += tnetv107x_wdt.o COBJS-$(CONFIG_S5P) += s5p_wdt.o |